diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2012-01-20 14:51:44 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2012-01-20 14:51:44 +0000 |
| commit | b44687638710dd2cdeb2947025e2aef260c2073e (patch) | |
| tree | 10e03a88fca2d2899541077bb25de41cb48e9f63 /tools/libtool/patches/000-relocatable.patch | |
| parent | 557cf076b4a8a5305f3dce3c8ad56c6f5584e04f (diff) | |
| download | upstream-b44687638710dd2cdeb2947025e2aef260c2073e.tar.gz upstream-b44687638710dd2cdeb2947025e2aef260c2073e.tar.bz2 upstream-b44687638710dd2cdeb2947025e2aef260c2073e.zip | |
libtool: make relocatable, search resources relative to STAGING_DIR
SVN-Revision: 29826
Diffstat (limited to 'tools/libtool/patches/000-relocatable.patch')
| -rw-r--r-- | tools/libtool/patches/000-relocatable.patch | 92 |
1 files changed, 92 insertions, 0 deletions
diff --git a/tools/libtool/patches/000-relocatable.patch b/tools/libtool/patches/000-relocatable.patch new file mode 100644 index 0000000000..d7f4fef005 --- /dev/null +++ b/tools/libtool/patches/000-relocatable.patch @@ -0,0 +1,92 @@ +--- a/libltdl/config/general.m4sh ++++ b/libltdl/config/general.m4sh +@@ -53,7 +53,7 @@ test "${ECHO+set}" = set || ECHO=${as_ec + : ${MKDIR="mkdir"} + : ${MV="mv -f"} + : ${RM="rm -f"} +-: ${SED="@SED@"} ++test "${STAGING_DIR+set}" = set && ${SED="$STAGING_DIR/../host/bin/sed"} || ${SED="@SED@"} + : ${SHELL="${CONFIG_SHELL-/bin/sh}"} + : ${Xsed="$SED -e 1s/^X//"} + +--- a/libtoolize.in ++++ b/libtoolize.in +@@ -334,7 +334,7 @@ test "${ECHO+set}" = set || ECHO=${as_ec + : ${MKDIR="mkdir"} + : ${MV="mv -f"} + : ${RM="rm -f"} +-: ${SED="@SED@"} ++test "${STAGING_DIR+set}" = set && ${SED="$STAGING_DIR/../host/bin/sed"} || ${SED="@SED@"} + : ${SHELL="${CONFIG_SHELL-/bin/sh}"} + : ${Xsed="$SED -e 1s/^X//"} + +@@ -2476,10 +2476,17 @@ func_check_macros () + + # Locations for important files: + prefix=@prefix@ +- datadir=@datadir@ +- pkgdatadir=@pkgdatadir@ +- pkgltdldir=@pkgdatadir@ +- aclocaldir=@aclocaldir@ ++ if test -n "$STAGING_DIR"; then ++ datadir="$STAGING_DIR/../host/share" ++ pkgdatadir="$STAGING_DIR/../host/share/libtool" ++ pkgltdldir="$STAGING_DIR/../host/share/libtool" ++ aclocaldir="$STAGING_DIR/../host/share/aclocal" ++ else ++ datadir=@datadir@ ++ pkgdatadir=@pkgdatadir@ ++ pkgltdldir=@pkgdatadir@ ++ aclocaldir=@aclocaldir@ ++ fi + auxdir= + macrodir= + configure_ac=configure.in +--- a/libtoolize.m4sh ++++ b/libtoolize.m4sh +@@ -1450,10 +1450,17 @@ func_check_macros () + + # Locations for important files: + prefix=@prefix@ +- datadir=@datadir@ +- pkgdatadir=@pkgdatadir@ +- pkgltdldir=@pkgdatadir@ +- aclocaldir=@aclocaldir@ ++ if test -n "$STAGING_DIR"; then ++ datadir="$STAGING_DIR/../host/share" ++ pkgdatadir="$STAGING_DIR/../host/share/libtool" ++ pkgltdldir="$STAGING_DIR/../host/share/libtool" ++ aclocaldir="$STAGING_DIR/../host/share/aclocal" ++ else ++ datadir=@datadir@ ++ pkgdatadir=@pkgdatadir@ ++ pkgltdldir=@pkgdatadir@ ++ aclocaldir=@aclocaldir@ ++ fi + auxdir= + macrodir= + configure_ac=configure.in +--- a/libltdl/m4/libtool.m4 ++++ b/libltdl/m4/libtool.m4 +@@ -875,9 +875,8 @@ dnl AC_DEFUN([AC_LIBTOOL_RC], []) + # ---------------- + m4_defun([_LT_TAG_COMPILER], + [AC_REQUIRE([AC_PROG_CC])dnl +- + _LT_DECL([LTCC], [CC], [1], [A C compiler])dnl +-_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl ++_LT_DECL([LTCFLAGS], [CFLAGS], ["-O2 -I\${STAGING_DIR:-$STAGING_DIR}/../host/include"], [LTCC compiler flags])dnl + _LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl + _LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl + +@@ -7544,9 +7543,8 @@ AC_SUBST([DLLTOOL]) + # as few characters as possible. Prefer GNU sed if found. + m4_defun([_LT_DECL_SED], + [AC_PROG_SED +-test -z "$SED" && SED=sed + Xsed="$SED -e 1s/^X//" +-_LT_DECL([], [SED], [1], [A sed program that does not truncate output]) ++_LT_DECL([], [SED], ["\${STAGING_DIR:-$STAGING_DIR}/../host/bin/sed"], [A sed program that does not truncate output]) + _LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"], + [Sed that helps us avoid accidentally triggering echo(1) options like -n]) + ])# _LT_DECL_SED |