Commit 89b832ee authored by Olly Betts's avatar Olly Betts

releasing package wxwidgets3.0 version 3.0.4+dfsg-6

parent ef639194
wxwidgets3.0 (3.0.4+dfsg-6) unstable; urgency=medium
* Fix not to capture /usr/bin/egrep path when built on a merged-usr system.
(Closes: #914086)
-- Olly Betts <olly@survex.com> Wed, 21 Nov 2018 07:54:05 +1300
wxwidgets3.0 (3.0.4+dfsg-5) unstable; urgency=medium
* Cherry-pick three patches from upstream WX_3_0_BRANCH branch to fix warnings
......
......@@ -74,6 +74,10 @@ ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
COMMON_CONFIGURE_OPTIONS += --disable-optimise
endif
# Avoid /usr/bin/grep getting put in the generated wx-config when built on a
# merged-usr system (which will then fail when run on a non-merged-usr system).
COMMON_CONFIGURE_OPTIONS += EGREP='/bin/grep -E'
BASE_CONFIGURE_OPTIONS = $(COMMON_CONFIGURE_OPTIONS) \
--disable-gui \
--libdir=\$${exec_prefix}/lib/$(DEB_HOST_MULTIARCH)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment