subversion: Fix issues in LDFLAGS sed manipulation
PATCH 1/1 subversion: Fix issues in LDFLAGS sed manipulation
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. This fixes corrupt build paths and incorrect paths in .la files amongst other issues.
Signed-off-by Richard Purdie <[email protected]>
--- .../subversion/subversion/serfmacro.patch | 22 ++++++++++++++++++++++ .../subversion/subversion_1.9.4.bb | 1 + 2 files changed, 23 insertions(+) create mode 100644 meta/recipes-devtools/subversion/subversion/serfmacro.patch
meta/recipes-devtools/subversion/subversion/serfmacro.patch new file +22 -0
@@ -0,0 +1,22 @@ +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 + +Index: subversion-1.9.4/build/ac-macros/serf.m4 +=================================================================== +--- subversion-1.9.4.orig/build/ac-macros/serf.m4 ++++ subversion-1.9.4/build/ac-macros/serf.m4 +@@ -171,7 +171,7 @@ AC_DEFUN(SVN_SERF_PKG_CONFIG, + SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_pc_arg --cflags | $SED -e 's/ -D[^ ]*//g' -e 's/^-D[^ ]*//g'`] + 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])
meta/recipes-devtools/subversion/subversion_1.9.4.bb +1 -0
@@ -15,6 +15,7 @@ SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://serf.m4-Regex-modified-to-allow-D-in-paths.patch \ file://0001-Fix-libtool-name-in-configure.ac.patch \ file://0001-fix-svnadmin-create-fail-on-x86.patch \ + file://serfmacro.patch \ " SRC_URI[md5sum] = "29121a038f87641055a8183f49e9739f"
Signature · 1 line
2.7.4