source: scripts/patches/binutils-2.15.91.0.1-genscripts-multilib.patch@ 42da714

clfs-1.2 clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since 42da714 was 7f65c0e, checked in by Jim Gifford <clfs@…>, 19 years ago

r625@server (orig r623): jim | 2005-10-31 12:43:24 -0800
Final Move
  • Property mode set to 100644
File size: 2.2 KB

  • binutils-2.15.91.0. 

    Submitted By: Ryan Oliver (ryan dot oliver at pha dot com dot au)
Origin: Ryan Oliver
Date: 2004-07-15
Initial package version: 2.15 (problem also exists in 2.14 series)
Description:
	Updated patch, use this for all binutils 2.15 series instead of the
	binutils-2.15.90.0.1-genscripts-multilib.patch

	If --with-libpath= was specified during configure (or LIB_PATH was 
	supplied during make) we want to have these libraries added to the
	linker scripts search paths, and in the case of multi-lib have them
	processed to provide both lib and lib64 search paths.
	This patch produces this behaviour when building a cross-binutils.

	Also to fix an annoyance we remove whatever was specified (if anything)
	by --libdir= from the linker script search path. This is so when cross-
	compiling a 64bit target-native biarch toolchain we can specify the
	installation directory for binutils produced libraries to be */lib64
	without having this directory added to the 32bit emulation search path.

	By rights we should really check if ${libdir} matches a search path in
	any of the supported emulations for this target (as opposed to only the
	one genscripts.sh is currently processing) and if so ignore ${libpath}.
    old new  
    105105      USE_LIBPATH=yes
    106106    elif [ "x${use_sysroot}" = "xyes" ] ; then
    107107      USE_LIBPATH=yes
     108    elif [ "x${LIB_PATH}" != "x" ] ; then
     109      USE_LIBPATH=yes
    108110    fi
    109111    ;;
    110112esac
    … …  
    125127#
    126128# If the emulparams file set LIBPATH_SUFFIX, prepend an extra copy of
    127129# the library path with the suffix applied.
    128 
    129 if [ "x${LIB_PATH}" = "x" ] && [ "x${USE_LIBPATH}" = xyes ] ; then
     130if [ "x${USE_LIBPATH}" = xyes ] ; then
    130131  LIB_PATH2=
     132  if [ "x${LIB_PATH}" = "x" ] ; then
     133    libs="${NATIVE_LIB_DIRS}"
     134  else
     135    libs=`echo ${LIB_PATH} | sed 's/:/ /g'`
     136    LIB_PATH=
     137  fi
    131138
    132   libs=${NATIVE_LIB_DIRS}
    133139  if [ "x${use_sysroot}" != "xyes" ] ; then
    134140    case " ${libs} " in
    135       *" ${libdir} "*) ;;
    136       *) libs="${libdir} ${libs}" ;;
    137     esac
    138     case " ${libs} " in
    139141      *" ${tool_lib} "*) ;;
    140142      *) libs="${tool_lib} ${libs}" ;;
    141143    esac
Note: See TracBrowser for help on using the repository browser.