blob: fab5058a74a5f3c4e0574eaffdef5841110d0a10 (
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
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
|
This file is part of MXE.
See index.html for further information.
From 7966e3a9768f3db85fd93f8e4334ef6b58f0fb92 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Sat, 18 Oct 2014 17:28:27 -0400
Subject: [PATCH 1/2] geos-config: Fix linking to libm and libstdc++ for static
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
diff --git a/tools/geos-config.in b/tools/geos-config.in
index 9b45b5f..f521772 100644
--- a/tools/geos-config.in
+++ b/tools/geos-config.in
@@ -52,10 +52,10 @@ case $1 in
echo -L${libdir} -lgeos
;;
--static-clibs)
- echo -L${libdir} -lgeos_c -lgeos -m
+ echo -L${libdir} -lgeos_c -lgeos -lstdc++ -lm
;;
--static-cclibs)
- echo -L${libdir} -lgeos -m
+ echo -L${libdir} -lgeos -lstdc++ -lm
;;
--ldflags)
echo -L${libdir}
--
1.9.1
From 22befe6776025838d876c6f36a789f2ba467fbb6 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Sat, 18 Oct 2014 17:29:24 -0400
Subject: [PATCH 2/2] [MXE] geos-config: Always link as static
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
diff --git a/tools/geos-config.in b/tools/geos-config.in
index f521772..4c9a72b 100644
--- a/tools/geos-config.in
+++ b/tools/geos-config.in
@@ -40,21 +40,21 @@ 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)
+# --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
+# ;;
+ --clibs|--static-clibs)
echo -L${libdir} -lgeos_c -lgeos -lstdc++ -lm
;;
- --static-cclibs)
+ --libs|--cclibs|--static-cclibs)
echo -L${libdir} -lgeos -lstdc++ -lm
;;
--ldflags)
--
1.9.1
|
