Re: [PR PATCH] [Updated] libtool: respect environment variables

[voidlinux-github@inbox.vuxu.org]

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

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

https://github.com/jnbr/void-packages libtool
https://github.com/void-linux/void-packages/pull/15867

libtool: respect environment variables
The /usr/bin/libtool script used to use cross tool-chains, when it was cross compiled.
This broke cross-built libtool for native builds and was changed in
653f4339274d162109af27c93a741264460f2da4 to native tool-chains.
Setting native tool-chains in libtools causes cross-builds which use libtool to fail.

Thus, change /usr/bin/libtool to use environment variables when defined and fall back to the native tool-chain otherwise.

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

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

From 6d3b34d107d4df69850687a600a863c2718cc100 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Mon, 28 Oct 2019 20:33:14 +0100
Subject: [PATCH] libtool: respect environment variables

The /usr/bin/libtool script used to use cross tool-chains,
when it was cross compiled.
This broke cross-built libtool for native builds and was changed in
653f4339274d162109af27c93a741264460f2da4 to native tool-chains.
Setting native tool-chains in libtools causes cross-builds which use
libtool to fail.

Thus, change /usr/bin/libtool to use environment variables when defined
and fall back to the native tool-chain otherwise.
---
 srcpkgs/libtool/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libtool/template b/srcpkgs/libtool/template
index 0624dd875de..05d86b853ca 100644
--- a/srcpkgs/libtool/template
+++ b/srcpkgs/libtool/template
@@ -1,13 +1,13 @@
 # Template file for 'libtool'
 pkgname=libtool
 version=2.4.6
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="perl automake help2man"
 depends="tar sed"
 short_desc="Generic library support script"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://www.gnu.org/software/libtool"
 distfiles="${GNU_SITE}/libtool/$pkgname-$version.tar.xz"
 checksum=7c87a8c2c8c0fc9cd5019e402bed4292462d00a718a7cd5f11218153bf28b26f
@@ -28,8 +28,8 @@ post_install() {
 	# things that need to go; the target libtool script is meant to be used
 	# in native environments, not in cross environments, so patch the script
 	if [ "$CROSS_BUILD" ]; then
-		# e.g. AR="armv7l-linux-gnueabihf-ar" becomes AR="ar"
-		vsed -i -e "s,=\"${XBPS_CROSS_TRIPLET}\-,=\",g" \
+		# e.g. AR="armv7l-linux-gnueabihf-ar" becomes AR="${AR:=ar}"
+		vsed -i -e "s,\([A-Z]\+\)=\"${XBPS_CROSS_TRIPLET}\-\(.*\)\",\1=\$\{\1:=\2\},g" \
 		 ${PKGDESTDIR}/usr/bin/libtool
 
 		# clear out any sysroot present