From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id ACE9D138330 for ; Mon, 3 Oct 2016 16:42:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9CD07E0962; Mon, 3 Oct 2016 16:42:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 803C1E0962 for ; Mon, 3 Oct 2016 16:42:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AD669340EBD for ; Mon, 3 Oct 2016 16:42:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1824C2480 for ; Mon, 3 Oct 2016 16:42:08 +0000 (UTC) From: "Keri Harris" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Keri Harris" Message-ID: <1475512909.71d148bdef2578ba433562e8994963abcdc00843.keri@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/qu-prolog/, dev-lang/qu-prolog/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/qu-prolog/files/qu-prolog-10.0-associated-item.patch dev-lang/qu-prolog/files/qu-prolog-10.0-configure.patch dev-lang/qu-prolog/qu-prolog-10.0.ebuild X-VCS-Directories: dev-lang/qu-prolog/files/ dev-lang/qu-prolog/ X-VCS-Committer: keri X-VCS-Committer-Name: Keri Harris X-VCS-Revision: 71d148bdef2578ba433562e8994963abcdc00843 X-VCS-Branch: master Date: Mon, 3 Oct 2016 16:42:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 61b4e909-1a95-4583-8337-99b1e5f3441e X-Archives-Hash: b1fe7c03e535f9644c48b632f9088fcd commit: 71d148bdef2578ba433562e8994963abcdc00843 Author: Keri Harris gentoo org> AuthorDate: Mon Oct 3 16:41:49 2016 +0000 Commit: Keri Harris gentoo org> CommitDate: Mon Oct 3 16:41:49 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71d148bd 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(+) 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 00000000..d5e992d --- /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 00000000..b3c1096 --- /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 14d1f11..4914f07 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) \