[crossrootfs][PATCH] gcc: fix libtool relink of cross arch libraries
a403a54cc6f51937d5f208662fc002c278cdcf68 gcc: fix libtool relink of cross arch libraries --- gcc/Pkgfile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gcc/Pkgfile b/gcc/Pkgfile index a5bf931..241f048 100644 --- a/gcc/Pkgfile +++ b/gcc/Pkgfile @@ -46,7 +46,15 @@ build() { # prevent GCC from looking in the wrong directories for headers and libraries sed "/^HOST_\(GMP\|PPL\|CLOOG\)\(LIBS\|INC\)/s:-[IL]/\(lib\|include\)::" -i Makefile - make + make + + # prevent libtool from adding host lib paths for relink at install + # based on patch submitted by Vincent Cadet for libtool bug #21455 + # see https://lists.gnu.org/archive/html/bug-libtool/2015-09/msg00012.html + for lt_file in $(find $SRC/build/$CTARGET -name libtool) ; do + sed -i 's/\(add_dir=\"\)\$add_dir \(-L\$inst_prefix_dir\$libdir\"\)/\1\2/' $lt_file + done + make -j1 DESTDIR=$PKG install mkdir $PKG/lib -- 2.7.4
El 13/05/16 a las 04:38, John Vogel escribió:
a403a54cc6f51937d5f208662fc002c278cdcf68
gcc: fix libtool relink of cross arch libraries --- gcc/Pkgfile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/gcc/Pkgfile b/gcc/Pkgfile index a5bf931..241f048 100644 --- a/gcc/Pkgfile +++ b/gcc/Pkgfile @@ -46,7 +46,15 @@ build() { # prevent GCC from looking in the wrong directories for headers and libraries sed "/^HOST_\(GMP\|PPL\|CLOOG\)\(LIBS\|INC\)/s:-[IL]/\(lib\|include\)::" -i Makefile
- make + make + + # prevent libtool from adding host lib paths for relink at install + # based on patch submitted by Vincent Cadet for libtool bug #21455 + # see https://lists.gnu.org/archive/html/bug-libtool/2015-09/msg00012.html + for lt_file in $(find $SRC/build/$CTARGET -name libtool) ; do + sed -i 's/\(add_dir=\"\)\$add_dir \(-L\$inst_prefix_dir\$libdir\"\)/\1\2/' $lt_file + done + make -j1 DESTDIR=$PKG install
mkdir $PKG/lib Thank you again John, good catch this one.
Applied: https://crux-arm.nu/gitweb?p=crossrootfs.git;a=commit;h=6c5365d2b585cb5ad291... Regards, -- Victor Martinez Learning bit by bit | http://vjml.es
participants (2)
-
John Vogel
-
Víctor Martínez