tiff: get rid of libtiffxx
authorRosen Penev <rosenp@gmail.com>
Tue, 23 Feb 2021 04:51:59 +0000 (20:51 -0800)
committerRosen Penev <rosenp@gmail.com>
Fri, 5 Mar 2021 23:07:24 +0000 (15:07 -0800)
Nothing uses it.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
libs/tiff/Makefile

index 837fa5470456cceb0bd34599a379e143c4eb1e51..95c45d4717b643edb353bb576c7dec862aa3442e 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tiff
 PKG_VERSION:=4.2.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://download.osgeo.org/libtiff
@@ -21,9 +21,7 @@ PKG_LICENSE_FILES:=COPYRIGHT
 PKG_CPE_ID:=cpe:/a:libtiff:libtiff
 
 PKG_BUILD_PARALLEL:=1
-PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_libtiffxx
 
-include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
@@ -41,15 +39,6 @@ $(call Package/tiff/Default)
   ABI_VERSION:=5
 endef
 
-define Package/libtiffxx
-$(call Package/tiff/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE+= library(c++ bindings)
-  DEPENDS:=+libtiff $(CXX_DEPENDS)
-  ABI_VERSION:=5
-endef
-
 define Package/tiff-utils
 $(call Package/tiff/Default)
   SECTION:=utils
@@ -77,7 +66,7 @@ CMAKE_OPTIONS += \
        -Dzstd=OFF \
        -Dwebp=OFF \
        -Djpeg12=OFF \
-       -Dcxx=O$(if $(CONFIG_PACKAGE_libtiffxx),N,FF)
+       -Dcxx=OFF
 
 TARGET_CFLAGS += $(TARGET_CPPFLAGS)
 
@@ -92,16 +81,10 @@ define Package/libtiff/install
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtiff.so.$(ABI_VERSION)* $(1)/usr/lib
 endef
 
-define Package/libtiffxx/install
-       $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtiffxx.so.$(ABI_VERSION)* $(1)/usr/lib/
-endef
-
 define Package/tiff-utils/install
        $(INSTALL_DIR) $(1)/usr/bin
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
 endef
 
 $(eval $(call BuildPackage,libtiff))
-$(eval $(call BuildPackage,libtiffxx))
 $(eval $(call BuildPackage,tiff-utils))