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 0DAD9139694 for ; Sat, 29 Jul 2017 08:28:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 434AC1FC079; Sat, 29 Jul 2017 08:28:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0ECCA1FC079 for ; Sat, 29 Jul 2017 08:28:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 87CF5341A34 for ; Sat, 29 Jul 2017 08:28:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0DA5D7491 for ; Sat, 29 Jul 2017 08:28:47 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1501316916.ee3556fed02985b10a1550b548f0ed82f9ccf0b4.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/llvm-ocaml/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ml/llvm-ocaml/llvm-ocaml-5.0.9999.ebuild dev-ml/llvm-ocaml/llvm-ocaml-9999.ebuild X-VCS-Directories: dev-ml/llvm-ocaml/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: ee3556fed02985b10a1550b548f0ed82f9ccf0b4 X-VCS-Branch: master Date: Sat, 29 Jul 2017 08:28:47 +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: 2f8b47fa-c0ec-49f8-9896-a3e97d72761a X-Archives-Hash: 2296e98d7e2e33f4b30711fd7212ebac commit: ee3556fed02985b10a1550b548f0ed82f9ccf0b4 Author: Michał Górny gentoo org> AuthorDate: Sat Jul 29 08:25:24 2017 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Jul 29 08:28:36 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee3556fe dev-ml/llvm-ocaml: Fix passing NDEBUG to build for LLVMDumpType() Add USE=debug that controls -DNDEBUG since upstream started defining dump functions conditionally to debug being enabled. We therefore need to disable dumps in OCaml bindings if LLVM was built without them. dev-ml/llvm-ocaml/llvm-ocaml-5.0.9999.ebuild | 9 ++++++--- dev-ml/llvm-ocaml/llvm-ocaml-9999.ebuild | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-5.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-5.0.9999.ebuild index 052fa649710..f094afad03b 100644 --- a/dev-ml/llvm-ocaml/llvm-ocaml-5.0.9999.ebuild +++ b/dev-ml/llvm-ocaml/llvm-ocaml-5.0.9999.ebuild @@ -26,12 +26,12 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?} LICENSE="UoI-NCSA" SLOT="0/${PV}" KEYWORDS="" -IUSE="test ${ALL_LLVM_TARGETS[*]}" +IUSE="debug test ${ALL_LLVM_TARGETS[*]}" RDEPEND=" >=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= - ~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,}] + ~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,},debug?] !sys-devel/llvm[ocaml(-)]" # configparser-3.2 breaks the build (3.3 or none at all are fine) DEPEND="${RDEPEND} @@ -81,7 +81,7 @@ src_configure() { -DLLVM_ENABLE_TERMINFO=OFF -DHAVE_HISTEDIT_H=NO -DWITH_POLLY=OFF - -DLLVM_ENABLE_ASSERTIONS=OFF + -DLLVM_ENABLE_ASSERTIONS=$(usex debug) -DLLVM_ENABLE_EH=ON -DLLVM_ENABLE_RTTI=ON @@ -97,6 +97,9 @@ src_configure() { -DLIT_COMMAND="${EPREFIX}/usr/bin/lit" ) + # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844 + # also: custom rules for OCaml do not work for CPPFLAGS + use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG" cmake-utils_src_configure local llvm_libdir=$(llvm-config --libdir) diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-9999.ebuild index b6885c5b623..d5f507e9e10 100644 --- a/dev-ml/llvm-ocaml/llvm-ocaml-9999.ebuild +++ b/dev-ml/llvm-ocaml/llvm-ocaml-9999.ebuild @@ -25,12 +25,12 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?} LICENSE="UoI-NCSA" SLOT="0/${PV}" KEYWORDS="" -IUSE="test ${ALL_LLVM_TARGETS[*]}" +IUSE="debug test ${ALL_LLVM_TARGETS[*]}" RDEPEND=" >=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= - ~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,}] + ~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,},debug?] !sys-devel/llvm[ocaml(-)]" # configparser-3.2 breaks the build (3.3 or none at all are fine) DEPEND="${RDEPEND} @@ -80,7 +80,7 @@ src_configure() { -DLLVM_ENABLE_TERMINFO=OFF -DHAVE_HISTEDIT_H=NO -DWITH_POLLY=OFF - -DLLVM_ENABLE_ASSERTIONS=OFF + -DLLVM_ENABLE_ASSERTIONS=$(usex debug) -DLLVM_ENABLE_EH=ON -DLLVM_ENABLE_RTTI=ON @@ -96,6 +96,9 @@ src_configure() { -DLIT_COMMAND="${EPREFIX}/usr/bin/lit" ) + # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844 + # also: custom rules for OCaml do not work for CPPFLAGS + use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG" cmake-utils_src_configure local llvm_libdir=$(llvm-config --libdir)