mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Philipp Zabel <p.zabel@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Subject: [ptxdist] [PATCH 3/3] mesalib: read libgallium version from VERSION file
Date: Thu, 15 Aug 2024 13:56:15 +0200	[thread overview]
Message-ID: <20240815115615.2745801-3-p.zabel@pengutronix.de> (raw)
In-Reply-To: <20240815115615.2745801-1-p.zabel@pengutronix.de>

Use the version from the VERSION file to determine the libgallium file
name. Fall back to using MESALIB_VERSION if the sources are not present.

When building from git, the VERSION file may contain a version in the
form 24.3.0-devel, which is likely different from MESALIB_VERSION. The
build system determines the libgallium file name from the VERSION file,
so we should do the same.

This fixes targetinstall for git builds, e.g. when using local-src. For
release tarballs, the VERSION file content and MESALIB_VERSION are
identical.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/mesalib.make | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/rules/mesalib.make b/rules/mesalib.make
index c62a0802f0a0..ca1fc6b992b8 100644
--- a/rules/mesalib.make
+++ b/rules/mesalib.make
@@ -267,6 +267,10 @@ $(STATEDIR)/mesalib.compile:
 # Target-Install
 # ----------------------------------------------------------------------------
 
+# read libgallium version from file, fall back to package version
+MESALIB_LIBGALLIUM_VERSION := \
+	$(if $(wildcard $(MESALIB_DIR)/VERSION),$(file <$(MESALIB_DIR)/VERSION),$(MESALIB_VERSION))
+
 $(STATEDIR)/mesalib.targetinstall:
 	@$(call targetinfo)
 
@@ -277,7 +281,8 @@ $(STATEDIR)/mesalib.targetinstall:
 	@$(call install_fixup, mesalib,DESCRIPTION,missing)
 
 ifneq ($(strip $(MESALIB_DRI_GALLIUM_LIBS-y)),)
-	@$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/libgallium-$(MESALIB_VERSION).so)
+	@$(call install_copy, mesalib, 0, 0, 0644, -, \
+		/usr/lib/libgallium-$(MESALIB_LIBGALLIUM_VERSION).so)
 ifdef PTXCONF_MESALIB_EGL_X11
 	@$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/dri/libdril_dri.so)
 
-- 
2.39.2




  parent reply	other threads:[~2024-08-15 11:58 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-15 11:56 [ptxdist] [PATCH 1/3] mesalib: version bump 24.1.4 -> 24.2.0 Philipp Zabel
2024-08-15 11:56 ` [ptxdist] [PATCH 2/3] migrate: deconflate mesalib swrast/softpipe/lavapipe Philipp Zabel
2024-09-12 12:11   ` [ptxdist] [APPLIED] " Michael Olbrich
2024-08-15 11:56 ` Philipp Zabel [this message]
2024-09-12 12:11   ` [ptxdist] [APPLIED] mesalib: read libgallium version from VERSION file Michael Olbrich
2024-09-12 12:11 ` [ptxdist] [APPLIED] mesalib: version bump 24.1.4 -> 24.2.0 Michael Olbrich

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240815115615.2745801-3-p.zabel@pengutronix.de \
    --to=p.zabel@pengutronix.de \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox