1 From ca10caa502f971f90d8c041aa2476de54ef0ce2b Mon Sep 17 00:00:00 2001
2 From: Eneas U de Queiroz <cotequeiroz@gmail.com>
3 Date: Tue, 20 Jul 2021 16:41:11 -0300
4 Subject: openwrt: make relocatable, search resources relative to STAGING_DIR
6 This was originally commited to openwrt by Jo-Philipp Wich
9 Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
11 --- a/libltdl/config/general.m4sh
12 +++ b/libltdl/config/general.m4sh
13 @@ -45,15 +45,22 @@ progpath="$0"
16 test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
26 +if test -n "$STAGING_DIR_HOST"; then
27 + : ${EGREP="$STAGING_DIR_HOST/bin/grep -E"}
28 + : ${FGREP="$STAGING_DIR_HOST/bin/grep -F"}
29 + : ${GREP="$STAGING_DIR_HOST/bin/grep"}
30 + : ${SED="$STAGING_DIR_HOST/bin/sed"}
32 + : ${EGREP="@EGREP@"}
33 + : ${FGREP="@FGREP@"}
37 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
38 : ${Xsed="$SED -e 1s/^X//"}
42 @@ -334,15 +334,22 @@ as_unset=as_fn_unset
45 test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
55 +if test -n "$STAGING_DIR_HOST"; then
56 + : ${EGREP="$STAGING_DIR_HOST/bin/grep -E"}
57 + : ${FGREP="$STAGING_DIR_HOST/bin/grep -F"}
58 + : ${GREP="$STAGING_DIR_HOST/bin/grep"}
59 + : ${SED="$STAGING_DIR_HOST/bin/sed"}
61 + : ${EGREP="@EGREP@"}
62 + : ${FGREP="@FGREP@"}
66 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
67 : ${Xsed="$SED -e 1s/^X//"}
69 @@ -2487,10 +2494,17 @@ func_check_macros ()
71 # Locations for important files:
74 - pkgdatadir=@pkgdatadir@
75 - pkgltdldir=@pkgdatadir@
76 - aclocaldir=@aclocaldir@
77 + if test -n "$STAGING_DIR_HOST"; then
78 + datadir="$STAGING_DIR_HOST/share"
79 + pkgdatadir="$STAGING_DIR_HOST/share/libtool"
80 + pkgltdldir="$STAGING_DIR_HOST/share/libtool"
81 + aclocaldir="$STAGING_DIR_HOST/share/aclocal"
84 + pkgdatadir=@pkgdatadir@
85 + pkgltdldir=@pkgdatadir@
86 + aclocaldir=@aclocaldir@
90 configure_ac=configure.in
93 @@ -1453,10 +1453,17 @@ func_check_macros ()
95 # Locations for important files:
98 - pkgdatadir=@pkgdatadir@
99 - pkgltdldir=@pkgdatadir@
100 - aclocaldir=@aclocaldir@
101 + if test -n "$STAGING_DIR_HOST"; then
102 + datadir="$STAGING_DIR_HOST/share"
103 + pkgdatadir="$STAGING_DIR_HOST/share/libtool"
104 + pkgltdldir="$STAGING_DIR_HOST/share/libtool"
105 + aclocaldir="$STAGING_DIR_HOST/share/aclocal"
108 + pkgdatadir=@pkgdatadir@
109 + pkgltdldir=@pkgdatadir@
110 + aclocaldir=@aclocaldir@
114 configure_ac=configure.in
115 --- a/libltdl/m4/libtool.m4
116 +++ b/libltdl/m4/libtool.m4
117 @@ -909,7 +909,7 @@ m4_defun([_LT_TAG_COMPILER],
118 [AC_REQUIRE([AC_PROG_CC])dnl
120 _LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
121 -_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
122 +_LT_DECL([LTCFLAGS], [CFLAGS], ["-O2 -I\${STAGING_DIR_HOST:-$STAGING_DIR_HOST}/include"], [LTCC compiler flags])dnl
123 _LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
124 _LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
126 @@ -7660,9 +7660,9 @@ m4_defun([_LT_DECL_EGREP],
127 [AC_REQUIRE([AC_PROG_EGREP])dnl
128 AC_REQUIRE([AC_PROG_FGREP])dnl
129 test -z "$GREP" && GREP=grep
130 -_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
131 -_LT_DECL([], [EGREP], [1], [An ERE matcher])
132 -_LT_DECL([], [FGREP], [1], [A literal string matcher])
133 +_LT_DECL([], [GREP], ["\${STAGING_DIR_HOST:-$STAGING_DIR_HOST}/bin/grep"], [A grep program that handles long lines])
134 +_LT_DECL([], [EGREP], ["\${STAGING_DIR_HOST:-$STAGING_DIR_HOST}/bin/grep -E"], [An ERE matcher])
135 +_LT_DECL([], [FGREP], ["\${STAGING_DIR_HOST:-$STAGING_DIR_HOST}/bin/grep -F"], [A literal string matcher])
136 dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
139 @@ -7695,9 +7695,8 @@ AC_SUBST([DLLTOOL])
140 # as few characters as possible. Prefer GNU sed if found.
141 m4_defun([_LT_DECL_SED],
143 -test -z "$SED" && SED=sed
144 Xsed="$SED -e 1s/^X//"
145 -_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
146 +_LT_DECL([], [SED], ["\${STAGING_DIR_HOST:-$STAGING_DIR_HOST}/bin/sed"], [A sed program that does not truncate output])
147 _LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
148 [Sed that helps us avoid accidentally triggering echo(1) options like -n])