| Message ID | 1513468381-8875-3-git-send-email-mr.zoltan.gyarmati@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/3] add new package proj | expand |
Hi Zoltan, On Sun, Dec 17, 2017 at 12:53:01AM +0100, Zoltan Gyarmati wrote: > Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> > --- > package/shapelib/Config.in | 5 +++++ > package/shapelib/shapelib.hash | 2 +- > package/shapelib/shapelib.mk | 17 +++-------------- > 3 files changed, 9 insertions(+), 15 deletions(-) > > diff --git a/package/shapelib/Config.in b/package/shapelib/Config.in > index aa2297b..97ca403 100644 > --- a/package/shapelib/Config.in > +++ b/package/shapelib/Config.in > @@ -1,5 +1,7 @@ > config BR2_PACKAGE_SHAPELIB > bool "shapelib" > + depends on BR2_INSTALL_LIBSTDCPP > + select BR2_PACKAGE_PROJ You need to propagate here the threads dependency of proj. baruch > help > The Shapefile C Library provides the ability to write simple > C programs for reading, writing and updating (to a limited > @@ -7,3 +9,6 @@ config BR2_PACKAGE_SHAPELIB > (.dbf). > > http://shapelib.maptools.org/
Hello, On Sun, 17 Dec 2017 00:53:01 +0100, Zoltan Gyarmati wrote: > Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> > --- > package/shapelib/Config.in | 5 +++++ > package/shapelib/shapelib.hash | 2 +- > package/shapelib/shapelib.mk | 17 +++-------------- > 3 files changed, 9 insertions(+), 15 deletions(-) I've applied, after adding the thread dependency (as noticed by Baruch) and tweaking the commit log (your commit title was too long). Thanks! Thomas
Dear Thomas&Baruch, great, thanks for the review and the tweaks! Regards, Zoltan Gyarmati https://zgyarmati.de On 12/17/2017 10:32 AM, Thomas Petazzoni wrote: > Hello, > > On Sun, 17 Dec 2017 00:53:01 +0100, Zoltan Gyarmati wrote: >> Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> >> --- >> package/shapelib/Config.in | 5 +++++ >> package/shapelib/shapelib.hash | 2 +- >> package/shapelib/shapelib.mk | 17 +++-------------- >> 3 files changed, 9 insertions(+), 15 deletions(-) > I've applied, after adding the thread dependency (as noticed by Baruch) > and tweaking the commit log (your commit title was too long). > > Thanks! > > Thomas
diff --git a/package/shapelib/Config.in b/package/shapelib/Config.in index aa2297b..97ca403 100644 --- a/package/shapelib/Config.in +++ b/package/shapelib/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_SHAPELIB bool "shapelib" + depends on BR2_INSTALL_LIBSTDCPP + 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 +9,6 @@ config BR2_PACKAGE_SHAPELIB (.dbf). http://shapelib.maptools.org/ + +comment "shapelib needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/shapelib/shapelib.hash b/package/shapelib/shapelib.hash index f3f812e..4f51392 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 34b6253..d6217ff 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))
Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> --- package/shapelib/Config.in | 5 +++++ package/shapelib/shapelib.hash | 2 +- package/shapelib/shapelib.mk | 17 +++-------------- 3 files changed, 9 insertions(+), 15 deletions(-)