From 1749d152a29501fc2c3e36b63f1f4376b3f157aa Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Fri, 10 Mar 2023 21:59:18 +0100 Subject: [PATCH] Revert "libgpiod: introduce libgpiodcxx package for C++ binding" This reverts commit 82ea104b978dcd84919dfe5d1ee630791d85df10. I merged the library update to v2.0 to fast, it breaks openocd build due to API change. Signed-off-by: Michael Heimpold --- libs/libgpiod/Makefile | 33 --------------------------------- 1 file changed, 33 deletions(-) diff --git a/libs/libgpiod/Makefile b/libs/libgpiod/Makefile index 6320c24016..862b6ced04 100644 --- a/libs/libgpiod/Makefile +++ b/libs/libgpiod/Makefile @@ -26,12 +26,6 @@ PYTHON3_PKG_BUILD:=0 include $(INCLUDE_DIR)/package.mk include ../../lang/python/python3-package.mk -ifneq ($(CONFIG_PACKAGE_libgpiodcxx),) -CONFIGURE_ARGS += --enable-bindings-cxx -else -CONFIGURE_ARGS += --disable-bindings-cxx -endif - ifneq ($(CONFIG_PACKAGE_gpiod-tools),) CONFIGURE_ARGS += --enable-tools endif @@ -67,18 +61,6 @@ define Package/gpiod-tools/description (gpiod stands for GPIO device). endef -define Package/libgpiodcxx - SECTION:=libs - CATEGORY:=Libraries - URL:=https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git - TITLE:=C++ binding for libgpiod - DEPENDS:=+libstdcpp +libgpiod -endef - -define Package/libgpiodcxx/description - This package contains the C++ binding for libgpiod. -endef - define Package/python3-gpiod SECTION:=lang CATEGORY:=Languages @@ -116,15 +98,6 @@ define Build/InstallDev $(INSTALL_DIR) $(1)/usr/lib/pkgconfig $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libgpiod.pc $(1)/usr/lib/pkgconfig/ - ifneq ($(CONFIG_PACKAGE_libgpiodcxx),) - $(CP) $(PKG_INSTALL_DIR)/usr/include/gpiodcxx $(1)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/gpiod.hpp $(1)/usr/include/ - - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgpiodcxx.{so*,a} $(1)/usr/lib/ - - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libgpiodcxx.pc $(1)/usr/lib/pkgconfig/ - endif - ifneq ($(CONFIG_PACKAGE_python3-gpiod),) $(INSTALL_DIR) $(1)$(PYTHON3_PKG_DIR) $(CP) $(PKG_INSTALL_DIR)$(PYTHON3_PKG_DIR)/* $(1)$(PYTHON3_PKG_DIR) @@ -136,11 +109,6 @@ define Package/libgpiod/install $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgpiod.so.* $(1)/usr/lib/ endef -define Package/libgpiodcxx/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgpiodcxx.so.* $(1)/usr/lib/ -endef - define Package/gpiod-tools/install $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ @@ -151,7 +119,6 @@ define Py3Package/python3-gpiod/install endef $(eval $(call BuildPackage,libgpiod)) -$(eval $(call BuildPackage,libgpiodcxx)) $(eval $(call BuildPackage,gpiod-tools)) $(eval $(call Py3Package,python3-gpiod)) $(eval $(call BuildPackage,python3-gpiod)) -- 2.30.2