diff options
| -rw-r--r-- | src/geos-1-fixes.patch | 90 | ||||
| -rw-r--r-- | src/geos.mk | 8 |
2 files changed, 39 insertions, 59 deletions
diff --git a/src/geos-1-fixes.patch b/src/geos-1-fixes.patch index 7c04169..a5b04c6 100644 --- a/src/geos-1-fixes.patch +++ b/src/geos-1-fixes.patch @@ -1,48 +1,21 @@ This file is part of MXE. See LICENSE.md for licensing 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 +Contains ad hoc patches for cross building. -Signed-off-by: Timothy Gu <timothygu99@gmail.com> +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 9b45b5f..f521772 100644 +index 1111111..2222222 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 +@@ -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 @@ -55,25 +28,32 @@ index f521772..4c9a72b 100644 - 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 - ;; +- 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 - ;; ++ echo -L${libdir} -lgeos -lstdc++ -lm ++ ;; --ldflags) --- -1.9.1 - +- echo -L${libdir} +- ;; ++ echo -L${libdir} ++ ;; + --includes) +- echo ${prefix}/include +- ;; ++ echo ${prefix}/include ++ ;; + --jtsport) + echo @JTS_PORT@ +- ;; ++ ;; + *) + usage 1 1>&2 + ;; diff --git a/src/geos.mk b/src/geos.mk index 652e960..58b18e0 100644 --- a/src/geos.mk +++ b/src/geos.mk @@ -4,8 +4,8 @@ PKG := geos $(PKG)_WEBSITE := https://trac.osgeo.org/geos/ $(PKG)_DESCR := GEOS $(PKG)_IGNORE := -$(PKG)_VERSION := 3.4.2 -$(PKG)_CHECKSUM := 15e8bfdf7e29087a957b56ac543ea9a80321481cef4d4f63a7b268953ad26c53 +$(PKG)_VERSION := 3.6.2 +$(PKG)_CHECKSUM := 045a13df84d605a866602f6020fc6cbf8bf4c42fb50de237a08926e1d7d7652a $(PKG)_SUBDIR := geos-$($(PKG)_VERSION) $(PKG)_FILE := geos-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://download.osgeo.org/geos/$($(PKG)_FILE) @@ -13,9 +13,9 @@ $(PKG)_URL_2 := ftp://ftp.remotesensing.org/geos/$($(PKG)_FILE) $(PKG)_DEPS := gcc define $(PKG)_UPDATE - $(WGET) -q -O- 'http://geos.refractions.net/' | \ + $(WGET) -q -O- 'http://download.osgeo.org/geos/' | \ $(SED) -n 's,.*geos-\([0-9][^>]*\)\.tar.*,\1,p' | \ - head -1 + tail -1 endef define $(PKG)_BUILD |