mirror of
https://git.yoctoproject.org/poky
synced 2026-02-08 18:02:12 +01:00
8e7b9685d2
- Backport a patch to fix build failure while APR 1.7.0 ... checking for apr_int64_t Python/C API format string... configure: error: failed to recognize APR_INT64_T_FMT on this platform ... - Rebase disable_macos.patch and serfmacro.patch License-update: no change, declare two new added file * in build/ac-macros/ax_boost_base.m4 * in build/ac-macros/ax_boost_unit_test_framework.m4 (From OE-Core rev: 68ae5e624642218e7e01805c096da09098a8706f) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
The existing sed expression can match expressions like
|
|
--sysroot=/some/path/xxx-linux/ which clearly isn't intended and injects
|
|
incorrect paths into LDFLAGS.
|
|
|
|
Fix this in the same way we address the problem in CFLAGS.
|
|
|
|
RP 2016/12/7
|
|
Upstream-Status: Pending
|
|
|
|
Rebase 1.12.0
|
|
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
|
---
|
|
build/ac-macros/serf.m4 | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/build/ac-macros/serf.m4 b/build/ac-macros/serf.m4
|
|
index 0a549b3..3a069ac 100644
|
|
--- a/build/ac-macros/serf.m4
|
|
+++ b/build/ac-macros/serf.m4
|
|
@@ -171,7 +171,7 @@ AC_DEFUN(SVN_SERF_PKG_CONFIG,
|
|
SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_pc_arg --cflags-only-I`]
|
|
SVN_SERF_LIBS=[`$PKG_CONFIG $serf_pc_arg --libs-only-l`]
|
|
dnl don't use --libs-only-L because then we might miss some options
|
|
- LDFLAGS=["$LDFLAGS `$PKG_CONFIG $serf_pc_arg --libs | $SED -e 's/-l[^ ]*//g'`"]
|
|
+ LDFLAGS=["$LDFLAGS `$PKG_CONFIG $serf_pc_arg --libs | $SED -e 's/ -l[^ ]*//g' -e 's/^-l[^ ]*//g'`"]
|
|
break
|
|
else
|
|
AC_MSG_RESULT([no])
|
|
--
|
|
2.7.4
|
|
|