From 5b5659850dbaae4d2ac2e3f599015f71e341841e Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sat, 24 Feb 2018 11:54:23 +0100 Subject: [PATCH 1/6] tiff: remove uclibc++.mk include The include injects a lib depend on libuClibc++.so.0 into the package, even on musl. Remove it and replace the depend with libstcpp instead. Signed-off-by: Sebastian Kemper --- libs/tiff/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libs/tiff/Makefile b/libs/tiff/Makefile index 79c8f0b94..1f28ab148 100644 --- a/libs/tiff/Makefile +++ b/libs/tiff/Makefile @@ -25,7 +25,6 @@ PKG_INSTALL:=1 PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_libtiffxx -include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk define Package/tiff/Default @@ -47,7 +46,7 @@ $(call Package/tiff/Default) SECTION:=libs CATEGORY:=Libraries TITLE+= library(c++ bindings) - DEPENDS:=+libtiff $(CXX_DEPENDS) + DEPENDS:=+libtiff +PACKAGE_libtiffxx:libstdcpp endef define Package/tiff-utils From fad60143571b60927b52c81ffdf1869b358a9077 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sat, 24 Feb 2018 11:56:02 +0100 Subject: [PATCH 2/6] tiff: remove $(FPIC) from TARGET_CFLAGS tiff already makes sure that the compiler emits position-independent code. Adding $(FPIC) makes no difference. In addition the tiff build system puts its own flag behind the CFLAGS, overriding whatever was set before. Also with $(FPIC) in CFLAGS even the tiff utils get compiled with PIC, which us undesirable. Signed-off-by: Sebastian Kemper --- libs/tiff/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/libs/tiff/Makefile b/libs/tiff/Makefile index 1f28ab148..78d931268 100644 --- a/libs/tiff/Makefile +++ b/libs/tiff/Makefile @@ -58,8 +58,6 @@ $(call Package/tiff/Default) DEPENDS:=+libtiff endef -TARGET_CFLAGS += $(FPIC) - define Build/Configure $(call Build/Configure/Default, \ $(if $(CONFIG_PACKAGE_libtiffxx), \ From 47b3a829d727b3fb261583cb5582e56ff8ad8bb3 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sat, 24 Feb 2018 11:58:39 +0100 Subject: [PATCH 3/6] tiff: update install defines - Use $(INSTALL_DATA) for headers (and really copy only the headers). - Install _all_ symlinks. Signed-off-by: Sebastian Kemper --- libs/tiff/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/tiff/Makefile b/libs/tiff/Makefile index 78d931268..f3dc94fb6 100644 --- a/libs/tiff/Makefile +++ b/libs/tiff/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tiff PKG_VERSION:=4.0.9 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://download.osgeo.org/libtiff @@ -83,17 +83,17 @@ endef define Build/InstallDev $(INSTALL_DIR) $(1)/usr/{lib,include} $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/ endef define Package/libtiff/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtiff.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtiff.so* $(1)/usr/lib/ endef define Package/libtiffxx/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtiffxx.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtiffxx.so* $(1)/usr/lib/ endef define Package/tiff-utils/install From b0c9cc9b19b5baf0c48e90ae0571b697473e3a2b Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sun, 25 Feb 2018 20:01:23 +0100 Subject: [PATCH 4/6] tiff: switch PKG_SOURCE_URL to HTTPS Signed-off-by: Sebastian Kemper --- libs/tiff/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/tiff/Makefile b/libs/tiff/Makefile index f3dc94fb6..bc3f07d5b 100644 --- a/libs/tiff/Makefile +++ b/libs/tiff/Makefile @@ -12,7 +12,7 @@ PKG_VERSION:=4.0.9 PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://download.osgeo.org/libtiff +PKG_SOURCE_URL:=https://download.osgeo.org/libtiff PKG_HASH:=6e7bdeec2c310734e734d19aae3a71ebe37a4d842e0e23dbb1b8921c0026cfcd PKG_FIXUP:=autoreconf From 4ade6e6f7a52ad7cb10cd48a24a32a30af6d53a0 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sun, 25 Feb 2018 20:03:39 +0100 Subject: [PATCH 5/6] tiff: use CONFIGURE_ARGS Simplify the Makefile. No functional change. Signed-off-by: Sebastian Kemper --- libs/tiff/Makefile | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/libs/tiff/Makefile b/libs/tiff/Makefile index bc3f07d5b..54e603091 100644 --- a/libs/tiff/Makefile +++ b/libs/tiff/Makefile @@ -58,27 +58,21 @@ $(call Package/tiff/Default) DEPENDS:=+libtiff endef -define Build/Configure - $(call Build/Configure/Default, \ - $(if $(CONFIG_PACKAGE_libtiffxx), \ - --enable-cxx, \ - --disable-cxx \ - ) \ - --disable-lzma \ - --enable-ccitt \ - --enable-packbits \ - --enable-lzw \ - --enable-thunder \ - --enable-next \ - --enable-logluv \ - --enable-mdi \ - --enable-zlib \ - --enable-jpeg \ - --disable-old-jpeg \ - --disable-jbig \ - --without-x \ - ) -endef +CONFIGURE_ARGS += \ + $(if $(CONFIG_PACKAGE_libtiffxx),--enable-cxx,--disable-cxx) \ + --disable-lzma \ + --enable-ccitt \ + --enable-packbits \ + --enable-lzw \ + --enable-thunder \ + --enable-next \ + --enable-logluv \ + --enable-mdi \ + --enable-zlib \ + --enable-jpeg \ + --disable-old-jpeg \ + --disable-jbig \ + --without-x define Build/InstallDev $(INSTALL_DIR) $(1)/usr/{lib,include} From a257f44b301cc6bac93258b17c749567828e77e8 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sun, 25 Feb 2018 20:06:02 +0100 Subject: [PATCH 6/6] tiff: install headers of the c++ bindings Make sure that the c++ headers get installed to the staging directory when libtiffxx was selected/built. Signed-off-by: Sebastian Kemper --- libs/tiff/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libs/tiff/Makefile b/libs/tiff/Makefile index 54e603091..b666e0a0a 100644 --- a/libs/tiff/Makefile +++ b/libs/tiff/Makefile @@ -74,10 +74,15 @@ CONFIGURE_ARGS += \ --disable-jbig \ --without-x +define Build/InstallDev/hxx + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/*.hxx $(1)/usr/include/ +endef + define Build/InstallDev $(INSTALL_DIR) $(1)/usr/{lib,include} $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(1)/usr/lib/ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/ + $(if $(CONFIG_PACKAGE_libtiffxx), $(call Build/InstallDev/hxx,$(1))) endef define Package/libtiff/install