From d9e898bdbc0828739425b25a6f23da198248f251 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Tue, 2 Jun 2009 17:33:04 +0000 Subject: /devel/gcc-4.4: - add a wrapper to correctly set LD_LIBRARY_PATH to find our companion libraries. -------- diffstat follows -------- /devel/gcc-4.4/scripts/build/internals.sh | 19 19 0 0 +++++++++++++++++++ /devel/gcc-4.4/scripts/wrapper.in | 15 15 0 0 +++++++++++++++ 2 files changed, 34 insertions(+) --- scripts/build/internals.sh | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'scripts/build/internals.sh') diff --git a/scripts/build/internals.sh b/scripts/build/internals.sh index acaf8647..51272e69 100644 --- a/scripts/build/internals.sh +++ b/scripts/build/internals.sh @@ -4,6 +4,8 @@ # un-wanted files, to add tuple aliases, and to add the final # crosstool-NG-provided files. do_finish() { + local _t + CT_DoStep INFO "Cleaning-up the toolchain's directory" CT_DoLog EXTRA "Removing access to the build system tools" @@ -39,6 +41,23 @@ do_finish() { done CT_Popd + # If using the companion libraries, we need a wrapper + # that will set LD_LIBRARY_PATH approriately + if [ "${CT_GMP_MPFR}" = "y" \ + -o "${CT_PPL_CLOOG_MPC}" = "y" ]; then + CT_DoLog EXTRA "Installing toolchain wrappers" + CT_Pushd "${CT_PREFIX_DIR}/bin" + sed -r -e 's|@@CT_bash@@|'"${bash}"'|g;' \ + "${CT_LIB_DIR}/scripts/wrapper.in" \ + >".${CT_TARGET}-wrapper" + CT_DoExecLog ALL chmod 755 ".${CT_TARGET}-wrapper" + for t in "${CT_TARGET}-"*; do + CT_DoExecLog ALL mv "${t}" ".${t}" + CT_DoExecLog ALL ln ".${CT_TARGET}-wrapper" "${t}" + done + CT_Popd + fi + # Remove the generated documentation files if [ "${CT_REMOVE_DOCS}" = "y" ]; then CT_DoLog EXTRA "Removing installed documentation" -- cgit v1.2.3 From a07693b13cd0741fe0de2d6756a7a3c680f3f689 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Tue, 2 Jun 2009 21:01:19 +0000 Subject: /devel/gcc-4.4: - ./configure: check for 'stat', needing to install the tools wrapper - wrapper: make it a POSIX-compliant script, restore relocatability - don't install the wrapper for symlinks -------- diffstat follows -------- /devel/gcc-4.4/configure | 1 1 0 0 + /devel/gcc-4.4/scripts/build/internals.sh | 22 16 6 0 ++++++++++++++++------ /devel/gcc-4.4/scripts/wrapper.in | 5 2 3 0 ++--- 3 files changed, 19 insertions(+), 9 deletions(-) --- configure | 1 + scripts/build/internals.sh | 22 ++++++++++++++++------ scripts/wrapper.in | 5 ++--- 3 files changed, 19 insertions(+), 9 deletions(-) (limited to 'scripts/build/internals.sh') diff --git a/configure b/configure index 518a3dbe..a43eb66d 100755 --- a/configure +++ b/configure @@ -337,6 +337,7 @@ has_or_abort prog=automake has_or_abort prog=libtool \ ver='\(GNU libtool.*\) (2[[:digit:]]*\.|1\.6[[:digit:]]*\.|1\.5\.[2-9][[:digit:]]+)' \ err="'libtool' 1.5.26 or above was not found" +has_or_abort prog=stat ver='GNU coreutils' has_or_abort prog="curl wget" has_or_abort prog=cvs has_or_abort prog=patch diff --git a/scripts/build/internals.sh b/scripts/build/internals.sh index 51272e69..b8a80f2e 100644 --- a/scripts/build/internals.sh +++ b/scripts/build/internals.sh @@ -47,14 +47,24 @@ do_finish() { -o "${CT_PPL_CLOOG_MPC}" = "y" ]; then CT_DoLog EXTRA "Installing toolchain wrappers" CT_Pushd "${CT_PREFIX_DIR}/bin" - sed -r -e 's|@@CT_bash@@|'"${bash}"'|g;' \ - "${CT_LIB_DIR}/scripts/wrapper.in" \ - >".${CT_TARGET}-wrapper" - CT_DoExecLog ALL chmod 755 ".${CT_TARGET}-wrapper" + + # Copy the wrapper + CT_DoExecLog DEBUG install -m 0755 "${CT_LIB_DIR}/scripts/wrapper.in" \ + ".${CT_TARGET}-wrapper" + + # Replace every tools with the wrapper + # Do it unconditionally, even for those tools that happen to be shell + # scripts, we don't know if they would in the end spawn a binary... + # Just skip symlinks for t in "${CT_TARGET}-"*; do - CT_DoExecLog ALL mv "${t}" ".${t}" - CT_DoExecLog ALL ln ".${CT_TARGET}-wrapper" "${t}" + if [ "$( LANG=C stat -c '%F' "${t}" )" != "symbolic link" ]; then + CT_DoExecLog ALL mv "${t}" ".${t}" + CT_DoExecLog ALL ln ".${CT_TARGET}-wrapper" "${t}" + fi done + + # Get rid of the wrapper, we're using hardlinks + CT_DoExecLog DEBUG rm -f ".${CT_TARGET}-wrapper" CT_Popd fi diff --git a/scripts/wrapper.in b/scripts/wrapper.in index 70cb5d31..6222333d 100644 --- a/scripts/wrapper.in +++ b/scripts/wrapper.in @@ -1,5 +1,4 @@ -#!@@CT_bash@@ -# There are bashisms on the last line +#!/bin/sh dirname="$(dirname "${0}")" basename="$(basename "${0}")" @@ -12,4 +11,4 @@ case ":${LD_LIBRARY_PATH}:" in esac export LD_LIBRARY_PATH -exec -a "${basename}" "${dirname}/.${basename}" "$@" +exec "${dirname}/.${basename}" "$@" -- cgit v1.2.3 From a7ff05b022a8db08185486fa0fbf324f2ecd9d3e Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 14 Jun 2009 22:57:57 +0200 Subject: [finish-step] Use local variable in finish-step When wrapping the tools, use a local variable when iterating. --- scripts/build/internals.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'scripts/build/internals.sh') diff --git a/scripts/build/internals.sh b/scripts/build/internals.sh index b8a80f2e..a262c1dd 100644 --- a/scripts/build/internals.sh +++ b/scripts/build/internals.sh @@ -56,10 +56,10 @@ do_finish() { # Do it unconditionally, even for those tools that happen to be shell # scripts, we don't know if they would in the end spawn a binary... # Just skip symlinks - for t in "${CT_TARGET}-"*; do - if [ "$( LANG=C stat -c '%F' "${t}" )" != "symbolic link" ]; then - CT_DoExecLog ALL mv "${t}" ".${t}" - CT_DoExecLog ALL ln ".${CT_TARGET}-wrapper" "${t}" + for _t in "${CT_TARGET}-"*; do + if [ "$( LANG=C stat -c '%F' "${_t}" )" != "symbolic link" ]; then + CT_DoExecLog ALL mv "${t}" ".${_t}" + CT_DoExecLog ALL ln ".${CT_TARGET}-wrapper" "${_t}" fi done -- cgit v1.2.3