You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
120 lines
3.8 KiB
120 lines
3.8 KiB
This file is part of MXE. See LICENSE.md for licensing information.
|
|
|
|
Contains ad hoc patches for cross building.
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Tony Theodore <tonyt@logyst.com>
|
|
Date: Sat, 18 Nov 2017 21:45:25 +1100
|
|
Subject: [PATCH 1/1] fixes
|
|
|
|
|
|
diff --git a/build/generator/gen_make.py b/build/generator/gen_make.py
|
|
index 1111111..2222222 100644
|
|
--- a/build/generator/gen_make.py
|
|
+++ b/build/generator/gen_make.py
|
|
@@ -633,7 +633,7 @@ DIR=`pwd`
|
|
lib_required_private=[],
|
|
)
|
|
# libsvn_foo -> -lsvn_foo
|
|
- data.lib_deps.append('-l%s' % lib_name.replace('lib', '', 1))
|
|
+ data.lib_deps.append('-l%s-1' % lib_name.replace('lib', '', 1))
|
|
for lib_dep in lib_deps.split():
|
|
if lib_dep == 'apriconv':
|
|
# apriconv is part of apr-util, skip it
|
|
diff --git a/build/generator/templates/pkg-config.in.ezt b/build/generator/templates/pkg-config.in.ezt
|
|
index 1111111..2222222 100644
|
|
--- a/build/generator/templates/pkg-config.in.ezt
|
|
+++ b/build/generator/templates/pkg-config.in.ezt
|
|
@@ -1,7 +1,7 @@
|
|
prefix=@prefix@
|
|
exec_prefix=@exec_prefix@
|
|
libdir=@libdir@
|
|
-includedir=@includedir@
|
|
+includedir=@includedir@/subversion-1
|
|
|
|
Name: [lib_name]
|
|
Description: [lib_desc]
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 1111111..2222222 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -467,9 +467,6 @@ fi
|
|
|
|
dnl Mac OS specific features -------------------
|
|
|
|
-SVN_LIB_MACHO_ITERATE
|
|
-SVN_LIB_MACOS_PLIST
|
|
-SVN_LIB_MACOS_KEYCHAIN
|
|
|
|
dnl APR_HAS_DSO -------------------
|
|
|
|
@@ -1271,7 +1268,6 @@ AS_HELP_STRING([--enable-gprof],
|
|
# Python: Used for testsuite, and bindings
|
|
|
|
|
|
-PYTHON="`$abs_srcdir/build/find_python.sh`"
|
|
if test -z "$PYTHON"; then
|
|
AC_MSG_WARN([Python 2.7 or later is required to run the testsuite])
|
|
AC_MSG_WARN([or to use the Subversion Python bindings])
|
|
diff --git a/subversion/libsvn_subr/config_win.c b/subversion/libsvn_subr/config_win.c
|
|
index 1111111..2222222 100644
|
|
--- a/subversion/libsvn_subr/config_win.c
|
|
+++ b/subversion/libsvn_subr/config_win.c
|
|
@@ -34,7 +34,7 @@
|
|
#define WIN32_LEAN_AND_MEAN
|
|
/* winsock2.h includes windows.h */
|
|
#include <winsock2.h>
|
|
-#include <Ws2tcpip.h>
|
|
+#include <ws2tcpip.h>
|
|
|
|
#include <shlobj.h>
|
|
|
|
diff --git a/subversion/libsvn_subr/io.c b/subversion/libsvn_subr/io.c
|
|
index 1111111..2222222 100644
|
|
--- a/subversion/libsvn_subr/io.c
|
|
+++ b/subversion/libsvn_subr/io.c
|
|
@@ -1789,7 +1789,7 @@ svn_io__utf8_to_unicode_longpath(const WCHAR **result,
|
|
}
|
|
}
|
|
|
|
- SVN_ERR(svn_utf__win32_utf8_to_utf16(&(const WCHAR*)buffer, source,
|
|
+ SVN_ERR(svn_utf__win32_utf8_to_utf16((const WCHAR**)&buffer, source,
|
|
prefix, result_pool));
|
|
|
|
/* Convert slashes to backslashes because the \\?\ path format
|
|
diff --git a/subversion/libsvn_subr/win32_xlate.c b/subversion/libsvn_subr/win32_xlate.c
|
|
index 1111111..2222222 100644
|
|
--- a/subversion/libsvn_subr/win32_xlate.c
|
|
+++ b/subversion/libsvn_subr/win32_xlate.c
|
|
@@ -36,7 +36,7 @@ typedef int win32_xlate__dummy;
|
|
|
|
/* winsock2.h includes windows.h */
|
|
#include <winsock2.h>
|
|
-#include <Ws2tcpip.h>
|
|
+#include <ws2tcpip.h>
|
|
#include <mlang.h>
|
|
|
|
#include <apr.h>
|
|
@@ -53,6 +53,8 @@ typedef int win32_xlate__dummy;
|
|
|
|
#include "svn_private_config.h"
|
|
|
|
+#define INITGUID 1
|
|
+DEFINE_GUID (IID_IMultiLanguage, 0x275c23e1,0x3747,0x11d0,0x9f,0xea,0x00,0xaa,0x00,0x3f,0x86,0x46);
|
|
static svn_atomic_t com_initialized = 0;
|
|
|
|
/* Initializes COM and keeps COM available until process exit.
|
|
@@ -138,10 +140,12 @@ get_page_id_from_name(UINT *page_id_p, const char *page_name, apr_pool_t *pool)
|
|
return saved; /* probably SVN_ERR_ATOMIC_INIT_FAILURE */
|
|
}
|
|
|
|
+#if 0
|
|
hr = CoCreateInstance(&CLSID_CMultiLanguage, NULL, CLSCTX_INPROC_SERVER,
|
|
&IID_IMultiLanguage, (void **) &mlang);
|
|
|
|
if (FAILED(hr))
|
|
+#endif
|
|
return APR_EGENERAL;
|
|
|
|
/* Convert page name to wide string. */
|