From 71d148bdef2578ba433562e8994963abcdc00843 Mon Sep 17 00:00:00 2001 From: Keri Harris Date: Mon, 3 Oct 2016 18:41:49 +0200 Subject: dev-lang/qu-prolog: build-time fixes for USE=debug --- .../files/qu-prolog-10.0-associated-item.patch | 11 +++++++++++ .../qu-prolog/files/qu-prolog-10.0-configure.patch | 21 +++++++++++++++++++++ dev-lang/qu-prolog/qu-prolog-10.0.ebuild | 5 +++++ 3 files changed, 37 insertions(+) create mode 100644 dev-lang/qu-prolog/files/qu-prolog-10.0-associated-item.patch create mode 100644 dev-lang/qu-prolog/files/qu-prolog-10.0-configure.patch (limited to 'dev-lang') diff --git a/dev-lang/qu-prolog/files/qu-prolog-10.0-associated-item.patch b/dev-lang/qu-prolog/files/qu-prolog-10.0-associated-item.patch new file mode 100644 index 000000000000..d5e992d51c26 --- /dev/null +++ b/dev-lang/qu-prolog/files/qu-prolog-10.0-associated-item.patch @@ -0,0 +1,11 @@ +--- qp10.0.orig/src/objects.h 2016-06-07 02:54:35.000000000 +0200 ++++ qp10.0/src/objects.h 2016-10-03 18:26:49.924782008 +0200 +@@ -1210,7 +1210,7 @@ + << this->getName() << "\" "; + + #ifndef WIN32 +- switch (hasAssociatedItem()) ++ switch (tag & AssociatedMask) + { + case AssociatedNone: + std::cerr << "(no info)"; diff --git a/dev-lang/qu-prolog/files/qu-prolog-10.0-configure.patch b/dev-lang/qu-prolog/files/qu-prolog-10.0-configure.patch new file mode 100644 index 000000000000..b3c109613912 --- /dev/null +++ b/dev-lang/qu-prolog/files/qu-prolog-10.0-configure.patch @@ -0,0 +1,21 @@ +--- qp10.0.orig/configure 2016-06-07 02:54:42.000000000 +0200 ++++ qp10.0/configure 2016-10-03 18:30:22.360786524 +0200 +@@ -2256,12 +2256,16 @@ + # + # Check for addtional command line options. + # +-DEBUGGING=" -DNDEBUG " + # Check whether --enable-debug was given. + if test "${enable_debug+set}" = set; then : +- enableval=$enable_debug; DEBUGGING= ++ enableval=$enable_debug; + fi + ++if test "$enable_debug" = yes; then ++ DEBUGGING= ++else ++ DEBUGGING=" -DNDEBUG " ++fi + + + # Single versus multiple thread configuraation. diff --git a/dev-lang/qu-prolog/qu-prolog-10.0.ebuild b/dev-lang/qu-prolog/qu-prolog-10.0.ebuild index 14d1f1135aaa..4914f078c8c5 100644 --- a/dev-lang/qu-prolog/qu-prolog-10.0.ebuild +++ b/dev-lang/qu-prolog/qu-prolog-10.0.ebuild @@ -28,6 +28,11 @@ DEPEND="${RDEPEND} S="${WORKDIR}"/${MY_P} +src_prepare() { + epatch "${FILESDIR}"/${P}-configure.patch + epatch "${FILESDIR}"/${P}-associated-item.patch +} + src_configure() { econf \ --libdir=/usr/$(get_libdir) \ -- cgit v1.2.3-65-gdbad