blob: a5b04c621d3d1703587234aba7cb35a6348e6f9a (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
|
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] 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
;;
|
