[packages/xfsprogs] - force ld.bfd for dietlibc build (gold gets hit by internal error on x86)

qboosh qboosh at pld-linux.org
Thu May 9 20:41:00 CEST 2013


commit adcc007484140e754b7632b565bea8ca8f5f563b
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu May 9 20:40:52 2013 +0200

    - force ld.bfd for dietlibc build (gold gets hit by internal error on x86)

 xfsprogs.spec | 9 +++++++++
 1 file changed, 9 insertions(+)
---
diff --git a/xfsprogs.spec b/xfsprogs.spec
index a448740..015fa03 100644
--- a/xfsprogs.spec
+++ b/xfsprogs.spec
@@ -138,7 +138,15 @@ Zbiór komend do użytku z systemem plików XFS, włączając w to mkfs.xfs
 %{__aclocal} -I m4
 
 %if %{with initrd}
+oldPATH="$PATH"
 %if %{with dietlibc}
+# gold (2.23.52.0.2) on x86 fails with:
+# /usr/bin/ld: internal error in set_offset, at output.cc:4665
+if [ -x /usr/bin/ld.bfd ]; then
+	install -d ld-dir
+	ln -sf /usr/bin/ld.bfd ld-dir/ld
+	export PATH="$(pwd)/ld-dir:$PATH"
+fi
 # dietlibc doesn't have aio.h (and xfsprogs does not need it really)
 # dietlibc has needed librt stuff in libc/libpthread
 sed -i -e 's|^AC_PACKAGE_NEED_AIO_H|dnl AC_PACKAGE_NEED_AIO_H|' \
@@ -182,6 +190,7 @@ sed -i -e 's|\(^LLDLIBS.*=.*\) -lcompat|\1|' db/Makefile mkfs/Makefile
 %endif
 
 %{__make} clean
+PATH="$oldPATH"
 %endif
 
 %{__autoconf}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xfsprogs.git/commitdiff/adcc007484140e754b7632b565bea8ca8f5f563b



More information about the pld-cvs-commit mailing list