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.
62 lines
1.4 KiB
62 lines
1.4 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: Luke Potgieter <fried.roadkill+ght@gmail.com>
|
|
Date: Mon, 7 Aug 2017 15:24:32 +0200
|
|
Subject: [PATCH 1/1] Always link as static (based on the previous patch by
|
|
Timothy Gu)
|
|
|
|
|
|
diff --git a/tools/geos-config.in b/tools/geos-config.in
|
|
index 1111111..2222222 100644
|
|
--- a/tools/geos-config.in
|
|
+++ b/tools/geos-config.in
|
|
@@ -39,33 +39,22 @@ case $1 in
|
|
;;
|
|
--cflags)
|
|
echo -I${prefix}/include
|
|
- ;;
|
|
- --libs)
|
|
- # TODO: make an alias for --clibs
|
|
- # see http://trac.osgeo.org/geos/ticket/497
|
|
- echo -L${libdir} -lgeos
|
|
- ;;
|
|
- --clibs)
|
|
- echo -L${libdir} -lgeos_c
|
|
- ;;
|
|
- --cclibs)
|
|
- echo -L${libdir} -lgeos
|
|
- ;;
|
|
- --static-clibs)
|
|
- echo -L${libdir} -lgeos_c -lgeos -lm
|
|
- ;;
|
|
- --static-cclibs)
|
|
- echo -L${libdir} -lgeos -lm
|
|
- ;;
|
|
+ ;;
|
|
+ --clibs|--static-clibs)
|
|
+ echo -L${libdir} -lgeos_c -lgeos -lstdc++ -lm
|
|
+ ;;
|
|
+ --libs|--cclibs|--static-cclibs)
|
|
+ echo -L${libdir} -lgeos -lstdc++ -lm
|
|
+ ;;
|
|
--ldflags)
|
|
- echo -L${libdir}
|
|
- ;;
|
|
+ echo -L${libdir}
|
|
+ ;;
|
|
--includes)
|
|
- echo ${prefix}/include
|
|
- ;;
|
|
+ echo ${prefix}/include
|
|
+ ;;
|
|
--jtsport)
|
|
echo @JTS_PORT@
|
|
- ;;
|
|
+ ;;
|
|
*)
|
|
usage 1 1>&2
|
|
;;
|