From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 11 Jan 2023 11:19:37 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1pFYCo-008j6o-6F for lore@lore.pengutronix.de; Wed, 11 Jan 2023 11:19:37 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1pFYCm-00050m-ST; Wed, 11 Jan 2023 11:19:36 +0100 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1pFYCY-0004td-P5; Wed, 11 Jan 2023 11:19:22 +0100 From: Philipp Zabel To: ptxdist@pengutronix.de Date: Wed, 11 Jan 2023 11:19:16 +0100 Message-Id: <20230111101916.3749538-2-p.zabel@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230111101916.3749538-1-p.zabel@pengutronix.de> References: <20230111101916.3749538-1-p.zabel@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [ptxdist] [PATCH 2/2] pre/Rules.make: let Meson generate relocatable .pc files X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Philipp Zabel Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Set the pkgconfig.relocatable option to let Meson generate .pc files that set a relative prefix, allowing installation at an arbitrary path. This removes the need to mangle the prefix setting after the fact via scripts/lib/ptxd_make_world_install_mangle_pc.awk for Meson based packages. Signed-off-by: Philipp Zabel --- rules/pre/Rules.make | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/pre/Rules.make b/rules/pre/Rules.make index 46f6f872e360..cb3e82804538 100644 --- a/rules/pre/Rules.make +++ b/rules/pre/Rules.make @@ -258,6 +258,7 @@ CROSS_MESON_USR := \ -Dbackend=ninja \ -Dbuildtype=debugoptimized \ -Dlibdir=$(CROSS_LIB_DIR) \ + -Dpkgconfig.relocatable=true \ -Dprefix=/usr CROSS_MESON_ENV = \ -- 2.30.2