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 C71C41396D9 for ; Mon, 13 Nov 2017 22:15:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 12B56E1025; Mon, 13 Nov 2017 22:15:47 +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 E7C3DE1025 for ; Mon, 13 Nov 2017 22:15:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 09AE033BF0F for ; Mon, 13 Nov 2017 22:15:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4F5909ACF for ; Mon, 13 Nov 2017 22:15:44 +0000 (UTC) From: "José María Alonso" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "José María Alonso" Message-ID: <1510611120.ba66c87fafb87b82c38b36575e0e1c764dcd4792.nimiux@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lisp/sbcl/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lisp/sbcl/sbcl-1.4.1.ebuild X-VCS-Directories: dev-lisp/sbcl/ X-VCS-Committer: nimiux X-VCS-Committer-Name: José María Alonso X-VCS-Revision: ba66c87fafb87b82c38b36575e0e1c764dcd4792 X-VCS-Branch: master Date: Mon, 13 Nov 2017 22:15:44 +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: 1c88ceb2-464c-4d5d-a2a6-170d361ba7f2 X-Archives-Hash: 561f81cac65a7094202e3666bbdf6d9c commit: ba66c87fafb87b82c38b36575e0e1c764dcd4792 Author: Chema Alonso Josa gentoo org> AuthorDate: Mon Nov 13 22:12:00 2017 +0000 Commit: José María Alonso gentoo org> CommitDate: Mon Nov 13 22:12:00 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba66c87f dev-lisp/sbcl: Fix CFLAGS and LINKFLAGS to let users override the default values Bug: https://bugs.gentoo.org/632670 Package-Manager: Portage-2.3.8, Repoman-2.3.3 dev-lisp/sbcl/sbcl-1.4.1.ebuild | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/dev-lisp/sbcl/sbcl-1.4.1.ebuild b/dev-lisp/sbcl/sbcl-1.4.1.ebuild index adb1f0e29a5..df43a9fecd1 100644 --- a/dev-lisp/sbcl/sbcl-1.4.1.ebuild +++ b/dev-lisp/sbcl/sbcl-1.4.1.ebuild @@ -107,11 +107,19 @@ src_prepare() { eapply_user - # bugs #526194, #620532 - sed -e "s@CFLAGS +=.*\$@CFLAGS = ${CFLAGS} -Wall -Wsign-compare -Wpointer-arith@" \ - -e "s@LINKFLAGS += -g\$@LINKFLAGS = ${LDFLAGS}@" \ - -e "s@LINKFLAGS += -no-pie\$@LINKFLAGS = ${LDFLAGS} -no-pie@" \ - -e "s@LINKFLAGS += -nopie\$@LINKFLAGS = ${LDFLAGS} -nopie@" \ + # Make sure the *FLAGS variables are sane. + # sbcl needs symbols in resulting binaries, so building with the -s linker flag will fail. + strip-unsupported-flags + filter-flags -fomit-frame-pointer -Wl,-s + filter-ldflags -s + + # original bugs #526194, #620532 + # this broke no-pie default builds, c.f. bug #632670 + # Pass CFLAGS down by appending our value, to let users override + # the default values. + # Keep passing LDFLAGS down via the LINKFLAGS variable. + sed -e "s@\(CFLAGS += -g .*\)\$@\1 ${CFLAGS}@" \ + -e "s@LINKFLAGS += -g\$@LINKFLAGS += ${LDFLAGS}@" \ -i src/runtime/GNUmakefile || die sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \ @@ -148,8 +156,6 @@ src_configure() { src_compile() { local bindir="${WORKDIR}"/sbcl-binary - strip-unsupported-flags ; filter-flags -fomit-frame-pointer - if use pax_kernel ; then # To disable PaX on hardened systems pax-mark -mr "${bindir}"/src/runtime/sbcl