Skip to contentSkip to conversation

package/subversion: drop first patch

PATCH New Fabrice Fontaine 2 participants 2 messages Sep 10, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 .../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%)
package/subversion/0001-dont-mangle-cflags.patch deleted +0 -24
deleted file mode 100644
index adb8b8e933..0000000000
@@ -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 <[email protected]>
-Signed-off-by: Vicente Olivert Riera <[email protected]>
-
-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"
package/subversion/0001-workaround-ac-run-ifelse.patch renamed from package/subversion/0002-workaround-ac-run-ifelse.patch +0 -0
similarity index 100%
rename from package/subversion/0002-workaround-ac-run-ifelse.patch
rename to package/subversion/0001-workaround-ac-run-ifelse.patch
Signature · 1 line
2.28.0
#1 lore raw

PATCH 1/1 package/subversion: drop first patch

Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> writes:

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.

Ahh, indeed not any more - Good catch!

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard