diff options
| author | Rosen Penev <rosenp@gmail.com> | 2020-12-07 21:48:21 -0800 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2020-12-10 01:50:28 -0800 |
| commit | 8285806e10e6631c22ae202aa664c567d88ed14b (patch) | |
| tree | e56f4286632e1a46c92d0731aee87187ea63e80b /net/curl | |
| parent | fb521dd79faa8f986e8aa1ee530de43e507812b8 (diff) | |
curl: fix host config file
Fix the prefix instead.
Replace custom Compile section with PKG_INSTALL.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'net/curl')
| -rw-r--r-- | net/curl/Makefile | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/net/curl/Makefile b/net/curl/Makefile index 55e660364..6023811d9 100644 --- a/net/curl/Makefile +++ b/net/curl/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=curl PKG_VERSION:=7.73.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://dl.uxnr.de/mirror/curl/ \ @@ -23,6 +23,7 @@ PKG_LICENSE_FILES:=COPYING PKG_CPE_ID:=cpe:/a:haxx:libcurl PKG_FIXUP:=autoreconf +PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 PKG_CONFIG_DEPENDS:= \ @@ -159,20 +160,13 @@ CONFIGURE_ARGS += \ $(call autoconf_bool,CONFIG_LIBCURL_UNIX_SOCKETS,unix-sockets) \ $(call autoconf_bool,CONFIG_LIBCURL_VERBOSE,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 $(1)/usr/lib $(1)/usr/lib/pkgconfig $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/curl-config $(1)/usr/bin/ $(CP) $(PKG_INSTALL_DIR)/usr/include/curl $(1)/usr/include/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcurl.{a,so*} $(1)/usr/lib/ $(CP) $(PKG_BUILD_DIR)/libcurl.pc $(1)/usr/lib/pkgconfig/ - $(SED) 's,-L$$$${exec_prefix}/lib,,g' $(1)/usr/bin/curl-config + $(SED) 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' $(1)/usr/bin/curl-config [ -n "$(TARGET_LDFLAGS)" ] && $(SED) 's#$(TARGET_LDFLAGS)##g' $(1)/usr/lib/pkgconfig/libcurl.pc || true $(LN) $(STAGING_DIR)/usr/bin/curl-config $(2)/bin/ endef |