Browse Source

tiff: revert uclibc++ commit

This reverts 5b5659850d.

In hindsight I have to admit I did not correctly understand the
implications of the uclibc++.mk include.

The include allows a package to follow the user's choice regarding which
C++ library should be the standard. Linking against uClibc++ instead of
libstd++ is not a problem when running musl (which is what I had
incorrectly assumed), as both C++ libs are separate packages. And
uClibc++ is a lot smaller than libstd++, which is probably why it is
even the default C++ lib on OpenWrt currently.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
lilik-openwrt-22.03
Sebastian Kemper 7 years ago
parent
commit
883af8a5d1
1 changed files with 3 additions and 2 deletions
  1. +3
    -2
      libs/tiff/Makefile

+ 3
- 2
libs/tiff/Makefile View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=tiff PKG_NAME:=tiff
PKG_VERSION:=4.0.9 PKG_VERSION:=4.0.9
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://download.osgeo.org/libtiff PKG_SOURCE_URL:=https://download.osgeo.org/libtiff
@ -25,6 +25,7 @@ PKG_INSTALL:=1
PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_libtiffxx PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_libtiffxx
include $(INCLUDE_DIR)/uclibc++.mk
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define Package/tiff/Default define Package/tiff/Default
@ -46,7 +47,7 @@ $(call Package/tiff/Default)
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
TITLE+= library(c++ bindings) TITLE+= library(c++ bindings)
DEPENDS:=+libtiff +PACKAGE_libtiffxx:libstdcpp
DEPENDS:=+libtiff $(CXX_DEPENDS)
endef endef
define Package/tiff-utils define Package/tiff-utils


Loading…
Cancel
Save