subversion: build for cygwin

msys2 · Feb 2, 2025 · f774391 · f774391
1 parent 5df6a84
commit f774391
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 74 deletions.
diff --git a/subversion/PKGBUILD b/subversion/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=subversion
 pkgver=1.14.2
-pkgrel=8
+pkgrel=9
 pkgdesc="A Modern Concurrent Version Control System"
 arch=('i686' 'x86_64')
 url="https://subversion.apache.org/"
@@ -72,7 +72,7 @@ sha256sums=('c9130e8d0b75728a66f0e7038fc77052e671830d785b5616aad53b4810d3cc28'
             'f61c9b3333d90790a4c6763d81ee05ee5a2029e562c900e92f7526393460181c'
             'a1072514d1be6e2026ae1e2fa24d3bfd97dfbda13b4bd4d89aae0e871b2aae32'
             'e2063e5d6636576e3c4b578435587cf650aa643446f9280b827b2bbd9f11b3e7'
-            '8cb68970c06e698a3d0ef37ff2b25e7ca605b0712b306f9df5dbc37f96cef38c'
+            '9d718bc1a8eb51b6b95513830574d4bf57875db720f03c7c376a977beebae82c'
             'd821304ee957ef4adbb0a8dec9cea3fe62ad7163aef132317d28f70ea25162ca'
             'fc545e375d8af4ef6d8afad453453480664b6a2ff74915f94b8a7da7de14155b')
 # https://subversion.apache.org/download.cgi#recommended-release
@@ -124,8 +124,10 @@ build() {
   export lt_cv_deplibs_check_method='pass_all'
   cd ${pkgname}-${pkgver}
   export PYTHON=/usr/bin/python
+
+  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure --prefix=/usr \
-      --build=${CHOST} \
+      --build=${CYGWIN_CHOST} \
       --with-apr=/usr \
       --with-apr-util=/usr \
       --with-zlib=/usr \

diff --git a/subversion/subversion-1.9.1-msys2.patch b/subversion/subversion-1.9.1-msys2.patch
@@ -1,74 +1,3 @@
-diff -Naur subversion-1.8.0-orig/build/ac-macros/apache.m4 subversion-1.8.0/build/ac-macros/apache.m4
---- subversion-1.8.0-orig/build/ac-macros/apache.m4	2013-04-30 08:01:28.000000000 +0400
-+++ subversion-1.8.0/build/ac-macros/apache.m4	2013-06-24 09:18:54.663086000 +0400
-@@ -141,7 +141,7 @@
-     INSTALL_APACHE_MODS=true
-
-     case $host in
--      *-*-cygwin*)
-+      *-*-cygwin* | *-*-msys*)
-         APACHE_LDFLAGS="-shrext .so"
-         ;;
-     esac
-diff -Naur subversion-1.8.0-orig/build/ac-macros/sqlite.m4 subversion-1.8.0/build/ac-macros/sqlite.m4
---- subversion-1.8.0-orig/build/ac-macros/sqlite.m4	2013-04-20 08:00:52.000000000 +0400
-+++ subversion-1.8.0/build/ac-macros/sqlite.m4	2013-06-24 10:09:37.107421900 +0400
-@@ -256,7 +256,7 @@
- AC_DEFUN(_SVN_SQLITE_DSO_LIBS,
- [
-   case $host_os in
--  beos* | mingw* | pw32* | cegcc* | cygwin*)
-+  beos* | mingw* | pw32* | cegcc* | cygwin* | msys*)
-     svn_sqlite_dso_ldflags=
-     ;;
-
-diff -Naur subversion-1.8.0-orig/build/config.guess subversion-1.8.0/build/config.guess
---- subversion-1.8.0-orig/build/config.guess	2013-06-13 13:07:11.000000000 +0400
-+++ subversion-1.8.0/build/config.guess	2013-06-24 09:18:54.678711000 +0400
-@@ -803,6 +803,9 @@
-     i*:CYGWIN*:*)
- 	echo ${UNAME_MACHINE}-pc-cygwin
- 	exit ;;
-+    i*:MSYS*:*)
-+	echo ${UNAME_MACHINE}-pc-msys
-+	exit ;;
-     *:MINGW*:*)
- 	echo ${UNAME_MACHINE}-pc-mingw32
- 	exit ;;
-@@ -843,6 +846,9 @@
-     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- 	echo x86_64-unknown-cygwin
- 	exit ;;
-+    amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
-+	echo x86_64-unknown-msys
-+	exit ;;
-     p*:CYGWIN*:*)
- 	echo powerpcle-unknown-cygwin
- 	exit ;;
-diff -Naur subversion-1.8.0-orig/configure.ac subversion-1.8.0/configure.ac
---- subversion-1.8.0-orig/configure.ac	2013-06-24 09:05:45.530273500 +0400
-+++ subversion-1.8.0/configure.ac	2013-06-24 09:18:54.928711000 +0400
-@@ -313,7 +313,7 @@
- dnl So we only turn it on for platforms where we know we really need it.
- AC_MSG_CHECKING([whether libtool needs -no-undefined])
- case $host in
--  *-*-cygwin*)
-+  *-*-cygwin* | *-*-msys*)
-     AC_MSG_RESULT([yes])
-     LT_NO_UNDEFINED="-no-undefined"
-     ;;
-diff -Naur subversion-1.8.0-orig/subversion/bindings/swig/perl/native/Makefile.PL.in subversion-1.8.0/subversion/bindings/swig/perl/native/Makefile.PL.in
---- subversion-1.8.0-orig/subversion/bindings/swig/perl/native/Makefile.PL.in	2012-12-14 10:05:48.000000000 +0400
-+++ subversion-1.8.0/subversion/bindings/swig/perl/native/Makefile.PL.in	2013-06-24 09:18:54.944336000 +0400
-@@ -65,7 +65,7 @@
- # According to the log of r7937, the flags guarded by the conditional break
- # the build on FreeBSD if not conditionalized.
- my $apr_ldflags = '@SVN_APR_LIBS@'
--   if $^O eq 'darwin' or $^O eq 'cygwin';
-+   if $^O eq 'darwin' or $^O eq 'cygwin' or $^O eq 'msys';
-
- chomp $apr_shlib_path_var;
-
 diff -Naur subversion-1.8.0-orig/Makefile.in subversion-1.8.0/Makefile.in
 --- subversion-1.8.0-orig/Makefile.in	2009-11-19 22:25:52.000000000 +0300
 +++ subversion-1.8.0/Makefile.in	2013-06-24 09:18:54.944336000 +0400