From patchwork Mon Apr 19 08:01:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dominique MARTINET X-Patchwork-Id: 1467812 X-Patchwork-Delegate: sbabic@denx.de 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=googlegroups.com (client-ip=2607:f8b0:4864:20::a3b; helo=mail-vk1-xa3b.google.com; envelope-from=swupdate+bncbcwivbv7sugrbr7r6sbqmgqewmblvbq@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20161025 header.b=ramHs/tj; dkim-atps=neutral Received: from mail-vk1-xa3b.google.com (mail-vk1-xa3b.google.com [IPv6:2607:f8b0:4864:20::a3b]) (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 4FNzlw6ZD7z9vFN for ; Mon, 19 Apr 2021 18:01:14 +1000 (AEST) Received: by mail-vk1-xa3b.google.com with SMTP id s75-20020a1f454e0000b02901e1192c9351sf3826614vka.8 for ; Mon, 19 Apr 2021 01:01:14 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1618819271; cv=pass; d=google.com; s=arc-20160816; b=gcc25OWCWor3tukZHQpeYzlp+aBJOK8Y3JlNN115xfD0iIeP/BqwYBUw1H5valPdqR OYoTOIJQBJM/mpaDgC3F6/SeAR3gVYL3caQSIQ4IFqtI27I093QHWcF6/9VnBklGw8af kp5sU/M32gZEqsZEDnbcB6FI293750Qb3FV+aAaJ9yT0Y3mug7yk02KEWfkW5Rfijdsv O4VNn+cDI4Wo7KvXHCyJvTStmfBRThFbaX29/WRO0QfitvYRIXhXUkBkz85qw8uTpQru 1jHHXhOO2mvIo+aY5dXUzwE7IdPErxyJ5H9X8PtWYaWX32WBWrNlp/LcxViM6xyYl+4Y gYsw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from:sender :dkim-signature; bh=2BS8RGIcdJG5edmHIXacxLGujgRG2GCPpHI2rWypEPE=; b=gG+usGBPzpLwPfFn2GnGPP40VV+9FkC/Mt9YZkoIJMS/NwU/r58vzEhuvObSVWp9rZ Qhq37CjHpOythSsvilFFcycc1bbdIkxmyuvmwe/BfxWIxBKOZ8C4DLR2wddvTHqArOLe Pgzhwe/wYtJZNsIE9Rkm2+R6+DU+qVmc/0IU600rgI7Wz2dqkVPnjy31Gx1dkObHyr2Q XZ+QqCcFXaDFxvho9xNV3vR/6wWaAlNaigNhLcFeYq81gM6fwRcoprgZlymykR0HI5Ki sUz8eM4osgOZ7HMv6Rw196DHz/jMP9xIle1LERilrfrrDF9AyeG66ujRC8bXhXN3KfNt C5IQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of dominique.martinet@atmark-techno.com designates 13.115.124.170 as permitted sender) smtp.mailfrom=dominique.martinet@atmark-techno.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-subscribe:list-unsubscribe; bh=2BS8RGIcdJG5edmHIXacxLGujgRG2GCPpHI2rWypEPE=; b=ramHs/tjuNCp8M9+jTN2hIUJjonSRY7QMYrvNhPGqQ6by5yCOeRHMtfS7NPPuh1Sdc d2ccuUhRGUUh6Z6DmQAB4Bp55OmxqYgiAtJ3e8Vr3K5eNBqVSviC7Vdh1ogty1VBMtyk 61gefyLoDX7TT2eJL4jvQh6ZuYSjnOxmdEj7gZJo2hY//0Y3zYwyOwk4n1rjMAUg/qLh t8fT3OHWCfJTqjb5Mg86q3SjAy3uHpi7gGiz08DhAHhXiXeLhW+e1wplUS9m5SIfx/J7 bZ4BxmQYBps2hW2CuliJhan116o50a1uaE/uWRYRXOeiwPcW1ABr189QlB1bhmunOXr0 TngQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=2BS8RGIcdJG5edmHIXacxLGujgRG2GCPpHI2rWypEPE=; b=kgq8uIz7880tbCl0h0jHCqFJbILJe4KqYV9kZ32ira8o9XwO7gMi1JPMfzQUitGrcj SiCM3wXEk2zHh1H/GK6QN7pyH+aX6uxgCt1If2oCcqFarelJCj0UV0ZGZ6N3t6HFyBNd 0f2OSrVxVCaowHKQFifdW9PJQMwg0VzRkRpJqWdONcdH9XHUasRc+Ph6MYKEm91hohK9 9Easwk8G1q5XULJhqnyIVtZVb+5uZX/LktlTuujavUQCM9Ii3V3alvU9aj4hYHst9YTR H4Zl6iTz3JH/quzI43bv3cfDzXfggA1k3AdFovEBKZk1AJI7LZSKWNOIv/QoweQgkWLz 0tOg== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM532rOJqJp0BP3nRrbLiEt08haViYsORpWolSpwhkKXv6i3/DBaVO zH0C+2e7AZ/CvaUwdtzESRI= X-Google-Smtp-Source: ABdhPJxVL0IxA2S56gAT6w2lIJGWbCVUrklFirstzhP8kFpbcaCvfu5c4+9XP4IndduavPuAqMaOWQ== X-Received: by 2002:a67:e1c6:: with SMTP id p6mr13829475vsl.39.1618819271593; Mon, 19 Apr 2021 01:01:11 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:6102:d1:: with SMTP id u17ls272781vsp.3.gmail; Mon, 19 Apr 2021 01:01:11 -0700 (PDT) X-Received: by 2002:a67:d002:: with SMTP id r2mr13706738vsi.45.1618819271037; Mon, 19 Apr 2021 01:01:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618819271; cv=none; d=google.com; s=arc-20160816; b=bW7QI31iYz7f3FEEZkk9TKTbgMDP6am0MKAqHnB3U/44rrYAmvzm0Jg4pzo+F3f9qH 9loBTN+vlav1pAcsLPPRSkTCsNb0ZRRyFs6knhgKZKWeKXxD3UVgShuF+riKJuy9wDBM Lu22pm0ZCVsXIO7smZVOBomfxA0vu9gMWNjK7Aqf909sQHEpY0uT2Jf2d6ygFYR5zkQD TIZBHnv425+LO59ug8sGOHn+HuZi73wna2IrRTSa9vCKY51ml1RGLXJKG+YYJ1EIT2EF mTEGCfu+kp0Ar/5jbU2IFgjbpL5J520KhOOPLL7NrWhXqNe1+MblYr2mv1NQp9UGcblq HU4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from; bh=iHnshTPokcvoNTypvJE0bJJhHvPSRrLXYlZLDjcXowY=; b=wVx14/NI/OZcSEvLMdOqknWMV+SzvCnXVTu2AvPJrKZ6PV3fkwJI9jrize3M9JKAMW qHaEH31hLf44w5SyBPfYZgSV1ZE8BhYK8SDUpoW0F8YUHGQlrStC53OvPj8iuWXaxF70 KG7kgGakUfW527KZIqV5eTYlzZr35ywExcKPLEOu1SZKD4X4VMAJwbZPJFnlpCPfq53l 218x7rxFuRdMr6DGm9iTwmDybvkITlUeZ4qE0IbBZqnbNgJVR6cewEvEQOsMhh2F8CzJ xA8fQTYILYNgRI+d6npFkT3/89y+OyVH/ID/90OMYcZ3AIDfm3FAtYS2hd/e17APUpmx hwbA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of dominique.martinet@atmark-techno.com designates 13.115.124.170 as permitted sender) smtp.mailfrom=dominique.martinet@atmark-techno.com Received: from gw.atmark-techno.com (gw.atmark-techno.com. [13.115.124.170]) by gmr-mx.google.com with ESMTP id 27si526904vke.1.2021.04.19.01.01.10 for ; Mon, 19 Apr 2021 01:01:10 -0700 (PDT) Received-SPF: pass (google.com: domain of dominique.martinet@atmark-techno.com designates 13.115.124.170 as permitted sender) client-ip=13.115.124.170; Received: from gw.atmark-techno.com (localhost [127.0.0.1]) by gw.atmark-techno.com (Postfix) with ESMTP id 02ACF80463 for ; Mon, 19 Apr 2021 17:01:09 +0900 (JST) Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) by gw.atmark-techno.com (Postfix) with ESMTPS id B0A1180463 for ; Mon, 19 Apr 2021 17:01:08 +0900 (JST) Received: by mail-pl1-f197.google.com with SMTP id t6-20020a170902a5c6b02900e8dfb1a5d7so13556299plq.3 for ; Mon, 19 Apr 2021 01:01:08 -0700 (PDT) X-Received: by 2002:a62:9a11:0:b029:25c:908b:5284 with SMTP id o17-20020a629a110000b029025c908b5284mr8537633pfe.6.1618819267829; Mon, 19 Apr 2021 01:01:07 -0700 (PDT) X-Received: by 2002:a62:9a11:0:b029:25c:908b:5284 with SMTP id o17-20020a629a110000b029025c908b5284mr8537616pfe.6.1618819267529; Mon, 19 Apr 2021 01:01:07 -0700 (PDT) Received: from pc-0115 (178.101.200.35.bc.googleusercontent.com. [35.200.101.178]) by smtp.gmail.com with ESMTPSA id r5sm13707170pjd.38.2021.04.19.01.01.06 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Apr 2021 01:01:07 -0700 (PDT) Received: from martinet by pc-0115 with local (Exim 4.94) (envelope-from ) id 1lYOq9-0023iu-OL; Mon, 19 Apr 2021 17:01:05 +0900 From: Dominique Martinet To: swupdate@googlegroups.com Cc: Dominique Martinet Subject: [swupdate] [PATCH] kbuild: respect pkg-config-provided lua -L flags Date: Mon, 19 Apr 2021 17:01:00 +0900 Message-Id: <20210419080100.490921-1-dominique.martinet@atmark-techno.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Original-Sender: dominique.martinet@atmark-techno.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of dominique.martinet@atmark-techno.com designates 13.115.124.170 as permitted sender) smtp.mailfrom=dominique.martinet@atmark-techno.com Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , - KBUILD_LIBS was set but unused - (pkg-config)_LIBS was also unused, replace it to get only the -L flags - remember the -L flags in EXTRA_LDFLAGS - also pass EXTRA_LDFLAGS to tests so they can find the lib too Signed-off-by: Dominique Martinet --- I struggled a bit trying to build swupdate with a different version of lua on alpine linux, because they keep the name lua.so while putting it in a different directory: /usr/lib/ ├── lua5.3 │   ├── liblua-5.3.so.0 -> liblua-5.3.so.0.0.0 │   ├── liblua-5.3.so.0.0.0 │   ├── liblua.a │   └── liblua.so -> liblua-5.3.so.0.0.0 ├── pkgconfig │   └── lua5.3.pc │ ... ├── liblua-5.3.so.0 -> lua5.3/liblua-5.3.so.0 └── liblua-5.3.so.0.0.0 -> lua5.3/liblua-5.3.so.0.0.0 linking with -L/usr/lib/lua5.3 -llua, and having various step of failures where the linker could not find liblua.so (building or tests) I no longer require to build with a different lua so don't really care about this patch, but since I struggled a bit figured it might be best to send in case others need it. It hopefully shouldn't do any harm anyway.. I think! Makefile | 2 +- Makefile.flags | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index cc1545222582..9e9aa79cda96 100644 --- a/Makefile +++ b/Makefile @@ -488,7 +488,7 @@ acceptance-tests: swupdate ${tools-bins} FORCE PHONY += test test: - $(Q)$(MAKE) $(build)=test SWOBJS="$(swupdate-objs)" SWLIBS="$(swupdate-libs) ${swupdate-ipc-lib}" LDLIBS="$(LDLIBS)" tests + $(Q)$(MAKE) $(build)=test SWOBJS="$(swupdate-objs)" SWLIBS="$(swupdate-libs) ${swupdate-ipc-lib}" EXTRA_LDFLAGS="$(EXTRA_LDFLAGS)" LDLIBS="$(LDLIBS)" tests # The actual objects are generated when descending, # make sure no implicit rule kicks in diff --git a/Makefile.flags b/Makefile.flags index 7003af14d767..efe26c6ce35d 100644 --- a/Makefile.flags +++ b/Makefile.flags @@ -85,7 +85,7 @@ endif # Usage: $(eval $(call pkg_check_modules,VARIABLE-PREFIX,MODULES)) define pkg_check_modules $(1)_CFLAGS := $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --cflags $(2)) -$(1)_LIBS := $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --libs $(2)) +$(1)_LDFLAGS := $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --libs-only-L $(2)) $(1)_LDLIBS := $(patsubst -l%,%,$(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --libs-only-l $(2))) endef @@ -108,7 +108,7 @@ ifneq ($(CONFIG_LUA),) LDFLAGS_swupdate += -Wl,-E $(eval $(call pkg_check_modules, LUABUILD, ${CONFIG_LUAPKG})) KBUILD_CFLAGS += $(LUABUILD_CFLAGS) -KBUILD_LIBS += $(LUABUILD_LIBS) +EXTRA_LDFLAGS += $(LUABUILD_LDFLAGS) LDLIBS += $(LUABUILD_LDLIBS) LUAVER := $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --modversion ${CONFIG_LUAPKG} | cut -d'.' -f1,2) endif