From patchwork Sat Nov 2 22:02:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 1188475 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="QW009RT/"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="T/JqJwJ5"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 475Chp5vXZz9sP3 for ; Sun, 3 Nov 2019 09:02:18 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:Message-Id:Date:To: From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=WDy6SNoqju7uPHJqKm3qZp5gcL3o3ezo/x7KqCseKoY=; b=QW009RT/uk/ytX Dwggn51lPjfOYMIAnJjxi2ibmFzEQ9AGZjfXxUMJIJpltys/iAlxn9hNo8OGdfkCVgDF7jD8QjP2k igr+VStgxDz1hzCSvkT4/1Ecz2JCTG7uC8/IP65hcCndDGges11zfyqUfv1D/F5A6UXi/Y7c0nU73 tCPxhCypASq+Qb/cEsZ4bjwNI0sd7D5AVfr5vDf3F7Ot2wKUjnCjBvi2oDqmM3NQtAAdSgiVltacS elmG/UaLiWLwikrjbXV4JwXYD/P8OIQiNXSjc6buIxzmLd+z3e5udm+JlLrHD1XwVj1+uCa5EDmU6 OkJKhUI5pUV3IMc9DATQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iR1TK-0005mR-6A; Sat, 02 Nov 2019 22:02:14 +0000 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iR1TH-0005m5-Cw for openwrt-devel@lists.openwrt.org; Sat, 02 Nov 2019 22:02:13 +0000 Received: by mail-pl1-x631.google.com with SMTP id t10so5893341plr.8 for ; Sat, 02 Nov 2019 15:02:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=9suSw6Lg9Oi9/X4Oe6txDdw5f5PEhCY2c1145zzLu24=; b=T/JqJwJ5a8lVa4JeRg292F2Rw+zi8fQnqV/SrP3D21eD+IHwReOhKdkqKumMnjLEc8 AzdT7a4TUW0V1fRxrhrOkTJy4hIvZONwZoOEiRpj2dD35inYQs+eBFEBwIoQ6Ly5HSHN MREYj3cYkL6X0RNM6TtrbXfG7w0omvEAt/PCidycWL0lGi/9EVu1YWOzJeh18VpxZFLd 84sgFdOtAXutrBvgEzPIRdbmLAd5L96odBsXLkD7lG79dv7WtiNcm27QG37KYKKnN/Kb 4AINUAlYDJzH6/9En32LGwo+SBqLlPpSF07fmg24Z6oY6ndrbLcZ0/MclqbZsFh1N5Zx zgzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=9suSw6Lg9Oi9/X4Oe6txDdw5f5PEhCY2c1145zzLu24=; b=ozFY6CAixiofBvwgDKE/vqlvjNehVkIFREWnyA5a2GA4GxuOX2xb8HuTJmalUAOPAE bGs63iMUYZuxNbSGxHIxa4K77sYXhqYXxDWhsnipYJrhA7V6958wpHwtTovaMm4Su1GG ZqnkvMlT+1gRvWpWjKYDmUtya8znuNM0HyWGY8LxypDQC4LN9YFdtPjovgGHIXpEBb3U ZAZS4hNgve0gakruVTPp4wqjMXeEHc4iZ16rNdXHhK/519gjh1SUlepZN2HL/cgpQidC eURQ/qdxY3rnSKDv7bycKDvbqkwkOpqUo7dZVfD0CI63SCMrYgVvHCP90AE+hDlTFWsD mEzg== X-Gm-Message-State: APjAAAWBvxonX+RK6RpoGHMeoq9NNWCKfpne/SAmrH7W+ZBWMVPLkyQl xQC5MUMQVU35rX6yolSWjkjM15MNSAs= X-Google-Smtp-Source: APXvYqwe56SE2FhIGVJV5nas3X9GNteaSpBf26VeSXJroTPVthDjYclbzU82Q0rndw31/HLeb8Be/g== X-Received: by 2002:a17:902:7c93:: with SMTP id y19mr20062364pll.26.1572732128538; Sat, 02 Nov 2019 15:02:08 -0700 (PDT) Received: from localhost.localdomain (astound-69-42-2-23.ca.astound.net. [69.42.2.23]) by smtp.gmail.com with ESMTPSA id j4sm10874734pfh.187.2019.11.02.15.02.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Nov 2019 15:02:07 -0700 (PDT) From: Rosen Penev To: openwrt-devel@lists.openwrt.org Date: Sat, 2 Nov 2019 15:02:05 -0700 Message-Id: <20191102220205.2865-1-rosenp@gmail.com> X-Mailer: git-send-email 2.17.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191102_150211_463595_57354B01 X-CRM114-Status: UNSURE ( 8.16 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:631 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (rosenp[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Subject: [OpenWrt-Devel] [PATCHv2] tools/pkg-config: Replace with pkgconf X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org pkgconf is a newer, actively maintained implementation of pkg-config that supports more aspects of the pkg-config file specification and provides a library interface that applications can use to incorporate intelligent handling of pkg-config files into themselves (such as build file generators, IDEs, and compilers). Through its pkg-config compatibility interface (activated when it is run as "pkg-config"), it also can completely replace the original implementation. It is also lighterweight and does not require glib2, as pkg-config does. On other distros, pkgconf is symlinked to pkg-config. For simplicity here, it is renamed to pkg-config.real, as in the original package. Initial results have been positive. As before, pkgconf works as long as the pkg-config files point to the proper paths. Signed-off-by: Rosen Penev --- v2: Rebased against master tools/Makefile | 6 +++--- tools/{pkg-config => pkgconf}/Makefile | 20 +++++++------------ .../{pkg-config => pkgconf}/files/pkg-config | 0 3 files changed, 10 insertions(+), 16 deletions(-) rename tools/{pkg-config => pkgconf}/Makefile (54%) rename tools/{pkg-config => pkgconf}/files/pkg-config (100%) diff --git a/tools/Makefile b/tools/Makefile index 23671cba91..a27603c2b7 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -22,7 +22,7 @@ ifneq ($(CONFIG_SDK)$(CONFIG_PACKAGE_kmod-b43)$(CONFIG_PACKAGE_b43legacy-firmwar endif tools-$(BUILD_TOOLCHAIN) += gmp mpfr mpc libelf expat -tools-y += m4 libtool autoconf automake flex bison pkg-config mklibs zlib +tools-y += m4 libtool autoconf automake flex bison pkgconf mklibs zlib tools-y += sstrip make-ext4fs e2fsprogs mtd-utils mkimage tools-y += firmware-utils patch-image quilt padjffs2 tools-y += mm-macros missing-macros cmake bc findutils gengetopt patchelf @@ -48,7 +48,7 @@ $(curdir)/squashfs/compile := $(curdir)/lzma-old/compile $(curdir)/squashfskit4/compile := $(curdir)/xz/compile $(curdir)/zlib/compile $(curdir)/quilt/compile := $(curdir)/autoconf/compile $(curdir)/findutils/compile $(curdir)/autoconf/compile := $(curdir)/m4/compile -$(curdir)/automake/compile := $(curdir)/m4/compile $(curdir)/autoconf/compile $(curdir)/pkg-config/compile $(curdir)/xz/compile +$(curdir)/automake/compile := $(curdir)/m4/compile $(curdir)/autoconf/compile $(curdir)/pkgconf/compile $(curdir)/xz/compile $(curdir)/gmp/compile := $(curdir)/libtool/compile $(curdir)/mpc/compile := $(curdir)/mpfr/compile $(curdir)/gmp/compile $(curdir)/mpfr/compile := $(curdir)/gmp/compile @@ -69,7 +69,7 @@ $(curdir)/findutils/compile := $(curdir)/bison/compile $(curdir)/gengetopt/compile := $(curdir)/libtool/compile $(curdir)/patchelf/compile := $(curdir)/libtool/compile $(curdir)/dosfstools/compile := $(curdir)/autoconf/compile $(curdir)/automake/compile -$(curdir)/libressl/compile := $(curdir)/pkg-config/compile +$(curdir)/libressl/compile := $(curdir)/pkgconf/compile $(curdir)/mkimage/compile += $(curdir)/libressl/compile $(curdir)/firmware-utils/compile += $(curdir)/libressl/compile $(curdir)/zlib/compile $(curdir)/cmake/compile += $(curdir)/libressl/compile diff --git a/tools/pkg-config/Makefile b/tools/pkgconf/Makefile similarity index 54% rename from tools/pkg-config/Makefile rename to tools/pkgconf/Makefile index 17a8737be1..cefee1edf0 100644 --- a/tools/pkg-config/Makefile +++ b/tools/pkgconf/Makefile @@ -1,4 +1,4 @@ -# +# # Copyright (C) 2006-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. @@ -6,12 +6,12 @@ # include $(TOPDIR)/rules.mk -PKG_NAME:=pkg-config -PKG_VERSION:=0.29.2 +PKG_NAME:=pkgconf +PKG_VERSION:=1.6.3 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://pkgconfig.freedesktop.org/releases/ -PKG_HASH:=6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz +PKG_SOURCE_URL:=https://distfiles.dereferenced.org/pkgconf +PKG_HASH:=61f0b31b0d5ea0e862b454a80c170f57bad47879c0c42bd8de89200ff62ea210 HOST_BUILD_PARALLEL:=1 @@ -19,15 +19,9 @@ include $(INCLUDE_DIR)/host-build.mk unexport PKG_CONFIG -HOST_CONFIGURE_ARGS += --with-internal-glib - -ifeq ($(HOST_OS),Darwin) -HOST_LDFLAGS += -framework CoreFoundation -framework Carbon -endif - define Host/Install $(MAKE) -C $(HOST_BUILD_DIR) install - mv $(STAGING_DIR_HOST)/bin/pkg-config $(STAGING_DIR_HOST)/bin/pkg-config.real + mv $(STAGING_DIR_HOST)/bin/pkgconf $(STAGING_DIR_HOST)/bin/pkg-config.real $(INSTALL_BIN) ./files/pkg-config $(STAGING_DIR_HOST)/bin/pkg-config endef diff --git a/tools/pkg-config/files/pkg-config b/tools/pkgconf/files/pkg-config similarity index 100% rename from tools/pkg-config/files/pkg-config rename to tools/pkgconf/files/pkg-config