Befator-Inc-Firmen-Netzwerk/MSYS2-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity
Files
f35fea71b77e50cb4542e8fcc8d05ab3e4c18d7d
MSYS2-packages/subversion/subversion-1.8.0-msys2.patch
Alexpux ce6e668822 subversion: Update to 1.8.11
2014-12-17 14:01:42 +03:00

163 lines
7.1 KiB
Diff
Raw Blame History

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/build/get-py-info.py subversion-1.8.0/build/get-py-info.py
--- subversion-1.8.0-orig/build/get-py-info.py 2009-11-16 22:07:17.000000000 +0300
+++ subversion-1.8.0/build/get-py-info.py 2013-06-24 09:18:54.709961000 +0400
@@ -101,7 +101,7 @@
sysconfig.get_config_var('PYTHON'))
add_option_if_missing(options, "-bundle_loader", python_exe)
- elif sys.platform == 'cygwin' or sys.platform.startswith('openbsd'):
+ elif sys.platform == 'cygwin' or sys.platform == 'msys' or sys.platform.startswith('openbsd'):
# Add flags to build against the Python library (also necessary
# for Darwin, but handled elsewhere).
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"
;;
@@ -326,7 +326,7 @@
AC_MSG_CHECKING([whether to avoid circular linkage at all costs])
case $host in
- *-*-cygwin*)
+ *-*-cygwin* | *-*-msys*)
AC_MSG_RESULT([yes])
AC_DEFINE([SVN_AVOID_CIRCULAR_LINKAGE_AT_ALL_COSTS_HACK], 1,
[Define if circular linkage is not possible on this platform.])
diff -Naur subversion-1.8.0-orig/subversion/bindings/ctypes-python/test/remoterepos.py subversion-1.8.0/subversion/bindings/ctypes-python/test/remoterepos.py
--- subversion-1.8.0-orig/subversion/bindings/ctypes-python/test/remoterepos.py 2011-08-12 00:56:26.000000000 +0400
+++ subversion-1.8.0/subversion/bindings/ctypes-python/test/remoterepos.py 2013-06-24 09:18:54.928711000 +0400
@@ -175,7 +175,7 @@
f.close()
os.chmod(hook, S_IRWXU)
- if sys.platform == "cygwin":
+ if sys.platform == "cygwin" or sys.platform == "msys":
### FIXME: When you try to set revprops, cygwin crashes
### with a fatal error, so we skip this test for now.
return
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/subversion/bindings/swig/python/tests/setup_path.py subversion-1.8.0/subversion/bindings/swig/python/tests/setup_path.py
--- subversion-1.8.0-orig/subversion/bindings/swig/python/tests/setup_path.py 2009-11-19 22:25:52.000000000 +0300
+++ subversion-1.8.0/subversion/bindings/swig/python/tests/setup_path.py 2013-06-24 09:18:54.944336000 +0400
@@ -39,7 +39,7 @@
# OSes without RPATH support are going to have to do things here to make
# the correct shared libraries be found.
-if sys.platform == 'cygwin':
+if sys.platform == 'cygwin' or sys.platform == 'msys':
import glob
svndir = os.path.normpath("../../../%s" % bld_swig_python_dir)
libpath = os.getenv("PATH").split(":")
diff -Naur subversion-1.8.0-orig/subversion/tests/cmdline/commit_tests.py subversion-1.8.0/subversion/tests/cmdline/commit_tests.py
--- subversion-1.8.0-orig/subversion/tests/cmdline/commit_tests.py 2013-04-12 11:44:37.000000000 +0400
+++ subversion-1.8.0/subversion/tests/cmdline/commit_tests.py 2013-06-24 09:18:54.959961000 +0400
@@ -51,7 +51,7 @@
#
def is_non_posix_os_or_cygwin_platform():
- return (not svntest.main.is_posix_os()) or sys.platform == 'cygwin'
+ return (not svntest.main.is_posix_os()) or sys.platform == 'cygwin' or sys.platform == 'msys'
def get_standard_state(wc_dir):
"""Return a status list reflecting the local mods made by
@@ -1024,7 +1024,7 @@
# Note: on Windows, files can't have angle brackets in them, so we
# don't tests that case.
- if svntest.main.windows or sys.platform == 'cygwin':
+ if svntest.main.windows or sys.platform == 'cygwin' or sys.platform == 'msys':
angle_name = '_angle_'
nasty_name = '#![]{}()__%'
else:
diff -Naur subversion-1.8.0-orig/subversion/tests/cmdline/svntest/main.py subversion-1.8.0/subversion/tests/cmdline/svntest/main.py
--- subversion-1.8.0-orig/subversion/tests/cmdline/svntest/main.py 2013-06-24 09:10:09.858398500 +0400
+++ subversion-1.8.0/subversion/tests/cmdline/svntest/main.py 2013-06-24 10:12:05.326171900 +0400
@@ -278,7 +278,7 @@
def get_admin_name():
"Return name of SVN administrative subdirectory."
- if (windows or sys.platform == 'cygwin') \
+ if (windows or sys.platform == 'cygwin' or sys.platform == 'msys') \
and 'SVN_ASP_DOT_NET_HACK' in os.environ:
return '_svn'
else:
@@ -1329,8 +1329,11 @@
def is_os_cygwin():
return sys.platform == 'cygwin'
+def is_os_msys():
+ return sys.platform == 'msys'
+
def is_fs_case_insensitive():
- return (is_os_darwin() or is_os_windows() or is_os_cygwin())
+ return (is_os_darwin() or is_os_windows() or is_os_cygwin() or is_os_msys())
def is_threaded_python():
return True
Reference in New Issue View Git Blame Copy Permalink