From 26a9b475885a3102a80777240df19739df00141e Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 22 Feb 2021 20:48:58 -0800 Subject: [PATCH] libplist: get rid of libplistxx Nothing uses it. Signed-off-by: Rosen Penev --- libs/libplist/Makefile | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/libs/libplist/Makefile b/libs/libplist/Makefile index 73595a77e..d5cbc0e94 100644 --- a/libs/libplist/Makefile +++ b/libs/libplist/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libplist PKG_VERSION:=2.2.0 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://www.libimobiledevice.org/downloads @@ -21,7 +21,6 @@ PKG_CPE_ID:=cpe:/a:libimobiledevice:libplist PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 -include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk define Package/libplist/Default @@ -48,21 +47,6 @@ define Package/libplist/description $(call Package/libplist/Default/description) endef -define Package/libplistcxx - $(call Package/libplist/Default) - SECTION:=libs - CATEGORY:=Libraries - DEPENDS:=+libplist $(CXX_DEPENDS) - TITLE+= C++ library - PKG_LICENSE:=LGPL-2.1-or-later - PKG_LICENSE_FILES:=COPYING.LESSER -endef - -define Package/libplistcxx/description - $(call Package/libplist/Default/description) - This package contains the libplist C++ shared library. -endef - define Package/plistutil $(call Package/libplist/Default) SECTION:=utils @@ -83,7 +67,6 @@ CONFIGURE_ARGS += \ --without-cython TARGET_CFLAGS += -flto -TARGET_CXXFLAGS += -std=c++11 -fno-rtti TARGET_LDFLAGS += -Wl,--gc-sections define Build/InstallDev @@ -92,9 +75,7 @@ define Build/InstallDev $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libplist-2.0*.so* $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libplist++-2.0.pc $(1)/usr/lib/pkgconfig/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libplist-2.0.pc $(1)/usr/lib/pkgconfig/ - $(LN) libplist++-2.0.pc $(1)/usr/lib/pkgconfig/libplist++.pc $(LN) libplist-2.0.pc $(1)/usr/lib/pkgconfig/libplist.pc endef @@ -103,16 +84,10 @@ define Package/libplist/install $(CP) $(PKG_INSTALL_DIR)/usr/lib/libplist-2.0.so.* $(1)/usr/lib/ endef -define Package/libplistcxx/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libplist++-2.0.so.* $(1)/usr/lib/ -endef - define Package/plistutil/install $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/plistutil $(1)/usr/bin/ endef $(eval $(call BuildPackage,libplist)) -$(eval $(call BuildPackage,libplistcxx)) $(eval $(call BuildPackage,plistutil))