X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=cirros-testvm%2Fsrc-cirros%2Fbuildroot-2015.05%2Fpackage%2Fsubversion%2F0001-dont-mangle-cflags.patch;fp=cirros-testvm%2Fsrc-cirros%2Fbuildroot-2015.05%2Fpackage%2Fsubversion%2F0001-dont-mangle-cflags.patch;h=33370c549ed60d94fba2eeb6aa5c375787ff98b7;hb=b0a0f15dfaa205161a7fcb20cf1b8cd4948c2ef3;hp=0000000000000000000000000000000000000000;hpb=c6ac3cd55ee2da956195eee393b0882105dfad4e;p=packages%2Ftrusty%2Fcirros-testvm.git diff --git a/cirros-testvm/src-cirros/buildroot-2015.05/package/subversion/0001-dont-mangle-cflags.patch b/cirros-testvm/src-cirros/buildroot-2015.05/package/subversion/0001-dont-mangle-cflags.patch new file mode 100644 index 0000000..33370c5 --- /dev/null +++ b/cirros-testvm/src-cirros/buildroot-2015.05/package/subversion/0001-dont-mangle-cflags.patch @@ -0,0 +1,28 @@ +[PATCH] configure: don't mangle CFLAGS + +Ensure that the sed expression to strip debugging options from CFLAGS +doesn't mangle flags like -mfloat-gprs=double, breaking the build. + +Patch configure instead of configure.ac as subversion currently doesn't +cleanly autoreconf. + +Signed-off-by: Peter Korsgaard +--- + configure | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: subversion-1.7.18/configure +=================================================================== +--- subversion-1.7.18.orig/configure ++++ subversion-1.7.18/configure +@@ -19798,8 +19798,8 @@ + CFLAGS="$CFLAGS -DSVN_DEBUG -DAP_DEBUG" + CXXFLAGS="$CXXFLAGS -DSVN_DEBUG -DAP_DEBUG" + elif test "$enable_debugging" = "no" ; then +- CFLAGS="`echo $CFLAGS' ' | $SED -e 's/-g[0-9] //g' | $SED -e 's/-g//g'`" +- CXXFLAGS="`echo $CXXFLAGS' ' | $SED -e 's/-g[0-9] //g' | $SED -e 's/-g//g'`" ++ CFLAGS="`echo $CFLAGS' ' | $SED -e 's/-g[0-9]* //g'`" ++ CXXFLAGS="`echo $CXXFLAGS' ' | $SED -e 's/-g[0-9]* //g'`" + CFLAGS="$CFLAGS -DNDEBUG" + CXXFLAGS="$CXXFLAGS -DNDEBUG" + # elif test "$enable_debugging" = "maybe" ; then