aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2018-08-10 23:46:32 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2018-08-11 12:35:15 +0200
commit98e3c1eee505b6c92c75daa1772ba543936b099f (patch)
treeb5c6c68adddcfea2fddc2a73545e5e608740d647
parentc4f18dd3c8664bb6715122c62a32e3b4388fa34e (diff)
downloadbuildroot-98e3c1eee505b6c92c75daa1772ba543936b099f.tar.gz
buildroot-98e3c1eee505b6c92c75daa1772ba543936b099f.tar.bz2
mesa3d-headers: fix logic to generate the dri.pc file
As noted by Arnout in [1], the logic in mesa3d-headers.mk generates a bogus dri.pc file, which looks like this: prefix=/usr exec_prefix=/usr libdir=/lib includedir=/include dridriverdir=/dri Indeed, the ${...} are expanded as shell variables when the sed command is executed, while the intention is that those ${...} should go in the .pc file. By escaping those using $${...}, we get the expected .pc file: prefix=/usr exec_prefix=/usr libdir=${exec_prefix}/lib includedir=${prefix}/include dridriverdir=${libdir}/dri This was detected by the not yet committed check-package improvement from Ricardo that detects bogus ${...} usage to reference make variables. [1] http://lists.busybox.net/pipermail/buildroot/2018-July/225402.html Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-rw-r--r--package/mesa3d-headers/mesa3d-headers.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk
index de8a9dc7cf..fc88f0ed60 100644
--- a/package/mesa3d-headers/mesa3d-headers.mk
+++ b/package/mesa3d-headers/mesa3d-headers.mk
@@ -35,9 +35,9 @@ ifeq ($(BR2_PACKAGE_XORG7),y)
# contains -i.
define MESA3D_HEADERS_BUILD_DRI_PC
sed -e 's:@\(exec_\)\?prefix@:/usr:' \
- -e 's:@libdir@:${exec_prefix}/lib:' \
- -e 's:@includedir@:${prefix}/include:' \
- -e 's:@DRI_DRIVER_INSTALL_DIR@:${libdir}/dri:' \
+ -e 's:@libdir@:$${exec_prefix}/lib:' \
+ -e 's:@includedir@:$${prefix}/include:' \
+ -e 's:@DRI_DRIVER_INSTALL_DIR@:$${libdir}/dri:' \
-e 's:@VERSION@:$(MESA3D_HEADERS_VERSION):' \
-e 's:@DRI_PC_REQ_PRIV@::' \
$(@D)/src/mesa/drivers/dri/dri.pc.in \