changeset 5105:ce340a7b24bd

Update to proj 6.1.1 * src/proj.mk: update version, checksum * src/sqlite.mk: install native tools
author John Donoghue
date Wed, 03 Jul 2019 12:58:12 -0400
parents 0100966837b6
children 8212b14b3233
files src/proj.mk src/sqlite.mk
diffstat 2 files changed, 9 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/proj.mk	Wed Jul 03 08:42:19 2019 -0400
+++ b/src/proj.mk	Wed Jul 03 12:58:12 2019 -0400
@@ -3,13 +3,13 @@
 
 PKG             := proj
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 5.1.0
-$(PKG)_CHECKSUM := 13b5fc606bc62d347908fb3f256d93516b0be2a1
+$(PKG)_VERSION  := 6.1.1
+$(PKG)_CHECKSUM := ee93221256b7359700d59479a8097c2f39f9f984
 $(PKG)_SUBDIR   := proj-$($(PKG)_VERSION)
 $(PKG)_FILE     := proj-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://download.osgeo.org/proj/$($(PKG)_FILE)
 $(PKG)_URL_2    := ftp://ftp.remotesensing.org/proj/$($(PKG)_FILE)
-$(PKG)_DEPS     :=
+$(PKG)_DEPS     := sqlite
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://proj.org/download.html' | \
--- a/src/sqlite.mk	Wed Jul 03 08:42:19 2019 -0400
+++ b/src/sqlite.mk	Wed Jul 03 12:58:12 2019 -0400
@@ -17,6 +17,12 @@
 endef
 
 define $(PKG)_BUILD
+    if [ $(MXE_NATIVE_BUILD) = no ]; then \
+      mkdir '$(1).native' && cd '$(1).native' && '$(1)/configure' \
+        --enable-static --disable-shared \
+        --prefix='$(BUILD_TOOLS_PREFIX)' && \
+      $(MAKE) -C '$(1).native' -j 1 install; \
+    fi
     $(SED) -i 's/^Cflags/#Cflags/;' '$(1)/sqlite3.pc.in'
     cd '$(1)' && autoreconf && ./configure \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \