From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Thu, 10 Sep 2020 05:50:23 +0000 (+0200)
Subject: package/subversion: drop first patch
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9670aa285250e1ee4fc44fa0134137961494cdeb;p=buildroot.git

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 <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---

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 <peter@korsgaard.com>
-Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
-
-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/0001-workaround-ac-run-ifelse.patch b/package/subversion/0001-workaround-ac-run-ifelse.patch
new file mode 100644
index 0000000000..4f229dc49b
--- /dev/null
+++ b/package/subversion/0001-workaround-ac-run-ifelse.patch
@@ -0,0 +1,23 @@
+build/ac-macros/macosx.m4: workaround AC_RUN_IFELSE
+
+The SVN_LIB_MACHO_ITERATE macro contains an AC_RUN_IFELSE test that
+doesn't work when cross-compiling. However, this macro is related to
+testing Mac OS X APIs, so in the context of Buildroot, we don't care,
+and the test program is not even going to build. So we simply
+workaround this by turning the test into an AC_COMPILE_IFELSE.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+
+Index: b/build/ac-macros/macosx.m4
+===================================================================
+--- a/build/ac-macros/macosx.m4
++++ b/build/ac-macros/macosx.m4
+@@ -24,7 +24,7 @@
+ AC_DEFUN(SVN_LIB_MACHO_ITERATE,
+ [
+   AC_MSG_CHECKING([for Mach-O dynamic module iteration functions])
+-  AC_RUN_IFELSE([AC_LANG_PROGRAM([[
++  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+     #include <mach-o/dyld.h>
+     #include <mach-o/loader.h>
+   ]],[[
diff --git a/package/subversion/0002-workaround-ac-run-ifelse.patch b/package/subversion/0002-workaround-ac-run-ifelse.patch
deleted file mode 100644
index 4f229dc49b..0000000000
--- a/package/subversion/0002-workaround-ac-run-ifelse.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-build/ac-macros/macosx.m4: workaround AC_RUN_IFELSE
-
-The SVN_LIB_MACHO_ITERATE macro contains an AC_RUN_IFELSE test that
-doesn't work when cross-compiling. However, this macro is related to
-testing Mac OS X APIs, so in the context of Buildroot, we don't care,
-and the test program is not even going to build. So we simply
-workaround this by turning the test into an AC_COMPILE_IFELSE.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-
-Index: b/build/ac-macros/macosx.m4
-===================================================================
---- a/build/ac-macros/macosx.m4
-+++ b/build/ac-macros/macosx.m4
-@@ -24,7 +24,7 @@
- AC_DEFUN(SVN_LIB_MACHO_ITERATE,
- [
-   AC_MSG_CHECKING([for Mach-O dynamic module iteration functions])
--  AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-     #include <mach-o/dyld.h>
-     #include <mach-o/loader.h>
-   ]],[[