Re: [PR PATCH] [Updated] libjpeg-turbo: ensure that libjpeg-turboTargets-none.cmake is relocatable

[Johnnynator <Johnnynator@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 524 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages libjpegturbo
https://github.com/void-linux/void-packages/pull/46644

libjpeg-turbo: ensure that libjpeg-turboTargets-none.cmake is relocatable
specifying the full path in INSTALL_LIBDIR will result in it being
hardcoded in the Targets-none.cmake instead of being repalce with
_IMPORT_PREFIX


A patch file from https://github.com/void-linux/void-packages/pull/46644.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libjpegturbo-46644.patch --]
[-- Type: text/x-diff, Size: 4732 bytes --]

From d957807a01c22fcaac1e7fb90abd64da6b26ec0e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Oct 2023 17:11:08 +0200
Subject: [PATCH 1/4] build-style/cmake.sh: specify paths as type PATH

specifying the type prevents cmake to converthing the paths
relative to the CWD

cmake documentation:

Furthermore, if the <type> is PATH or FILEPATH and the <value> provided
on the command line is a relative path, then the set command will treat
the path as relative to the current working directory and convert it to an absolute path.
---
 common/build-style/cmake.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index 36331635ddd62..5760f73dbc842 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -52,10 +52,10 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 _EOF
 		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=${wrksrc}/${build_wrksrc}/${cmake_builddir}/cross_${XBPS_CROSS_TRIPLET}.cmake"
 	fi
-	cmake_args+=" -DCMAKE_INSTALL_PREFIX=/usr"
+	cmake_args+=" -DCMAKE_INSTALL_PREFIX:PATH=/usr"
 	cmake_args+=" -DCMAKE_BUILD_TYPE=None"
-	cmake_args+=" -DCMAKE_INSTALL_LIBDIR=lib${XBPS_TARGET_WORDSIZE}"
-	cmake_args+=" -DCMAKE_INSTALL_SYSCONFDIR=/etc"
+	cmake_args+=" -DCMAKE_INSTALL_LIBDIR:PATH=lib${XBPS_TARGET_WORDSIZE}"
+	cmake_args+=" -DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc"
 
 	if [ "$CROSS_BUILD" ]; then
 		cmake_args+=" -DQT_HOST_PATH=/usr"
@@ -69,7 +69,7 @@ _EOF
 			>> cross_${XBPS_CROSS_TRIPLET}.cmake
 	fi
 
-	cmake_args+=" -DCMAKE_INSTALL_SBINDIR=bin"
+	cmake_args+=" -DCMAKE_INSTALL_SBINDIR:PATH=bin"
 
 	export CMAKE_GENERATOR="${CMAKE_GENERATOR:-Ninja}"
 	# Remove -pipe: https://gitlab.kitware.com/cmake/cmake/issues/19590

From 964912caedccc39b17675ff27091b56862c90e3e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Oct 2023 17:33:41 +0200
Subject: [PATCH 2/4] VirtualGL: remove CMAKE_INSTALL_LIBDIR in configure_args

---
 srcpkgs/VirtualGL/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/VirtualGL/template b/srcpkgs/VirtualGL/template
index 6ac27808d3e58..6b131db5a81bf 100644
--- a/srcpkgs/VirtualGL/template
+++ b/srcpkgs/VirtualGL/template
@@ -4,7 +4,7 @@ version=2.6.2
 revision=4
 build_style=cmake
 configure_args="-DTJPEG_INCLUDE_DIR=/usr/include -DVGL_SYSTEMGLX=ON
- -DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DCMAKE_INSTALL_LIBDIR=/usr/lib
+ -DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so
  -DVGL_SYSTEMFLTK=ON -DVGL_USESSL=ON"
 makedepends="libXv-devel glu-devel libjpeg-turbo-devel MesaLib-devel
  libXtst-devel fltk-devel openssl-devel"

From bb0216210e4e24efaedaf8a115d969eccf875065 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Oct 2023 17:33:55 +0200
Subject: [PATCH 3/4] kodi-platform: remove CMAKE_INSTALL_LIBDIR in
 configure_args

---
 srcpkgs/kodi-platform/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/kodi-platform/template b/srcpkgs/kodi-platform/template
index bff2dead134df..27c1ade412b10 100644
--- a/srcpkgs/kodi-platform/template
+++ b/srcpkgs/kodi-platform/template
@@ -3,7 +3,6 @@ pkgname=kodi-platform
 version=20180302
 revision=1
 build_style=cmake
-configure_args="-DCMAKE_INSTALL_LIBDIR=/usr/lib"
 makedepends="kodi-devel tinyxml-devel p8-platform-devel"
 short_desc="Kodi platform support library"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -13,7 +12,7 @@ distfiles="https://github.com/xbmc/kodi-platform/archive/kodiplatform-${version}
 checksum=1d8ddbe444bd42f4b6f2babb9f78d6c1e152d828eff90b07308febf883c05b38
 
 if [ -n "${CROSS_BUILD}" ]; then
-	configure_args+=" -DCMAKE_MODULE_PATH=${XBPS_CROSS_BASE}/usr/share/kodi/cmake"
+	configure_args="-DCMAKE_MODULE_PATH=${XBPS_CROSS_BASE}/usr/share/kodi/cmake"
 fi
 
 kodi-platform-devel_package() {

From a2daee2e0b5ee0338202d0ff82a01ddcc9bbd4cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Oct 2023 17:34:09 +0200
Subject: [PATCH 4/4] libjpeg-turbo: remove CMAKE_INSTALL_LIBDIR in
 configure_args

---
 srcpkgs/libjpeg-turbo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libjpeg-turbo/template b/srcpkgs/libjpeg-turbo/template
index 3c73aeb9b89f2..a04ec69c30aa6 100644
--- a/srcpkgs/libjpeg-turbo/template
+++ b/srcpkgs/libjpeg-turbo/template
@@ -1,9 +1,9 @@
 # Template file for 'libjpeg-turbo'
 pkgname=libjpeg-turbo
 version=2.1.5.1
-revision=1
+revision=2
 build_style=cmake
-configure_args="-DWITH_JPEG8=1 -DCMAKE_INSTALL_LIBDIR=/usr/lib"
+configure_args="-DWITH_JPEG8=1"
 hostmakedepends="yasm"
 short_desc="Derivative of libjpeg which uses SIMD instructions"
 maintainer="Orphaned <orphan@voidlinux.org>"