aboutsummaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/shapelib/Config.in6
-rw-r--r--package/shapelib/shapelib.hash2
-rw-r--r--package/shapelib/shapelib.mk17
3 files changed, 10 insertions, 15 deletions
diff --git a/package/shapelib/Config.in b/package/shapelib/Config.in
index aa2297b277..553d3483af 100644
--- a/package/shapelib/Config.in
+++ b/package/shapelib/Config.in
@@ -1,5 +1,8 @@
config BR2_PACKAGE_SHAPELIB
bool "shapelib"
+ depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_TOOLCHAIN_HAS_THREADS
+ select BR2_PACKAGE_PROJ
help
The Shapefile C Library provides the ability to write simple
C programs for reading, writing and updating (to a limited
@@ -7,3 +10,6 @@ config BR2_PACKAGE_SHAPELIB
(.dbf).
http://shapelib.maptools.org/
+
+comment "shapelib needs a toolchain w/ C++, threads"
+ depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/shapelib/shapelib.hash b/package/shapelib/shapelib.hash
index f3f812ebf9..4f51392855 100644
--- a/package/shapelib/shapelib.hash
+++ b/package/shapelib/shapelib.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 23d474016158ab5077db2f599527631706ba5c0dc7c4178a6a1d685bb014f68f shapelib-1.3.0.tar.gz
+sha256 a4c94817365761a3a4c21bb3ca1c680a6bdfd3edd61df9fdd291d3e7645923b3 shapelib-1.4.1.tar.gz
diff --git a/package/shapelib/shapelib.mk b/package/shapelib/shapelib.mk
index 34b625346f..d6217ff3a1 100644
--- a/package/shapelib/shapelib.mk
+++ b/package/shapelib/shapelib.mk
@@ -4,22 +4,11 @@
#
################################################################################
-SHAPELIB_VERSION = 1.3.0
+SHAPELIB_VERSION = 1.4.1
SHAPELIB_SITE = http://download.osgeo.org/shapelib
SHAPELIB_LICENSE = MIT or LGPL-2.0
SHAPELIB_LICENSE_FILES = web/license.html LICENSE.LGPL
SHAPELIB_INSTALL_STAGING = YES
+SHAPELIB_DEPENDENCIES = proj
-define SHAPELIB_BUILD_CMDS
- $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)
-endef
-
-define SHAPELIB_INSTALL_STAGING_CMDS
- $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) PREFIX=$(STAGING_DIR)/usr/ lib_install
-endef
-
-define SHAPELIB_INSTALL_TARGET_CMDS
- $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) PREFIX=$(TARGET_DIR)/usr/ bin_install
-endef
-
-$(eval $(generic-package))
+$(eval $(autotools-package))