d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

geos: Fix geos-config script 

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
This commit is contained in:
Timothy Gu 2014-10-18 17:57:18 -04:00
parent d7cd5fcf49
commit 627ed07a8f
2 changed files with 83 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
src/geos-1-fixes.patch Normal file
View File

@ -0,0 +1,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

4
src/geos.mk
View File

@ -25,10 +25,12 @@ define $(PKG)_BUILD
--prefix='$(PREFIX)/$(TARGET)'
$(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
ln -sf '$(PREFIX)/$(TARGET)/bin/geos-config' '$(PREFIX)/bin/$(TARGET)-geos-config'
'$(TARGET)-gcc' \
-W -Wall -Werror -ansi -pedantic \
'$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-geos.exe' \
-lgeos_c `'$(PREFIX)/$(TARGET)/bin/geos-config' --cflags --libs` -lstdc++
`'$(PREFIX)/bin/$(TARGET)-geos-config' --cflags --clibs`
endef
$(PKG)_BUILD_SHARED =