From fb521dd79faa8f986e8aa1ee530de43e507812b8 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 7 Dec 2020 21:52:20 -0800 Subject: [PATCH] gnurl: fix host config file Fix the prefix instead. Replace custom Compile section with PKG_INSTALL. Minor cleanups for consistency between packages. Signed-off-by: Rosen Penev --- net/gnurl/Makefile | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/net/gnurl/Makefile b/net/gnurl/Makefile index 2e68a2b0d..dd1714309 100644 --- a/net/gnurl/Makefile +++ b/net/gnurl/Makefile @@ -9,18 +9,18 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gnurl PKG_VERSION:=7.72.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 -PKG_SOURCE_URL:=@GNU/gnunet - -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@GNU/gnunet PKG_HASH:=b1e72be03fcf9b3fdaf01ae0702c686e9de10f67ef538918447c9e81555694f8 +PKG_MAINTAINER:=Daniel Golle PKG_LICENSE:=MIT PKG_LICENSE_FILES:=COPYING PKG_FIXUP:=autoreconf +PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk @@ -29,7 +29,6 @@ define Package/gnurl/Default SECTION:=net CATEGORY:=Network URL:=https://gnunet.org/en/gnurl.html - MAINTAINER:=Daniel Golle endef define Package/gnurl @@ -94,20 +93,13 @@ CONFIGURE_ARGS += \ --disable-manual \ --disable-verbose -define Build/Compile - +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ - DESTDIR="$(PKG_INSTALL_DIR)" \ - CC="$(TARGET_CC)" \ - install -endef - define Build/InstallDev $(INSTALL_DIR) $(2)/bin $(1)/usr/bin $(1)/usr/include/gnurl $(1)/usr/lib $(1)/usr/lib/pkgconfig $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gnurl-config $(1)/usr/bin/ $(CP) $(PKG_INSTALL_DIR)/usr/include/gnurl/*.h $(1)/usr/include/gnurl $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgnurl.{a,so*} $(1)/usr/lib/ $(CP) $(PKG_BUILD_DIR)/libgnurl.pc $(1)/usr/lib/pkgconfig/ - $(SED) 's,-L$$$${exec_prefix}/lib,,g' $(1)/usr/bin/gnurl-config + $(SED) 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' $(1)/usr/bin/gnurl-config [ -n "$(TARGET_LDFLAGS)" ] && $(SED) 's#$(TARGET_LDFLAGS)##g' $(1)/usr/lib/pkgconfig/libgnurl.pc || true $(LN) $(STAGING_DIR)/usr/bin/gnurl-config $(2)/bin/ endef