From 9670aa285250e1ee4fc44fa0134137961494cdeb Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 10 Sep 2020 07:50:23 +0200 Subject: [PATCH] package/subversion: drop first patch First patch is not needed since version 1.8.0 and https://github.com/apache/subversion/commit/f071ec0c26cdf47e89fa90b31d2233ee1a2b00c2 Indeed, as spotted by upstream when sending them this patch, the original expressions will not mangle '-mfloat-gprs=double' because the patterns contain a trailing space. Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .../subversion/0001-dont-mangle-cflags.patch | 24 ------------------- ...ch => 0001-workaround-ac-run-ifelse.patch} | 0 2 files changed, 24 deletions(-) delete mode 100644 package/subversion/0001-dont-mangle-cflags.patch rename package/subversion/{0002-workaround-ac-run-ifelse.patch => 0001-workaround-ac-run-ifelse.patch} (100%) diff --git a/package/subversion/0001-dont-mangle-cflags.patch b/package/subversion/0001-dont-mangle-cflags.patch deleted file mode 100644 index adb8b8e933..0000000000 --- a/package/subversion/0001-dont-mangle-cflags.patch +++ /dev/null @@ -1,24 +0,0 @@ -[PATCH] configure.ac: 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. - -[Vincent: adapt to 1.9.2 and patch configure.ac instead of configure] - -Signed-off-by: Peter Korsgaard -Signed-off-by: Vicente Olivert Riera - -diff -Nrup a/configure.ac b/configure.ac ---- a/configure.ac 2015-07-27 00:03:10.000000000 +0100 -+++ b/configure.ac 2015-09-28 10:33:39.175048493 +0100 -@@ -1110,8 +1110,8 @@ if test "$enable_debugging" = "yes" ; th - CXXFLAGS="$CXXFLAGS -DSVN_DEBUG -DAP_DEBUG" - elif test "$enable_debugging" = "no" ; then - AC_MSG_NOTICE([Disabling debugging]) -- CFLAGS=["`echo $CFLAGS' ' | $SED -e 's/-g[0-9] //g' -e 's/-g //g'`"] -- CXXFLAGS=["`echo $CXXFLAGS' ' | $SED -e 's/-g[0-9] //g' -e 's/-g //g'`"] -+ CFLAGS=["`echo $CFLAGS' ' | $SED -e 's/-g[0-9]* //g'`"] -+ CXXFLAGS=["`echo $CXXFLAGS' ' | $SED -e 's/-g[0-9]* //g'`"] - dnl Compile with NDEBUG to get rid of assertions - CFLAGS="$CFLAGS -DNDEBUG" - CXXFLAGS="$CXXFLAGS -DNDEBUG" diff --git a/package/subversion/0002-workaround-ac-run-ifelse.patch b/package/subversion/0001-workaround-ac-run-ifelse.patch similarity index 100% rename from package/subversion/0002-workaround-ac-run-ifelse.patch rename to package/subversion/0001-workaround-ac-run-ifelse.patch -- 2.30.2