diff options
Diffstat (limited to 'debian/patches/129_multiarch_libpath.patch')
| -rw-r--r-- | debian/patches/129_multiarch_libpath.patch | 55 |
1 files changed, 21 insertions, 34 deletions
diff --git a/debian/patches/129_multiarch_libpath.patch b/debian/patches/129_multiarch_libpath.patch index 9b59471..0af9090 100644 --- a/debian/patches/129_multiarch_libpath.patch +++ b/debian/patches/129_multiarch_libpath.patch @@ -1,10 +1,8 @@ # DP: Add multiarch directories to linker search path for ld and gold. -Index: b/ld/genscripts.sh -=================================================================== --- a/ld/genscripts.sh +++ b/ld/genscripts.sh -@@ -189,6 +189,104 @@ append_to_lib_path() +@@ -235,6 +235,104 @@ append_to_lib_path() fi } @@ -109,21 +107,21 @@ Index: b/ld/genscripts.sh # Always search $(tooldir)/lib, aka /usr/local/TARGET/lib when native # except when LIBPATH=":". if [ "${LIB_PATH}" != ":" ] ; then -@@ -205,31 +303,138 @@ if [ "${LIB_PATH}" != ":" ] ; then - # vs. /usr/s390-linux/lib64) - case "${NATIVE}:${LIBPATH_SUFFIX}:${TOOL_LIB}" in - :* | *::* | *:*:*${LIBPATH_SUFFIX}) ;; -- *) libs="${exec_prefix}/${target_alias}/lib${LIBPATH_SUFFIX}" ;; -+ *) -+ # FIXME: -+ # For the binutils-multiarch build on x86_64-linux-gnu configured -+ # with --enable-targets=powerpc-linux-gnu, /usr/x86_64-linux-gnu/lib64 -+ # is added instead of /usr/powerpc64-linux-gnu/lib64. However this -+ # probably wanted for the "default" emulation. How to detect that? -+ libs="${exec_prefix}/${target_alias}/lib${LIBPATH_SUFFIX}" ;; - esac +@@ -253,6 +351,13 @@ if [ "${LIB_PATH}" != ":" ] ; then + case "${NATIVE}:${libpath_suffix}:${TOOL_LIB}" in + :* | *::* | *:*:*${libpath_suffix}) ;; + *) libs="${exec_prefix}/${target_alias}/lib${libpath_suffix}" ;; ++ *) ++ # FIXME: ++ # For the binutils-multiarch build on x86_64-linux-gnu configured ++ # with --enable-targets=powerpc-linux-gnu, /usr/x86_64-linux-gnu/lib64 ++ # is added instead of /usr/powerpc64-linux-gnu/lib64. However this ++ # probably wanted for the "default" emulation. How to detect that? ++ libs="${exec_prefix}/${target_alias}/lib${libpath_suffix}" ;; + esac + done libs="${exec_prefix}/${TOOL_LIB}/lib ${libs}" - fi +@@ -260,24 +365,124 @@ if [ "${LIB_PATH}" != ":" ] ; then append_to_lib_path ${libs} fi @@ -257,16 +255,13 @@ Index: b/ld/genscripts.sh + LIB_SEARCH_DIRS="${LIB_SEARCH_DIRS}SEARCH_DIR(\"$dir\"); " + done +fi -+echo X3: $LIB_PATH + # We need it for testsuite. set $EMULATION_LIBPATH if [ "x$1" = "x$EMULATION_NAME" ]; then -Index: b/gold/Makefile.am -=================================================================== --- a/gold/Makefile.am +++ b/gold/Makefile.am -@@ -38,6 +38,7 @@ AM_CPPFLAGS = \ +@@ -42,6 +42,7 @@ AM_CPPFLAGS = \ -I$(srcdir) -I$(srcdir)/../include -I$(srcdir)/../elfcpp \ -DLOCALEDIR="\"$(datadir)/locale\"" \ -DBINDIR="\"$(bindir)\"" -DTOOLBINDIR="\"$(tooldir)/bin\"" \ @@ -274,11 +269,9 @@ Index: b/gold/Makefile.am -DTOOLLIBDIR="\"$(tooldir)/lib\"" @INCINTL@ LIBIBERTY = ../libiberty/libiberty.a -Index: b/gold/configure -=================================================================== --- a/gold/configure +++ b/gold/configure -@@ -594,6 +594,7 @@ LTLIBOBJS +@@ -625,6 +625,7 @@ LTLIBOBJS MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -286,7 +279,7 @@ Index: b/gold/configure DLOPEN_LIBS CXXCPP HAVE_NO_USE_LINKER_PLUGIN_FALSE -@@ -7720,6 +7721,14 @@ $as_echo "#define HAVE_LC_MESSAGES 1" >> +@@ -10170,6 +10171,14 @@ $as_echo "#define HAVE_LC_MESSAGES 1" >> fi @@ -301,11 +294,9 @@ Index: b/gold/configure { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } -Index: b/gold/configure.ac -=================================================================== --- a/gold/configure.ac +++ b/gold/configure.ac -@@ -662,6 +662,14 @@ AC_CHECK_HEADERS(locale.h) +@@ -682,6 +682,14 @@ AC_CHECK_HEADERS(locale.h) AC_CHECK_FUNCS(setlocale) AM_LC_MESSAGES @@ -320,11 +311,9 @@ Index: b/gold/configure.ac AM_MAINTAINER_MODE AC_OUTPUT(Makefile testsuite/Makefile po/Makefile.in:po/Make-in) -Index: b/gold/options.cc -=================================================================== --- a/gold/options.cc +++ b/gold/options.cc -@@ -1227,8 +1227,15 @@ General_options::finalize() +@@ -1232,8 +1232,15 @@ General_options::finalize() || this->user_set_sysroot() || *TARGET_SYSTEM_ROOT != '\0') { @@ -340,11 +329,9 @@ Index: b/gold/options.cc } else this->add_to_library_path_with_sysroot(TOOLLIBDIR); -Index: b/gold/Makefile.in -=================================================================== --- a/gold/Makefile.in +++ b/gold/Makefile.in -@@ -490,6 +490,7 @@ AM_CPPFLAGS = \ +@@ -674,6 +674,7 @@ AM_CPPFLAGS = \ -I$(srcdir) -I$(srcdir)/../include -I$(srcdir)/../elfcpp \ -DLOCALEDIR="\"$(datadir)/locale\"" \ -DBINDIR="\"$(bindir)\"" -DTOOLBINDIR="\"$(tooldir)/bin\"" \ |