mirror of https://git.wownero.com/dsc/mxe.git
124 lines
3.7 KiB
Diff
124 lines
3.7 KiB
Diff
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: MXE
|
|
Date: Sat, 18 Oct 2014 18:25:34 -0400
|
|
Subject: [PATCH 1/2] Fix geos detection
|
|
|
|
|
|
diff --git a/m4/geos.m4 b/m4/geos.m4
|
|
index 1111111..2222222 100644
|
|
--- a/m4/geos.m4
|
|
+++ b/m4/geos.m4
|
|
@@ -121,14 +121,14 @@ AC_DEFUN([GEOS_INIT],[
|
|
|
|
HAVE_GEOS="no"
|
|
|
|
- GEOS_LIBS="`${GEOS_CONFIG} --ldflags` -lgeos_c"
|
|
+ GEOS_LIBS="`${GEOS_CONFIG} --clibs`"
|
|
GEOS_CFLAGS="`${GEOS_CONFIG} --cflags`"
|
|
GEOS_VERSION="`${GEOS_CONFIG} --version`"
|
|
|
|
ax_save_LIBS="${LIBS}"
|
|
- LIBS=${GEOS_LIBS}
|
|
+ LIBS="${LIBS} ${GEOS_LIBS}"
|
|
ax_save_CFLAGS="${CFLAGS}"
|
|
- CFLAGS="${GEOS_CFLAGS}"
|
|
+ CFLAGS="${CFLAGS} ${GEOS_CFLAGS}"
|
|
|
|
AC_CHECK_LIB([geos_c],
|
|
[GEOSversion],
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: MXE
|
|
Date: Tue, 5 Jul 2016 22:23:16 +0300
|
|
Subject: [PATCH 2/2] Use AC_PATH_TOOL for config scripts
|
|
|
|
|
|
diff --git a/configure.in b/configure.in
|
|
index 1111111..2222222 100644
|
|
--- a/configure.in
|
|
+++ b/configure.in
|
|
@@ -866,7 +866,7 @@ AC_ARG_WITH(pg,
|
|
[Include PostgreSQL GDAL/OGR Support (ARG=path to pg_config)]),,)
|
|
|
|
if test "x$with_pg" = "xyes" -o "x$with_pg" = "x" ; then
|
|
- AC_PATH_PROG(PG_CONFIG, pg_config, no)
|
|
+ AC_PATH_TOOL(PG_CONFIG, pg_config, no)
|
|
else
|
|
PG_CONFIG=$with_pg
|
|
fi
|
|
@@ -2016,7 +2016,7 @@ KEA_CONFIG=no
|
|
AC_ARG_WITH(kea,[ --with-kea[=ARG] Include kealib (ARG=path to kea-config) [[default=yes]]],,)
|
|
|
|
if test "$with_kea" = "yes" -o "x$with_kea" = "x" ; then
|
|
- AC_PATH_PROG(KEA_CONFIG, kea-config, no)
|
|
+ AC_PATH_TOOL(KEA_CONFIG, kea-config, no)
|
|
else
|
|
KEA_CONFIG=$with_kea
|
|
fi
|
|
@@ -2079,10 +2079,10 @@ else
|
|
dnl find nc-config location
|
|
unset ac_cv_path_NETCDF_NCCONFIG
|
|
if test "$with_netcdf" = "yes" -o "$with_netcdf" = "" ; then
|
|
- AC_PATH_PROG(NETCDF_NCCONFIG, nc-config, no)
|
|
+ AC_PATH_TOOL(NETCDF_NCCONFIG, nc-config, no)
|
|
else
|
|
tmp_path="$with_netcdf/bin$PATH_SEPARATOR$with_netcdf"
|
|
- AC_PATH_PROG(NETCDF_NCCONFIG, nc-config, no, $tmp_path)
|
|
+ AC_PATH_TOOL(NETCDF_NCCONFIG, nc-config, no, $tmp_path)
|
|
fi
|
|
|
|
dnl test nc-config
|
|
@@ -2832,7 +2832,7 @@ MYSQL_CONFIG=no
|
|
AC_ARG_WITH(mysql,[ --with-mysql[=ARG] Include MySQL (ARG=path to mysql_config) [[default=no]]],,)
|
|
|
|
if test "$with_mysql" = "yes" ; then
|
|
- AC_PATH_PROG(MYSQL_CONFIG, mysql_config, no)
|
|
+ AC_PATH_TOOL(MYSQL_CONFIG, mysql_config, no)
|
|
else
|
|
if test "x$with_mysql" != "x" ; then
|
|
MYSQL_CONFIG=$with_mysql
|
|
@@ -3162,7 +3162,7 @@ if test "`basename xx/$with_curl`" = "curl-config" ; then
|
|
elif test "$with_curl" = "no" ; then
|
|
LIBCURL_CONFIG=no
|
|
else
|
|
- AC_PATH_PROG(LIBCURL_CONFIG, curl-config, no)
|
|
+ AC_PATH_TOOL(LIBCURL_CONFIG, curl-config, no)
|
|
fi
|
|
|
|
if test "$LIBCURL_CONFIG" != "no" ; then
|
|
@@ -3204,7 +3204,7 @@ if test "`basename xx/$with_xml2`" = "xml2-config" ; then
|
|
elif test "$with_xml2" = "no" ; then
|
|
LIBXML2_CONFIG=no
|
|
else
|
|
- AC_PATH_PROG(LIBXML2_CONFIG, xml2-config, no)
|
|
+ AC_PATH_TOOL(LIBXML2_CONFIG, xml2-config, no)
|
|
fi
|
|
|
|
if test "$LIBXML2_CONFIG" != "no" ; then
|
|
diff --git a/m4/geos.m4 b/m4/geos.m4
|
|
index 1111111..2222222 100644
|
|
--- a/m4/geos.m4
|
|
+++ b/m4/geos.m4
|
|
@@ -58,7 +58,7 @@ AC_DEFUN([GEOS_INIT],[
|
|
|
|
elif test x"$with_geos" = x"yes" -o x"$with_geos" = x"" ; then
|
|
|
|
- AC_PATH_PROG(GEOS_CONFIG, geos-config, no)
|
|
+ AC_PATH_TOOL(GEOS_CONFIG, geos-config, no)
|
|
ac_geos_config_auto=yes
|
|
|
|
else
|
|
@@ -133,7 +133,7 @@ AC_DEFUN([GEOS_INIT],[
|
|
AC_CHECK_LIB([geos_c],
|
|
[GEOSversion],
|
|
[HAVE_GEOS="yes"],
|
|
- [HAVE_GEOS="no"],
|
|
+ [HAVE_GEOS="no" && echo "$GEOS_LIBS" && exit 1],
|
|
[]
|
|
)
|
|
|