From a1d3619c17c0f600b29281440ff0f0d055268bb3 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 4 Apr 2020 14:25:21 -0700 Subject: [PATCH] libgd: fix pkgconfig file The wrong paths are specified, causing failures with depending packages that use pkgconfig. Removed CMAKE_INSTALL as a result. No point when InstallDev is explicit. Signed-off-by: Rosen Penev --- libs/libgd/Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libs/libgd/Makefile b/libs/libgd/Makefile index 66359e6e6..b4380ee40 100644 --- a/libs/libgd/Makefile +++ b/libs/libgd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libgd PKG_VERSION:=2.3.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/$(PKG_NAME)/$(PKG_NAME)/releases/download/gd-$(PKG_VERSION)/ @@ -20,7 +20,6 @@ PKG_LICENSE:=MIT PKG_LICENSE_FILES:=COPYING PKG_CPE_ID:=cpe:/a:libgd:libgd -CMAKE_INSTALL:=1 PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk @@ -110,6 +109,12 @@ endif endif +define Build/InstallDev + $(call Build/InstallDev/cmake,$(1)) + $(SED) 's,/usr/lib,$(STAGING_DIR)/usr/lib,g' $(1)/usr/lib/pkgconfig/gdlib.pc + $(SED) 's,/usr/include,$(STAGING_DIR)/include,g' $(1)/usr/lib/pkgconfig/gdlib.pc +endef + define Package/libgd/install $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgd.so* $(1)/usr/lib/