ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-18 21:28:02 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

libtool: use STAGING_DIR_HOST in relocatable patch

Browse Source 
Instead of using STAGING_DIR and then go up one dir with '../' use
directly STAGING_DIR_HOST env variable. This should produce cleaner
symbolic links.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
Christian Marangi 2022-11-10 17:48:54 +01:00
parent b344da7640
commit 7b56ca399a
No known key found for this signature in database
GPG Key ID: AC001D09ADBFEAD7
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
tools/libtool/patches/000-relocatable.patch
View File

@ -13,11 +13,11 @@
: ${MV="mv -f"} : ${MV="mv -f"}
: ${RM="rm -f"} : ${RM="rm -f"}
-: ${SED="@SED@"} -: ${SED="@SED@"}
+if test -n "$STAGING_DIR"; then +if test -n "$STAGING_DIR_HOST"; then
+ : ${EGREP="$STAGING_DIR/../host/bin/grep -E"} + : ${EGREP="$STAGING_DIR_HOST/bin/grep -E"}
+ : ${FGREP="$STAGING_DIR/../host/bin/grep -F"} + : ${FGREP="$STAGING_DIR_HOST/bin/grep -F"}
+ : ${GREP="$STAGING_DIR/../host/bin/grep"} + : ${GREP="$STAGING_DIR_HOST/bin/grep"}
+ : ${SED="$STAGING_DIR/../host/bin/sed"} + : ${SED="$STAGING_DIR_HOST/bin/sed"}
+else +else
+ : ${EGREP="@EGREP@"} + : ${EGREP="@EGREP@"}
+ : ${FGREP="@FGREP@"} + : ${FGREP="@FGREP@"}
@ -42,11 +42,11 @@
: ${MV="mv -f"} : ${MV="mv -f"}
: ${RM="rm -f"} : ${RM="rm -f"}
-: ${SED="@SED@"} -: ${SED="@SED@"}
+if test -n "$STAGING_DIR"; then +if test -n "$STAGING_DIR_HOST"; then
+ : ${EGREP="$STAGING_DIR/../host/bin/grep -E"} + : ${EGREP="$STAGING_DIR_HOST/bin/grep -E"}
+ : ${FGREP="$STAGING_DIR/../host/bin/grep -F"} + : ${FGREP="$STAGING_DIR_HOST/bin/grep -F"}
+ : ${GREP="$STAGING_DIR/../host/bin/grep"} + : ${GREP="$STAGING_DIR_HOST/bin/grep"}
+ : ${SED="$STAGING_DIR/../host/bin/sed"} + : ${SED="$STAGING_DIR_HOST/bin/sed"}
+else +else
+ : ${EGREP="@EGREP@"} + : ${EGREP="@EGREP@"}
+ : ${FGREP="@FGREP@"} + : ${FGREP="@FGREP@"}
@ -64,11 +64,11 @@
- pkgdatadir=@pkgdatadir@ - pkgdatadir=@pkgdatadir@
- pkgltdldir=@pkgdatadir@ - pkgltdldir=@pkgdatadir@
- aclocaldir=@aclocaldir@ - aclocaldir=@aclocaldir@
+ if test -n "$STAGING_DIR"; then + if test -n "$STAGING_DIR_HOST"; then
+ datadir="$STAGING_DIR/../host/share" + datadir="$STAGING_DIR_HOST/share"
+ pkgdatadir="$STAGING_DIR/../host/share/libtool" + pkgdatadir="$STAGING_DIR_HOST/share/libtool"
+ pkgltdldir="$STAGING_DIR/../host/share/libtool" + pkgltdldir="$STAGING_DIR_HOST/share/libtool"
+ aclocaldir="$STAGING_DIR/../host/share/aclocal" + aclocaldir="$STAGING_DIR_HOST/share/aclocal"
+ else + else
+ datadir=@datadir@ + datadir=@datadir@
+ pkgdatadir=@pkgdatadir@ + pkgdatadir=@pkgdatadir@
@ -88,11 +88,11 @@
- pkgdatadir=@pkgdatadir@ - pkgdatadir=@pkgdatadir@
- pkgltdldir=@pkgdatadir@ - pkgltdldir=@pkgdatadir@
- aclocaldir=@aclocaldir@ - aclocaldir=@aclocaldir@
+ if test -n "$STAGING_DIR"; then + if test -n "$STAGING_DIR_HOST"; then
+ datadir="$STAGING_DIR/../host/share" + datadir="$STAGING_DIR_HOST/share"
+ pkgdatadir="$STAGING_DIR/../host/share/libtool" + pkgdatadir="$STAGING_DIR_HOST/share/libtool"
+ pkgltdldir="$STAGING_DIR/../host/share/libtool" + pkgltdldir="$STAGING_DIR_HOST/share/libtool"
+ aclocaldir="$STAGING_DIR/../host/share/aclocal" + aclocaldir="$STAGING_DIR_HOST/share/aclocal"
+ else + else
+ datadir=@datadir@ + datadir=@datadir@
+ pkgdatadir=@pkgdatadir@ + pkgdatadir=@pkgdatadir@
@ -111,7 +111,7 @@
- -
_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl _LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
-_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])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_DECL([LTCFLAGS], [CFLAGS], ["-O2 -I\${STAGING_DIR_HOST:-$STAGING_DIR_HOST}/include"], [LTCC compiler flags])dnl
_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl _LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl _LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
@ -122,9 +122,9 @@
-_LT_DECL([], [GREP], [1], [A grep program that handles long lines]) -_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
-_LT_DECL([], [EGREP], [1], [An ERE matcher]) -_LT_DECL([], [EGREP], [1], [An ERE matcher])
-_LT_DECL([], [FGREP], [1], [A literal string matcher]) -_LT_DECL([], [FGREP], [1], [A literal string matcher])
+_LT_DECL([], [GREP], ["\${STAGING_DIR:-$STAGING_DIR}/../host/bin/grep"], [A grep program that handles long lines]) +_LT_DECL([], [GREP], ["\${STAGING_DIR_HOST:-$STAGING_DIR_HOST}/bin/grep"], [A grep program that handles long lines])
+_LT_DECL([], [EGREP], ["\${STAGING_DIR:-$STAGING_DIR}/../host/bin/grep -E"], [An ERE matcher]) +_LT_DECL([], [EGREP], ["\${STAGING_DIR_HOST:-$STAGING_DIR_HOST}/bin/grep -E"], [An ERE matcher])
+_LT_DECL([], [FGREP], ["\${STAGING_DIR:-$STAGING_DIR}/../host/bin/grep -F"], [A literal string matcher]) +_LT_DECL([], [FGREP], ["\${STAGING_DIR_HOST:-$STAGING_DIR_HOST}/bin/grep -F"], [A literal string matcher])
dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
AC_SUBST([GREP]) AC_SUBST([GREP])
]) ])
@ -135,7 +135,7 @@
-test -z "$SED" && SED=sed -test -z "$SED" && SED=sed
Xsed="$SED -e 1s/^X//" Xsed="$SED -e 1s/^X//"
-_LT_DECL([], [SED], [1], [A sed program that does not truncate output]) -_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([], [SED], ["\${STAGING_DIR_HOST:-$STAGING_DIR_HOST}/bin/sed"], [A sed program that does not truncate output])
_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"], _LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
[Sed that helps us avoid accidentally triggering echo(1) options like -n]) [Sed that helps us avoid accidentally triggering echo(1) options like -n])
])# _LT_DECL_SED ])# _LT_DECL_SED