From 0daec55ce50d4dffae040645227a718ce528b978 Mon Sep 17 00:00:00 2001 From: Ted Hess Date: Tue, 13 Nov 2018 16:31:57 -0500 Subject: [PATCH] libsoup: fix intltool host dependency. Cleaup some build args Signed-off-by: Ted Hess --- libs/libsoup/Makefile | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/libs/libsoup/Makefile b/libs/libsoup/Makefile index 45b200fd8b..e872fe9d6d 100644 --- a/libs/libsoup/Makefile +++ b/libs/libsoup/Makefile @@ -1,6 +1,4 @@ # -# Copyright (C) 2014 OpenWrt.org -# # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # @@ -9,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libsoup PKG_VERSION:=2.65.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/2.65 @@ -19,6 +17,7 @@ PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING PKG_CPE_ID:=cpe:/a:gnome:libsoup +PKG_BUILD_DEPENDS:=intltool/host PKG_BUILD_PARALLEL:=1 PKG_FIXUP:=autoreconf PKG_INSTALL:=1 @@ -26,9 +25,6 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk -TARGET_LDFLAGS+=\ - -Wl,-rpath-link=$(STAGING_DIR)/usr/lib $(if $(ICONV_FULL),-liconv) - define Package/libsoup SECTION:=libs CATEGORY:=Libraries @@ -38,17 +34,14 @@ define Package/libsoup DEPENDS:=+glib2 +libxml2 +libgnutls +libsqlite3 +libpsl $(ICONV_DEPENDS) $(INTL_DEPENDS) endef -define Build/Configure - $(call Build/Configure/Default, \ +CONFIGURE_ARGS += \ --disable-glibtest \ --disable-gtk-doc-html \ --disable-more-warnings \ --disable-vala \ --without-apache-httpd \ --without-gnome \ - --without-gssapi \ - ) -endef + --without-gssapi define package/libsoup/decription Libsoup is an HTTP library implementation in C