From patchwork Sat Jul 4 22:16:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 1322948 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=2001:8b0:10b:1231::1; helo=merlin.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; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=U20NkwHG; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=UGwdspP5; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (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 49zmVW0tkDz9sPF for ; Sun, 5 Jul 2020 08:20:18 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe :List-Id:MIME-Version:Message-Id:Date:Subject: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=+9QtbC5cMciLDc6wh98yqa+zhmRXHfvwownf575ruwA=; b=U20NkwHGUhbu6TreGgkZ+v1RTe wS9KdNYtLKv9bQnzTAh095JzuBSwReDY6zF5PD14T77MiA1ybrYBWcQTWCfmE089pzuhuuAU6X78J v1Fhj774OqeSZJZIGN3T7Zj9d0AlJLJzfz8kHnV0V63PCEQ5AD2+tr4CSQe1YAbtF54Y32KfhQs3Z qO69VxHUdWsfdK+7V8g0agnQT/A07qjQKRTm7+4AmHbOfOdKGNPwo/RymXGfd+VzlWo0PkxA+luoT Jef2by8QbfDTH1SKl6JKo8PAlHNJfOhnbpXp1F7lb8CHkgZAAHu1kTNCzyiUfJiRUcLd+rH4VnGdJ IJyWZAVA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jrqSu-0001kQ-6m; Sat, 04 Jul 2020 22:16:56 +0000 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jrqSr-0001k4-H7 for openwrt-devel@lists.openwrt.org; Sat, 04 Jul 2020 22:16:54 +0000 Received: by mail-pf1-x441.google.com with SMTP id t11so10523613pfq.11 for ; Sat, 04 Jul 2020 15:16:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=XTZYfUrwp35mFrnDOBs3Q2GDC2OcaFCjhdFv8eGO4eY=; b=UGwdspP5dNo5njZi7MbeDVIkupYWn9Cs+RTqfSIbnbB2lmvDpj3Cai3/CDk7TwwJI8 mNauog0ZcmC+Pr9ckXIEhV84JIQBNIaxu0wrYiTzZuM2kj00+2mzpIblRtVt1RGF7Dq9 U+IVuK4tzQOB8d8hFXS93UVA4z2k0vYjwqvwYYGWepBC6xPINVhFeIpYFB1XIkoMwFWt y7faqETTOqlXuYxVcui5mLNT/lM/D3oKuPvPBefEFi4Ah4EajOeYZVze3rjtwzs9vgGV OC2nvGp5z8mK/V4asro2BcB8Q2G+2XdEgmEXGQ1sbVZaLmEjDJiptwJGHblZaLUZ/3Yr W6Hg== 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:mime-version :content-transfer-encoding; bh=XTZYfUrwp35mFrnDOBs3Q2GDC2OcaFCjhdFv8eGO4eY=; b=RDAiUBmhwRrYWJP2H7vujQsTq+LqGW6pDznelMZlGATOKDuZQb4Pk9X9yheW6Tcsek A96VB9yqrMdnWg41M5d9G1LU10TmdqAj6BPk9atSYQQJX34HOe+fDDyy1TsqN7YUY9tq ANPkr+fSlBabMZeb9yiHxvzQkjx+R9w86Xu/94FG5twEPtKE5xWjXtguoEY61rOSFlNm y1sbbZKUEl8k+jr0Lj6OCQCC6mA4QTH6K5LO7BvS0X9e7NOWARhzQ5GuT9EzUYLlNKY5 moGlnuCPxtJsM5DHMYW2ahSVr0Ma83sNjcb75N6AUrYTeClqpcc/0hd1Hfa03wvL2Gaj T/AQ== X-Gm-Message-State: AOAM532ruDmFJOpIMu4o6McNr/LtVb6gyMkCQowPfyizgFRHU2dPXyjx flZlE9Aug9/y+uDr08+6kysdT50XZkQ= X-Google-Smtp-Source: ABdhPJxZ4HNHjXCTq5ExKcbtN7S/c/a3+sgcMzPv9JL9cX759p6JVW9ritBoXho/hE42Kb91FhWqOw== X-Received: by 2002:a62:5210:: with SMTP id g16mr37100876pfb.204.1593901009282; Sat, 04 Jul 2020 15:16:49 -0700 (PDT) Received: from mangix-trapnet.lan (76-14-109-232.rk.wavecable.com. [76.14.109.232]) by smtp.gmail.com with ESMTPSA id m6sm11439900pjb.34.2020.07.04.15.16.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Jul 2020 15:16:48 -0700 (PDT) From: Rosen Penev To: openwrt-devel@lists.openwrt.org Subject: [PATCH] libjson-c: fix pkgconfig file Date: Sat, 4 Jul 2020 15:16:46 -0700 Message-Id: <20200704221646.362524-1-rosenp@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200704_181653_634816_4E6C3710 X-CRM114-Status: UNSURE ( 7.31 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [rosenp[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:441 listed in] [list.dnswl.org] X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org The pkgconfig file references the host directories, not the openwrt ones. Used SED to fix as is done elsewhere. Removed CMAKE_INSTALL as a result. Removed now pointless CFLAGS. Added PKG_BUILD_PARALLEL for faster compilation. Various rearrangements for consistency between packages. Signed-off-by: Rosen Penev --- package/libs/libjson-c/Makefile | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/package/libs/libjson-c/Makefile b/package/libs/libjson-c/Makefile index 5e88bba9a3..d7366983dc 100644 --- a/package/libs/libjson-c/Makefile +++ b/package/libs/libjson-c/Makefile @@ -9,29 +9,24 @@ include $(TOPDIR)/rules.mk PKG_NAME:=json-c PKG_VERSION:=0.14 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-nodoc.tar.gz PKG_SOURCE_URL:=https://s3.amazonaws.com/json-c_releases/releases/ PKG_HASH:=99914e644a25201d82ccefa20430f7515c110923360f9ef46755527c02412afa +PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=MIT PKG_LICENSE_FILES:=COPYING PKG_CPE_ID:=cpe:/a:json-c_project:json-c -CMAKE_INSTALL:=1 -CMAKE_OPTIONS += -DCMAKE_INSTALL_INCLUDEDIR=$(STAGING_DIR)/usr/include - -PKG_MAINTAINER:=Felix Fietkau +PKG_BUILD_PARALLEL:=1 +HOST_BUILD_PREFIX:=$(STAGING_DIR_HOST) include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/cmake.mk -TARGET_CFLAGS += $(FPIC) -Wno-implicit-fallthrough -HOST_CFLAGS += -Wno-implicit-fallthrough -HOST_BUILD_PREFIX:=$(STAGING_DIR_HOST) - define Package/libjson-c SECTION:=libs CATEGORY:=Libraries @@ -44,6 +39,15 @@ define Package/libjson-c/description This package contains a library for javascript object notation backends. endef +CMAKE_OPTIONS += \ + -DCMAKE_INSTALL_INCLUDEDIR=$(STAGING_DIR)/usr/include + +define Build/InstallDev + $(call Build/InstallDev/cmake,$(1)) + $(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/json-c.pc + $(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/json-c.pc +endef + define Package/libjson-c/install $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libjson-c.so.* $(1)/usr/lib/