OpenWrt – Blame information for rev 4

Subversion Repositories:
Rev:
Rev Author Line No. Line
4 office 1 --- a/libltdl/config/general.m4sh
2 +++ b/libltdl/config/general.m4sh
3 @@ -45,15 +45,22 @@ progpath="$0"
4 M4SH_VERBATIM([[
5 : ${CP="cp -f"}
6 test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
7 -: ${EGREP="@EGREP@"}
8 -: ${FGREP="@FGREP@"}
9 -: ${GREP="@GREP@"}
10 : ${LN_S="@LN_S@"}
11 : ${MAKE="make"}
12 : ${MKDIR="mkdir"}
13 : ${MV="mv -f"}
14 : ${RM="rm -f"}
15 -: ${SED="@SED@"}
16 +if test -n "$STAGING_DIR"; then
17 + : ${EGREP="$STAGING_DIR/../host/bin/grep -E"}
18 + : ${FGREP="$STAGING_DIR/../host/bin/grep -F"}
19 + : ${GREP="$STAGING_DIR/../host/bin/grep"}
20 + : ${SED="$STAGING_DIR/../host/bin/sed"}
21 +else
22 + : ${EGREP="@EGREP@"}
23 + : ${FGREP="@FGREP@"}
24 + : ${GREP="@GREP@"}
25 + : ${SED="@SED@"}
26 +fi
27 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
28 : ${Xsed="$SED -e 1s/^X//"}
29  
30 --- a/libtoolize.in
31 +++ b/libtoolize.in
32 @@ -326,15 +326,22 @@ as_unset=as_fn_unset
33  
34 : ${CP="cp -f"}
35 test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
36 -: ${EGREP="@EGREP@"}
37 -: ${FGREP="@FGREP@"}
38 -: ${GREP="@GREP@"}
39 : ${LN_S="@LN_S@"}
40 : ${MAKE="make"}
41 : ${MKDIR="mkdir"}
42 : ${MV="mv -f"}
43 : ${RM="rm -f"}
44 -: ${SED="@SED@"}
45 +if test -n "$STAGING_DIR"; then
46 + : ${EGREP="$STAGING_DIR/../host/bin/grep -E"}
47 + : ${FGREP="$STAGING_DIR/../host/bin/grep -F"}
48 + : ${GREP="$STAGING_DIR/../host/bin/grep"}
49 + : ${SED="$STAGING_DIR/../host/bin/sed"}
50 +else
51 + : ${EGREP="@EGREP@"}
52 + : ${FGREP="@FGREP@"}
53 + : ${GREP="@GREP@"}
54 + : ${SED="@SED@"}
55 +fi
56 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
57 : ${Xsed="$SED -e 1s/^X//"}
58  
59 @@ -2476,10 +2483,17 @@ func_check_macros ()
60  
61 # Locations for important files:
62 prefix=@prefix@
63 - datadir=@datadir@
64 - pkgdatadir=@pkgdatadir@
65 - pkgltdldir=@pkgdatadir@
66 - aclocaldir=@aclocaldir@
67 + if test -n "$STAGING_DIR"; then
68 + datadir="$STAGING_DIR/../host/share"
69 + pkgdatadir="$STAGING_DIR/../host/share/libtool"
70 + pkgltdldir="$STAGING_DIR/../host/share/libtool"
71 + aclocaldir="$STAGING_DIR/../host/share/aclocal"
72 + else
73 + datadir=@datadir@
74 + pkgdatadir=@pkgdatadir@
75 + pkgltdldir=@pkgdatadir@
76 + aclocaldir=@aclocaldir@
77 + fi
78 auxdir=
79 macrodir=
80 configure_ac=configure.in
81 --- a/libtoolize.m4sh
82 +++ b/libtoolize.m4sh
83 @@ -1450,10 +1450,17 @@ func_check_macros ()
84  
85 # Locations for important files:
86 prefix=@prefix@
87 - datadir=@datadir@
88 - pkgdatadir=@pkgdatadir@
89 - pkgltdldir=@pkgdatadir@
90 - aclocaldir=@aclocaldir@
91 + if test -n "$STAGING_DIR"; then
92 + datadir="$STAGING_DIR/../host/share"
93 + pkgdatadir="$STAGING_DIR/../host/share/libtool"
94 + pkgltdldir="$STAGING_DIR/../host/share/libtool"
95 + aclocaldir="$STAGING_DIR/../host/share/aclocal"
96 + else
97 + datadir=@datadir@
98 + pkgdatadir=@pkgdatadir@
99 + pkgltdldir=@pkgdatadir@
100 + aclocaldir=@aclocaldir@
101 + fi
102 auxdir=
103 macrodir=
104 configure_ac=configure.in
105 --- a/libltdl/m4/libtool.m4
106 +++ b/libltdl/m4/libtool.m4
107 @@ -875,9 +875,8 @@ dnl AC_DEFUN([AC_LIBTOOL_RC], [])
108 # ----------------
109 m4_defun([_LT_TAG_COMPILER],
110 [AC_REQUIRE([AC_PROG_CC])dnl
111 -
112 _LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
113 -_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
114 +_LT_DECL([LTCFLAGS], [CFLAGS], ["-O2 -I\${STAGING_DIR:-$STAGING_DIR}/../host/include"], [LTCC compiler flags])dnl
115 _LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
116 _LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
117  
118 @@ -7509,9 +7508,9 @@ m4_defun([_LT_DECL_EGREP],
119 [AC_REQUIRE([AC_PROG_EGREP])dnl
120 AC_REQUIRE([AC_PROG_FGREP])dnl
121 test -z "$GREP" && GREP=grep
122 -_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
123 -_LT_DECL([], [EGREP], [1], [An ERE matcher])
124 -_LT_DECL([], [FGREP], [1], [A literal string matcher])
125 +_LT_DECL([], [GREP], ["\${STAGING_DIR:-$STAGING_DIR}/../host/bin/grep"], [A grep program that handles long lines])
126 +_LT_DECL([], [EGREP], ["\${STAGING_DIR:-$STAGING_DIR}/../host/bin/grep -E"], [An ERE matcher])
127 +_LT_DECL([], [FGREP], ["\${STAGING_DIR:-$STAGING_DIR}/../host/bin/grep -F"], [A literal string matcher])
128 dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
129 AC_SUBST([GREP])
130 ])
131 @@ -7544,9 +7543,8 @@ AC_SUBST([DLLTOOL])
132 # as few characters as possible. Prefer GNU sed if found.
133 m4_defun([_LT_DECL_SED],
134 [AC_PROG_SED
135 -test -z "$SED" && SED=sed
136 Xsed="$SED -e 1s/^X//"
137 -_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
138 +_LT_DECL([], [SED], ["\${STAGING_DIR:-$STAGING_DIR}/../host/bin/sed"], [A sed program that does not truncate output])
139 _LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
140 [Sed that helps us avoid accidentally triggering echo(1) options like -n])
141 ])# _LT_DECL_SED