pkg-config: Add CONFLICTS for pkgconf

Fixed license information. Added PKG_BUILD_PARALLEL for faster compilation. Remove PKG_ASLR_PIE. It seems it's going through a rework. Signed-off-by: Rosen Penev <[email protected]>
sebastian-de · Nov 2, 2019 · 243a1a1 · 243a1a1
1 parent a1a2544
commit 243a1a1
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/devel/pkg-config/Makefile b/devel/pkg-config/Makefile
@@ -9,16 +9,18 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pkg-config
 PKG_VERSION:=0.29.2
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE_URL:=https://pkg-config.freedesktop.org/releases/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_HASH:=6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591
+
 PKG_MAINTAINER:=Heinrich Schuchardt <[email protected]>
 PKG_LICENSE:=GPL-2.0-or-later
+PKG_LICENSE_FILES:=COPYING
 
-PKG_ASLR_PIE:=1
 PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/nls.mk
@@ -29,6 +31,7 @@ define Package/pkg-config
   TITLE:=pkg-config
   URL:=https://www.freedesktop.org/wiki/Software/pkg-config/
   DEPENDS:=+glib2 $(INTL_DEPENDS)
+  CONFLICTS:=pkgconf
 endef
 
 define Package/pkg-config/description
@@ -39,6 +42,8 @@ define Package/pkg-config/description
   other libraries).
 endef
 
+TARGET_CFLAGS += $(FPIC)
+
 define Package/pkg-config/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/pkg-config $(1)/usr/bin/