| Brad Bishop | 37a0e4d | 2017-12-04 01:01:44 -0500 | [diff] [blame^] | 1 | The existing sed expression can match expressions like |
| 2 | --sysroot=/some/path/xxx-linux/ which clearly isn't intended and |
| 3 | injects incorrect paths into LDFLAGS. |
| 4 | |
| 5 | Fix this in the same way we address the problem in CFLAGS. |
| 6 | |
| 7 | RP 2016/12/7 |
| 8 | Upstream-Status: Pending |
| 9 | |
| 10 | Index: subversion-1.9.4/build/ac-macros/serf.m4 |
| 11 | =================================================================== |
| 12 | --- subversion-1.9.4.orig/build/ac-macros/serf.m4 |
| 13 | +++ subversion-1.9.4/build/ac-macros/serf.m4 |
| 14 | @@ -171,7 +171,7 @@ AC_DEFUN(SVN_SERF_PKG_CONFIG, |
| 15 | SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_pc_arg --cflags | $SED -e 's/ -D[^ ]*//g' -e 's/^-D[^ ]*//g'`] |
| 16 | SVN_SERF_LIBS=`$PKG_CONFIG $serf_pc_arg --libs-only-l` |
| 17 | dnl don't use --libs-only-L because then we might miss some options |
| 18 | - LDFLAGS=["$LDFLAGS `$PKG_CONFIG $serf_pc_arg --libs | $SED -e 's/-l[^ ]*//g'`"] |
| 19 | + LDFLAGS=["$LDFLAGS `$PKG_CONFIG $serf_pc_arg --libs | $SED -e 's/ -l[^ ]*//g' -e 's/^-l[^ ]*//g'`"] |
| 20 | break |
| 21 | else |
| 22 | AC_MSG_RESULT([no]) |