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 B5888138334 for ; Wed, 6 Mar 2019 12:34:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8F5B2E0908; Wed, 6 Mar 2019 12:34:34 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 680E1E0908 for ; Wed, 6 Mar 2019 12:34:34 +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 2E5A8335C47 for ; Wed, 6 Mar 2019 12:34:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6E035553 for ; Wed, 6 Mar 2019 12:34:30 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1551874983.b81cd60acf8b5b8465c4849719259321b99e6467.grobian@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: scripts/bootstrap-prefix.sh X-VCS-Directories: scripts/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: b81cd60acf8b5b8465c4849719259321b99e6467 X-VCS-Branch: master Date: Wed, 6 Mar 2019 12:34:30 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9835c667-5a24-401b-8bbe-8f059474e085 X-Archives-Hash: 4b0f35d31a97cfa1257b0aec0a684d20 commit: b81cd60acf8b5b8465c4849719259321b99e6467 Author: hsk17 mail de> AuthorDate: Wed Mar 6 12:23:03 2019 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Wed Mar 6 12:23:03 2019 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b81cd60a scripts/bootstrap-prefix: unify libffi behaviour in bootstrap_gnu due to commit 94a0ab4f, which adds -L${ROOT}/tmp/usr/lib64 to LDFLAGS in bootstrap_python(), the python bootstrap build sees libffi.so and succeeds. but there is no -Wl,-rpath,${ROOT}/tmp/usr/lib64, and the built _ctypes.so is unusable as the run time loader does not find libffi. Signed-off-by: Fabian Groffen gentoo.org> scripts/bootstrap-prefix.sh | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 1998896349..70863e2396 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -813,20 +813,22 @@ bootstrap_gnu() { # SuSE 11.1 has GNU binutils-2.20, choking on crc32_x86 [[ ${PN} == "xz" ]] && myconf="${myconf} --disable-assembler" - # we do not have pkg-config to find lib/libffi-*/include/ffi.h - [[ ${PN} == "libffi" ]] && - sed -i -e '/includesdir =/s/=.*/= $(includedir)/' include/Makefile.in - - # we have to build the libraries for correct bitwidth - [[ " libffi " == *" ${PN} "* ]] && - case $CHOST in - (x86_64-*-*|sparcv9-*-*) - export CFLAGS="-m64" - ;; - (i?86-*-*) - export CFLAGS="-m32" - ;; - esac + if [[ ${PN} == "libffi" ]] ; then + # we do not have pkg-config to find lib/libffi-*/include/ffi.h + sed -i -e '/includesdir =/s/=.*/= $(includedir)/' include/Makefile.in + # force install into libdir + myconf="${myconf} --libdir=${ROOT}/tmp/usr/lib" + sed -i -e '/toolexeclibdir =/s/=.*/= $(libdir)/' Makefile.in + # we have to build the libraries for correct bitwidth + case $CHOST in + (x86_64-*-*|sparcv9-*-*) + export CFLAGS="-m64" + ;; + (i?86-*-*) + export CFLAGS="-m32" + ;; + esac + fi einfo "Compiling ${PN}" econf ${myconf} || return 1 @@ -979,7 +981,7 @@ EOP # python refuses to find the zlib headers that are built in the offset, # same for libffi, which installs into compiler's multilib-osdir export CPPFLAGS="-I${ROOT}/tmp/usr/include" - export LDFLAGS="${CFLAGS} -L${ROOT}/tmp/usr/lib -L${ROOT}/tmp/usr/lib64" + export LDFLAGS="${CFLAGS} -L${ROOT}/tmp/usr/lib" # set correct flags for runtime for ELF platforms case $CHOST in *-linux*)