[PR PATCH] libtool: fix include paths when cross compiling

[PR PATCH] libtool: fix include paths when cross compiling

[oreo639]

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

There is a new pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages libtool
https://github.com/void-linux/void-packages/pull/40606

libtool: fix include paths when cross compiling
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**

@dkwo Can you test this.

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From d4ae539ad82d6c9f25073c95e7ae82b00b823ed7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sat, 19 Nov 2022 00:10:05 -0800
Subject: [PATCH] libtool: fix include paths when cross compiling

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

diff --git a/srcpkgs/libtool/template b/srcpkgs/libtool/template
index fc5c53a9c3e9..f9a5e070fd8f 100644
--- a/srcpkgs/libtool/template
+++ b/srcpkgs/libtool/template
@@ -1,7 +1,7 @@
 # Template file for 'libtool'
 pkgname=libtool
 version=2.4.7
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="texinfo perl automake help2man xz"
 depends="tar sed"
@@ -42,7 +42,9 @@ post_install() {
 		 ${PKGDESTDIR}/usr/bin/libtool
 
 		# clear out sysroot include path
-		vsed -i -e "s,\-I${XBPS_CROSS_BASE}/usr/include,,g" \
+		vsed -i \
+		 -e "s,\-I${XBPS_CROSS_BASE}/usr/include,,g" \
+		 -e "s,/lib/gcc/${XBPS_CROSS_TRIPLET}/.*/../../../../${XBPS_CROSS_TRIPLET},,g" \
 		 ${PKGDESTDIR}/usr/bin/libtool
 
 		# canonicalize host_alias, replace build(_alias,_os)

Re: libtool: fix include paths when cross compiling

[dkwo]

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/40606#issuecomment-1320981346

Comment:
Thanks for looking into this. I've crossbuilt the package, I can install it on my aarch64 machine, but how do I make sure it is used in the build chroot when building ntl? I tried to build ntl in /tmp, but it fails before reaching that point.

Re: libtool: fix include paths when cross compiling

[dkwo]

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/40606#issuecomment-1320981405

Comment:
Thanks for looking into this. I've crossbuilt the package, I can install it on my aarch64 machine, but how do I make sure it is used in the build chroot when building ntl? I tried to build ntl in /tmp, but it fails before reaching that point.

Re: libtool: fix include paths when cross compiling

[dkwo]

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/40606#issuecomment-1320981405

Comment:
Thanks for looking into this. I've crossbuilt the package, I can install it on my aarch64 machine, but how do I make sure it is used in the build chroot when building ntl? I tried to build ntl in /tmp, but it fails before reaching that point.

Re: libtool: fix include paths when cross compiling

[oreo639]

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/40606#issuecomment-1320983207

Comment:
You can build libtool as cross, then build it as native, then replace the native package with the cross package in your `hostdir/binpkgs` and then try building ntl.

Re: libtool: fix include paths when cross compiling

[oreo639]

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/40606#issuecomment-1320983207

Comment:
You can build libtool as cross, then build it as native, then replace the native package with the cross package in your `hostdir/binpkgs` and then try building ntl.

Also if you can share the native-build package here for comparison, that would be appreciated.

Re: libtool: fix include paths when cross compiling

[dkwo]

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/40606#issuecomment-1321149238

Comment:
Sure, will do it tomorrow.

Re: libtool: fix include paths when cross compiling

[paper42]

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/40606#issuecomment-1321210659

Comment:
native builds for aarch64-musl: https://vasilek.cz/repo/libtool/

Re: libtool: fix include paths when cross compiling

[oreo639]

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/40606#issuecomment-1321234625

Comment:
Thank you.

Re: [PR PATCH] [Updated] libtool: fix include paths when cross compiling

[oreo639]

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

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

https://github.com/oreo639/void-packages libtool
https://github.com/void-linux/void-packages/pull/40606

libtool: fix include paths when cross compiling
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**

@dkwo Can you test this? (whenever you are available ofc)

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 8a3715d755a93825a9d8f1902d3b4b44c21c4dfd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sat, 19 Nov 2022 00:10:05 -0800
Subject: [PATCH] libtool: fix include paths when cross compiling

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

diff --git a/srcpkgs/libtool/template b/srcpkgs/libtool/template
index fc5c53a9c3e9..0f68749c3b2b 100644
--- a/srcpkgs/libtool/template
+++ b/srcpkgs/libtool/template
@@ -1,7 +1,7 @@
 # Template file for 'libtool'
 pkgname=libtool
 version=2.4.7
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="texinfo perl automake help2man xz"
 depends="tar sed"
@@ -42,7 +42,9 @@ post_install() {
 		 ${PKGDESTDIR}/usr/bin/libtool
 
 		# clear out sysroot include path
-		vsed -i -e "s,\-I${XBPS_CROSS_BASE}/usr/include,,g" \
+		vsed -i \
+		 -e "s,\-I${XBPS_CROSS_BASE}/usr/include,,g" \
+		 -e "s,${XBPS_CROSS_TRIPLET}/lib/../,,g" \
 		 ${PKGDESTDIR}/usr/bin/libtool
 
 		# canonicalize host_alias, replace build(_alias,_os)

Re: [PR PATCH] [Updated] libtool: fix include paths when cross compiling

[oreo639]

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

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

https://github.com/oreo639/void-packages libtool
https://github.com/void-linux/void-packages/pull/40606

libtool: fix include paths when cross compiling
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**

@dkwo Can you test this? (whenever you are available ofc)

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 2088d9c05559225affd321fd7a004bcb0c0d4c77 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sat, 19 Nov 2022 00:10:05 -0800
Subject: [PATCH] libtool: fix include paths when cross compiling

---
 srcpkgs/libtool/template | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libtool/template b/srcpkgs/libtool/template
index fc5c53a9c3e9..15aaaed77826 100644
--- a/srcpkgs/libtool/template
+++ b/srcpkgs/libtool/template
@@ -1,7 +1,7 @@
 # Template file for 'libtool'
 pkgname=libtool
 version=2.4.7
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="texinfo perl automake help2man xz"
 depends="tar sed"
@@ -45,6 +45,18 @@ post_install() {
 		vsed -i -e "s,\-I${XBPS_CROSS_BASE}/usr/include,,g" \
 		 ${PKGDESTDIR}/usr/bin/libtool
 
+		if [ "$XBPS_TARGET_WORDSIZE" = "64" ]; then
+			vsed -i \
+			 -e "s,/${XBPS_CROSS_TRIPLET}/lib/../lib64,/lib64,g" \
+			 -e "s,/${XBPS_CROSS_TRIPLET}/usr/lib/../lib64,/usr/lib64,g" \
+			 ${PKGDESTDIR}/usr/bin/libtool
+		else
+			vsed -i \
+			 -e "s,/${XBPS_CROSS_TRIPLET}/lib,/lib,g" \
+			 -e "s,/${XBPS_CROSS_TRIPLET}/usr/lib,/usr/lib,g" \
+			 ${PKGDESTDIR}/usr/bin/libtool
+		fi
+
 		# canonicalize host_alias, replace build(_alias,_os)
 		_canonical_host=$(grep "^host=" ${PKGDESTDIR}/usr/bin/libtool | sed 's/host=//')
 		_host_os=$(grep "^host_os=" ${PKGDESTDIR}/usr/bin/libtool | sed 's/host_os=//')

Re: libtool: fix include paths when cross compiling

[oreo639]

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/40606#issuecomment-1320983207

Comment:
You can build libtool as cross, then build it as native, then replace the native package with the cross package in your `hostdir/binpkgs` and then try building ntl.

Also if you can share the native-build package here for comparison, that would be appreciated.

(You can also use `xbps-rindex`)

Re: libtool: fix include paths when cross compiling

[dkwo]

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/40606#issuecomment-1322251241

Comment:
> You can build libtool as cross, then build it as native, then replace the native package with the cross package in your `hostdir/binpkgs` and then try building ntl.

if I do that, it gives
`ERROR: libtool-2.4.7_2: SHA256 hash is not valid: Numerical result out of range`
Do you know how to fix this?

Re: libtool: fix include paths when cross compiling

[oreo639]

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/40606#issuecomment-1322404587

Comment:
You need to do `xbps-rindex -fa libtool-2.4.7_1.<arch>.xbps libltdl-2.4.7_1.<arch>.xbps libltdl-devel-2.4.7_1.<arch>.xbps`

Re: libtool: fix include paths when cross compiling

[oreo639]

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/40606#issuecomment-1322404587

Comment:
You need to do `xbps-rindex -fa libtool-2.4.7_1.<arch>.xbps libltdl-2.4.7_1.<arch>.xbps libltdl-devel-2.4.7_1.<arch>.xbps`
(Also make sure you copied libltdl and libltdl-devel)

Re: libtool: fix include paths when cross compiling

[dkwo]

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/40606#issuecomment-1322483013

Comment:
Thanks, now it errors out in a different way: https://paste.c-net.org/WedgedMopping

Re: libtool: fix include paths when cross compiling

[oreo639]

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/40606#issuecomment-1322484282

Comment:
Is this from the latest version of the branch, just checking?

Re: libtool: fix include paths when cross compiling

[dkwo]

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/40606#issuecomment-1322486302

Comment:
yes, it is.

Re: libtool: fix include paths when cross compiling

[dkwo]

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/40606#issuecomment-1419693604

Comment:
Shall we try the approach suggesged by @paper42 in https://github.com/void-linux/void-packages/issues/40980 at least for now?

Re: libtool: fix include paths when cross compiling

[dkwo]

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/40606#issuecomment-1419693604

Comment:
Shall we try the approach suggested by @paper42 in https://github.com/void-linux/void-packages/issues/40980 at least for now?

Re: libtool: fix include paths when cross compiling

[paper42]

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/40606#issuecomment-1419696440

Comment:
> Shall we try the approach suggested by @paper42 in https://github.com/void-linux/void-packages/issues/40980 at least for now?

no, that's a hack that needs modifying xbps-src

Re: [PR PATCH] [Updated] libtool: fix include paths when cross compiling

[oreo639]

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

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

https://github.com/oreo639/void-packages libtool
https://github.com/void-linux/void-packages/pull/40606

libtool: fix include paths when cross compiling
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**

@dkwo Can you test this? (whenever you are available ofc)

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From bd9a806b7176f10062e933b7d7b3e03b2d4d51c5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 14 Feb 2023 18:36:41 -0800
Subject: [PATCH] libtool: fix include paths when cross compiling

---
 srcpkgs/libtool/template | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libtool/template b/srcpkgs/libtool/template
index cd7c684c5945..1eed269c0051 100644
--- a/srcpkgs/libtool/template
+++ b/srcpkgs/libtool/template
@@ -1,7 +1,7 @@
 # Template file for 'libtool'
 pkgname=libtool
 version=2.4.7
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="texinfo perl automake help2man xz gnulib tar"
 depends="tar sed grep"
@@ -50,6 +50,26 @@ post_install() {
 		vsed -i -e "s,\-I${XBPS_CROSS_BASE}/usr/include,,g" \
 		 ${PKGDESTDIR}/usr/bin/libtool
 
+		vsed -i -e "s,${XBPS_CROSS_BASE},,g" \
+		 ${PKGDESTDIR}/usr/bin/libtool
+
+		vsed -i -e 's/^\(predep_objects\)=.*/\1=""/' \
+		 -e 's/^\(postdep_objects\)=.*/\1=""/' \
+		 -e 's/^\(compiler_lib_search_path\)=.*/\1=""/' \
+		 ${PKGDESTDIR}/usr/bin/libtool
+
+		if [ "$XBPS_TARGET_WORDSIZE" = "64" ]; then
+			vsed -i \
+			 -e "s,/${XBPS_CROSS_TRIPLET}/lib/../lib64,/lib64,g" \
+			 -e "s,/${XBPS_CROSS_TRIPLET}/usr/lib/../lib64,/usr/lib64,g" \
+			 ${PKGDESTDIR}/usr/bin/libtool
+		else
+			vsed -i \
+			 -e "s,/${XBPS_CROSS_TRIPLET}/lib,/lib,g" \
+			 -e "s,/${XBPS_CROSS_TRIPLET}/usr/lib,/usr/lib,g" \
+			 ${PKGDESTDIR}/usr/bin/libtool
+		fi
+
 		# canonicalize host_alias, replace build(_alias,_os)
 		_canonical_host=$(grep "^host=" ${PKGDESTDIR}/usr/bin/libtool | sed 's/host=//')
 		_host_os=$(grep "^host_os=" ${PKGDESTDIR}/usr/bin/libtool | sed 's/host_os=//')

Re: [PR PATCH] [Updated] libtool: fix include paths when cross compiling

[oreo639]

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

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

https://github.com/oreo639/void-packages libtool
https://github.com/void-linux/void-packages/pull/40606

libtool: fix include paths when cross compiling
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**

@dkwo Can you test this? (whenever you are available ofc)

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 3fdf0968ec4b0303771b91bb729825368813b00b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 14 Feb 2023 18:36:41 -0800
Subject: [PATCH] libtool: fix include paths when cross compiling

---
 srcpkgs/libtool/template | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libtool/template b/srcpkgs/libtool/template
index cd7c684c5945..9797c174eb3c 100644
--- a/srcpkgs/libtool/template
+++ b/srcpkgs/libtool/template
@@ -1,7 +1,7 @@
 # Template file for 'libtool'
 pkgname=libtool
 version=2.4.7
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="texinfo perl automake help2man xz gnulib tar"
 depends="tar sed grep"
@@ -50,6 +50,26 @@ post_install() {
 		vsed -i -e "s,\-I${XBPS_CROSS_BASE}/usr/include,,g" \
 		 ${PKGDESTDIR}/usr/bin/libtool
 
+		# Don't hardcode gcc object paths
+		vsed -i -e 's/^\(predep_objects\)=.*/\1=""/' \
+		 -e 's/^\(postdep_objects\)=.*/\1=""/' \
+		 -e 's/^\(compiler_lib_search_path\)=.*/\1=""/' \
+		 ${PKGDESTDIR}/usr/bin/libtool
+
+		# Strip cross sysroot from paths
+		vsed -i -e "s,${XBPS_CROSS_BASE},,g" \
+		 ${PKGDESTDIR}/usr/bin/libtool
+
+		if [ "$XBPS_TARGET_WORDSIZE" = "64" ]; then
+			vsed -i \
+			 -e "s,/${XBPS_CROSS_TRIPLET}/lib/../lib64,/lib64,g" \
+			 ${PKGDESTDIR}/usr/bin/libtool
+		else
+			vsed -i \
+			 -e "s,/${XBPS_CROSS_TRIPLET}/lib,/lib,g" \
+			 ${PKGDESTDIR}/usr/bin/libtool
+		fi
+
 		# canonicalize host_alias, replace build(_alias,_os)
 		_canonical_host=$(grep "^host=" ${PKGDESTDIR}/usr/bin/libtool | sed 's/host=//')
 		_host_os=$(grep "^host_os=" ${PKGDESTDIR}/usr/bin/libtool | sed 's/host_os=//')

Re: [PR PATCH] [Updated] libtool: fix include paths when cross compiling

[oreo639]

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

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

https://github.com/oreo639/void-packages libtool
https://github.com/void-linux/void-packages/pull/40606

libtool: fix include paths when cross compiling
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**

@dkwo Can you test this? (whenever you are available ofc)

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From f5e52bf81af3a0b5da730edd9a4331ed6b57d7b6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 14 Feb 2023 18:36:41 -0800
Subject: [PATCH] libtool: fix include paths when cross compiling

---
 srcpkgs/libtool/template | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libtool/template b/srcpkgs/libtool/template
index cd7c684c5945..d84dee88c5d8 100644
--- a/srcpkgs/libtool/template
+++ b/srcpkgs/libtool/template
@@ -1,7 +1,7 @@
 # Template file for 'libtool'
 pkgname=libtool
 version=2.4.7
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="texinfo perl automake help2man xz gnulib tar"
 depends="tar sed grep"
@@ -50,6 +50,25 @@ post_install() {
 		vsed -i -e "s,\-I${XBPS_CROSS_BASE}/usr/include,,g" \
 		 ${PKGDESTDIR}/usr/bin/libtool
 
+		# Don't hardcode gcc object paths
+		vsed -i -e 's/^\(predep_objects\)=.*/\1=""/' \
+		 -e 's/^\(postdep_objects\)=.*/\1=""/' \
+		 ${PKGDESTDIR}/usr/bin/libtool
+
+		# Strip cross sysroot from paths
+		vsed -i -e "s,${XBPS_CROSS_BASE},,g" \
+		 ${PKGDESTDIR}/usr/bin/libtool
+
+		if [ "$XBPS_TARGET_WORDSIZE" = "64" ]; then
+			vsed -i \
+			 -e "s,/${XBPS_CROSS_TRIPLET}/lib/../lib64,/lib64,g" \
+			 ${PKGDESTDIR}/usr/bin/libtool
+		else
+			vsed -i \
+			 -e "s,/${XBPS_CROSS_TRIPLET}/lib,/lib,g" \
+			 ${PKGDESTDIR}/usr/bin/libtool
+		fi
+
 		# canonicalize host_alias, replace build(_alias,_os)
 		_canonical_host=$(grep "^host=" ${PKGDESTDIR}/usr/bin/libtool | sed 's/host=//')
 		_host_os=$(grep "^host_os=" ${PKGDESTDIR}/usr/bin/libtool | sed 's/host_os=//')

Re: [PR PATCH] [Updated] libtool: fix include paths when cross compiling

[oreo639]

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

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

https://github.com/oreo639/void-packages libtool
https://github.com/void-linux/void-packages/pull/40606

libtool: fix include paths when cross compiling
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**

@dkwo Can you test this? (whenever you are available ofc)

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From aaf2d1487eb3503bcbc7e3915b105865362bef98 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 14 Feb 2023 18:36:41 -0800
Subject: [PATCH] libtool: fix include paths when cross compiling

---
 srcpkgs/libtool/template | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libtool/template b/srcpkgs/libtool/template
index cd7c684c5945..fa6691a4a444 100644
--- a/srcpkgs/libtool/template
+++ b/srcpkgs/libtool/template
@@ -1,7 +1,7 @@
 # Template file for 'libtool'
 pkgname=libtool
 version=2.4.7
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="texinfo perl automake help2man xz gnulib tar"
 depends="tar sed grep"
@@ -50,6 +50,27 @@ post_install() {
 		vsed -i -e "s,\-I${XBPS_CROSS_BASE}/usr/include,,g" \
 		 ${PKGDESTDIR}/usr/bin/libtool
 
+		# Don't hardcode gcc object paths
+		vsed -i -e 's/^\(predep_objects\)=.*/\1=""/' \
+		 -e 's/^\(postdep_objects\)=.*/\1=""/' \
+		 -e 's/^\(archive_cmds=\".*\) -nostdlib /\1 /' \
+		 -e 's/^\(archive_expsym_cmds=\".*\) -nostdlib /\1 /' \
+		 ${PKGDESTDIR}/usr/bin/libtool
+
+		# Strip cross sysroot from paths
+		vsed -i -e "s,${XBPS_CROSS_BASE},,g" \
+		 ${PKGDESTDIR}/usr/bin/libtool
+
+		if [ "$XBPS_TARGET_WORDSIZE" = "64" ]; then
+			vsed -i \
+			 -e "s,/${XBPS_CROSS_TRIPLET}/lib/../lib64,/lib64,g" \
+			 ${PKGDESTDIR}/usr/bin/libtool
+		else
+			vsed -i \
+			 -e "s,/${XBPS_CROSS_TRIPLET}/lib,/lib,g" \
+			 ${PKGDESTDIR}/usr/bin/libtool
+		fi
+
 		# canonicalize host_alias, replace build(_alias,_os)
 		_canonical_host=$(grep "^host=" ${PKGDESTDIR}/usr/bin/libtool | sed 's/host=//')
 		_host_os=$(grep "^host_os=" ${PKGDESTDIR}/usr/bin/libtool | sed 's/host_os=//')

Re: [PR PATCH] [Updated] libtool: fix include paths when cross compiling

[oreo639]

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

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

https://github.com/oreo639/void-packages libtool
https://github.com/void-linux/void-packages/pull/40606

libtool: fix include paths when cross compiling
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**

@dkwo Can you test this? (whenever you are available ofc)

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 78d1a790b7a46320cddd49d8a9b9c3f1eecb0906 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 14 Feb 2023 18:36:41 -0800
Subject: [PATCH] libtool: fix include paths when cross compiling

---
 srcpkgs/libtool/template | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libtool/template b/srcpkgs/libtool/template
index cd7c684c5945..6d9093511bb2 100644
--- a/srcpkgs/libtool/template
+++ b/srcpkgs/libtool/template
@@ -1,7 +1,7 @@
 # Template file for 'libtool'
 pkgname=libtool
 version=2.4.7
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="texinfo perl automake help2man xz gnulib tar"
 depends="tar sed grep"
@@ -24,7 +24,7 @@ post_extract() {
 do_configure() {
 	./bootstrap --force --no-git --skip-po \
 		--gnulib-srcdir=/usr/share/gnulib/ --copy
-	./configure ${configure_args} SED=/bin/sed GREP=/bin/grep
+	CXX="${XBPS_CROSS_TRIPLET}-g++" ./configure ${configure_args} SED=/bin/sed GREP=/bin/grep
 }
 
 post_install() {
@@ -39,7 +39,7 @@ post_install() {
 	# 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:=ar}"
-		vsed -i -e "s,\([A-Z]\+\)=\"${XBPS_CROSS_TRIPLET}\-\(.*\)\",\1=\$\{\1:=\2\},g" \
+		vsed -i -e "s,\([A-Z]\+\)=\"${XBPS_CROSS_TRIPLET}\-\(.*\)\",\1=\"\2\",g" \
 		 ${PKGDESTDIR}/usr/bin/libtool
 
 		# clear out any sysroot present
@@ -50,6 +50,20 @@ post_install() {
 		vsed -i -e "s,\-I${XBPS_CROSS_BASE}/usr/include,,g" \
 		 ${PKGDESTDIR}/usr/bin/libtool
 
+		# Strip cross sysroot from paths
+		vsed -i -e "s,${XBPS_CROSS_BASE},,g" \
+		 ${PKGDESTDIR}/usr/bin/libtool
+
+		if [ "$XBPS_TARGET_WORDSIZE" = "64" ]; then
+			vsed -i \
+			 -e "s,/${XBPS_CROSS_TRIPLET}/lib/../lib64,/lib64,g" \
+			 ${PKGDESTDIR}/usr/bin/libtool
+		else
+			vsed -i \
+			 -e "s,/${XBPS_CROSS_TRIPLET}/lib,/lib,g" \
+			 ${PKGDESTDIR}/usr/bin/libtool
+		fi
+
 		# canonicalize host_alias, replace build(_alias,_os)
 		_canonical_host=$(grep "^host=" ${PKGDESTDIR}/usr/bin/libtool | sed 's/host=//')
 		_host_os=$(grep "^host_os=" ${PKGDESTDIR}/usr/bin/libtool | sed 's/host_os=//')

Re: libtool: fix include paths when cross compiling

[oreo639]

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/40606#issuecomment-1430811971

Comment:
Alright, I think I see the issue.
`libtool: link: cc  -fPIC -DPIC -shared -nostdlib /usr/lib/../lib64/crti.o ...` is supposed to be `libtool: link: g++  -fPIC -DPIC -shared -nostdlib /usr/lib/../lib64/crti.o` 

That seems to be due to it being sed'ed to the form of `CC=${CC:=c++}` which is just a regular assignment when compiled natively.

The latest commit works for me, feel free to verify when you are available @dkwo 

Re: libtool: fix include paths when cross compiling

[oreo639]

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/40606#issuecomment-1430811971

Comment:
Alright, I think I see the issue.
`libtool: link: cc  -fPIC -DPIC -shared -nostdlib /usr/lib/../lib64/crti.o ...` is supposed to be `libtool: link: g++  -fPIC -DPIC -shared -nostdlib /usr/lib/../lib64/crti.o` 

That seems to be due to it being sed'ed to the form of `CC=${CC:=c++}` which is just a regular assignment when compiled natively.

The latest commit works for me, feel free to verify when testing with binfmt you are available @dkwo 

Re: [PR PATCH] [Updated] libtool: fix include paths when cross compiling

[oreo639]

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

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

https://github.com/oreo639/void-packages libtool
https://github.com/void-linux/void-packages/pull/40606

libtool: fix include paths when cross compiling
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**

@dkwo Can you test this? (whenever you are available ofc)

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From dbafa7853843467b1f03503cf2597161535a2e9f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 14 Feb 2023 18:36:41 -0800
Subject: [PATCH] libtool: fix include paths when cross compiling

---
 srcpkgs/libtool/template | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libtool/template b/srcpkgs/libtool/template
index cd7c684c5945..0240a4e65685 100644
--- a/srcpkgs/libtool/template
+++ b/srcpkgs/libtool/template
@@ -1,7 +1,7 @@
 # Template file for 'libtool'
 pkgname=libtool
 version=2.4.7
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="texinfo perl automake help2man xz gnulib tar"
 depends="tar sed grep"
@@ -22,9 +22,13 @@ post_extract() {
 }
 
 do_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		CXX="${XBPS_CROSS_TRIPLET}-g++"
+	fi
+
 	./bootstrap --force --no-git --skip-po \
 		--gnulib-srcdir=/usr/share/gnulib/ --copy
-	./configure ${configure_args} SED=/bin/sed GREP=/bin/grep
+	CXX=${CXX} ./configure ${configure_args} SED=/bin/sed GREP=/bin/grep
 }
 
 post_install() {
@@ -39,7 +43,7 @@ post_install() {
 	# 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:=ar}"
-		vsed -i -e "s,\([A-Z]\+\)=\"${XBPS_CROSS_TRIPLET}\-\(.*\)\",\1=\$\{\1:=\2\},g" \
+		vsed -i -e "s,\([A-Z]\+\)=\"${XBPS_CROSS_TRIPLET}\-\(.*\)\",\1=\"\2\",g" \
 		 ${PKGDESTDIR}/usr/bin/libtool
 
 		# clear out any sysroot present
@@ -50,6 +54,20 @@ post_install() {
 		vsed -i -e "s,\-I${XBPS_CROSS_BASE}/usr/include,,g" \
 		 ${PKGDESTDIR}/usr/bin/libtool
 
+		# Strip cross sysroot from paths
+		vsed -i -e "s,${XBPS_CROSS_BASE},,g" \
+		 ${PKGDESTDIR}/usr/bin/libtool
+
+		if [ "$XBPS_TARGET_WORDSIZE" = "64" ]; then
+			vsed -i \
+			 -e "s,/${XBPS_CROSS_TRIPLET}/lib/../lib64,/lib64,g" \
+			 ${PKGDESTDIR}/usr/bin/libtool
+		else
+			vsed -i \
+			 -e "s,/${XBPS_CROSS_TRIPLET}/lib,/lib,g" \
+			 ${PKGDESTDIR}/usr/bin/libtool
+		fi
+
 		# canonicalize host_alias, replace build(_alias,_os)
 		_canonical_host=$(grep "^host=" ${PKGDESTDIR}/usr/bin/libtool | sed 's/host=//')
 		_host_os=$(grep "^host_os=" ${PKGDESTDIR}/usr/bin/libtool | sed 's/host_os=//')

Re: libtool: fix include paths when cross compiling

[oreo639]

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/40606#issuecomment-1430811971

Comment:
Alright, I think I see the issue.
`libtool: link: cc  -fPIC -DPIC -shared -nostdlib /usr/lib/../lib64/crti.o ...` is supposed to be `libtool: link: g++  -fPIC -DPIC -shared -nostdlib /usr/lib/../lib64/crti.o` 

That seems to be due to it being sed'ed to the form of `CC=${CC:=c++}` which is just a regular assignment when compiled natively.

The latest commit works for me with binfmt, feel free to verify when you are available @dkwo 

Re: [PR PATCH] [Updated] libtool: fix include paths when cross compiling

[oreo639]

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

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

https://github.com/oreo639/void-packages libtool
https://github.com/void-linux/void-packages/pull/40606

libtool: fix include paths when cross compiling
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**

@dkwo Can you test this? (whenever you are available ofc)

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 0b1c022b9b04ef2b07f0a17c7f87293154c8db94 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 14 Feb 2023 18:36:41 -0800
Subject: [PATCH] libtool: fix include paths when cross compiling

---
 srcpkgs/libtool/template | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libtool/template b/srcpkgs/libtool/template
index cd7c684c5945..0240a4e65685 100644
--- a/srcpkgs/libtool/template
+++ b/srcpkgs/libtool/template
@@ -1,7 +1,7 @@
 # Template file for 'libtool'
 pkgname=libtool
 version=2.4.7
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="texinfo perl automake help2man xz gnulib tar"
 depends="tar sed grep"
@@ -22,9 +22,13 @@ post_extract() {
 }
 
 do_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		CXX="${XBPS_CROSS_TRIPLET}-g++"
+	fi
+
 	./bootstrap --force --no-git --skip-po \
 		--gnulib-srcdir=/usr/share/gnulib/ --copy
-	./configure ${configure_args} SED=/bin/sed GREP=/bin/grep
+	CXX=${CXX} ./configure ${configure_args} SED=/bin/sed GREP=/bin/grep
 }
 
 post_install() {
@@ -39,7 +43,7 @@ post_install() {
 	# 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:=ar}"
-		vsed -i -e "s,\([A-Z]\+\)=\"${XBPS_CROSS_TRIPLET}\-\(.*\)\",\1=\$\{\1:=\2\},g" \
+		vsed -i -e "s,\([A-Z]\+\)=\"${XBPS_CROSS_TRIPLET}\-\(.*\)\",\1=\"\2\",g" \
 		 ${PKGDESTDIR}/usr/bin/libtool
 
 		# clear out any sysroot present
@@ -50,6 +54,20 @@ post_install() {
 		vsed -i -e "s,\-I${XBPS_CROSS_BASE}/usr/include,,g" \
 		 ${PKGDESTDIR}/usr/bin/libtool
 
+		# Strip cross sysroot from paths
+		vsed -i -e "s,${XBPS_CROSS_BASE},,g" \
+		 ${PKGDESTDIR}/usr/bin/libtool
+
+		if [ "$XBPS_TARGET_WORDSIZE" = "64" ]; then
+			vsed -i \
+			 -e "s,/${XBPS_CROSS_TRIPLET}/lib/../lib64,/lib64,g" \
+			 ${PKGDESTDIR}/usr/bin/libtool
+		else
+			vsed -i \
+			 -e "s,/${XBPS_CROSS_TRIPLET}/lib,/lib,g" \
+			 ${PKGDESTDIR}/usr/bin/libtool
+		fi
+
 		# canonicalize host_alias, replace build(_alias,_os)
 		_canonical_host=$(grep "^host=" ${PKGDESTDIR}/usr/bin/libtool | sed 's/host=//')
 		_host_os=$(grep "^host_os=" ${PKGDESTDIR}/usr/bin/libtool | sed 's/host_os=//')

Re: [PR PATCH] [Updated] libtool: fix include paths when cross compiling

[oreo639]

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

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

https://github.com/oreo639/void-packages libtool
https://github.com/void-linux/void-packages/pull/40606

libtool: fix include paths when cross compiling
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**

@dkwo Can you test this? (whenever you are available ofc)

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 4e65484dd93ec88efe5878727441636882755bfa Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 14 Feb 2023 18:36:41 -0800
Subject: [PATCH] libtool: fix include paths when cross compiling

---
 srcpkgs/libtool/template | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libtool/template b/srcpkgs/libtool/template
index cd7c684c5945..4842aa06ee1a 100644
--- a/srcpkgs/libtool/template
+++ b/srcpkgs/libtool/template
@@ -1,7 +1,7 @@
 # Template file for 'libtool'
 pkgname=libtool
 version=2.4.7
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="texinfo perl automake help2man xz gnulib tar"
 depends="tar sed grep"
@@ -22,9 +22,13 @@ post_extract() {
 }
 
 do_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		CXX="${XBPS_CROSS_TRIPLET}-g++"
+	fi
+
 	./bootstrap --force --no-git --skip-po \
 		--gnulib-srcdir=/usr/share/gnulib/ --copy
-	./configure ${configure_args} SED=/bin/sed GREP=/bin/grep
+	./configure ${configure_args} SED=/bin/sed GREP=/bin/grep CXX=${CXX}
 }
 
 post_install() {
@@ -39,7 +43,7 @@ post_install() {
 	# 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:=ar}"
-		vsed -i -e "s,\([A-Z]\+\)=\"${XBPS_CROSS_TRIPLET}\-\(.*\)\",\1=\$\{\1:=\2\},g" \
+		vsed -i -e "s,\([A-Z]\+\)=\"${XBPS_CROSS_TRIPLET}\-\(.*\)\",\1=\"\2\",g" \
 		 ${PKGDESTDIR}/usr/bin/libtool
 
 		# clear out any sysroot present
@@ -50,6 +54,20 @@ post_install() {
 		vsed -i -e "s,\-I${XBPS_CROSS_BASE}/usr/include,,g" \
 		 ${PKGDESTDIR}/usr/bin/libtool
 
+		# Strip cross sysroot from paths
+		vsed -i -e "s,${XBPS_CROSS_BASE},,g" \
+		 ${PKGDESTDIR}/usr/bin/libtool
+
+		if [ "$XBPS_TARGET_WORDSIZE" = "64" ]; then
+			vsed -i \
+			 -e "s,/${XBPS_CROSS_TRIPLET}/lib/../lib64,/lib64,g" \
+			 ${PKGDESTDIR}/usr/bin/libtool
+		else
+			vsed -i \
+			 -e "s,/${XBPS_CROSS_TRIPLET}/lib,/lib,g" \
+			 ${PKGDESTDIR}/usr/bin/libtool
+		fi
+
 		# canonicalize host_alias, replace build(_alias,_os)
 		_canonical_host=$(grep "^host=" ${PKGDESTDIR}/usr/bin/libtool | sed 's/host=//')
 		_host_os=$(grep "^host_os=" ${PKGDESTDIR}/usr/bin/libtool | sed 's/host_os=//')

Re: [PR PATCH] [Updated] libtool: fix include paths when cross compiling

[oreo639]

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

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

https://github.com/oreo639/void-packages libtool
https://github.com/void-linux/void-packages/pull/40606

libtool: fix include paths when cross compiling
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**

@dkwo Can you test this? (whenever you are available ofc)

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 8b3da2aa645fc365a34bb85bdc9f1b9562fc8219 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 14 Feb 2023 18:36:41 -0800
Subject: [PATCH] libtool: fix include paths when cross compiling

Fix library and object include paths.
Fix ntl build by directly assigning cc/cxx/etc instead of using :- assignment.
Use g++ for CXX when cross compiling to match native.
---
 srcpkgs/libtool/template | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libtool/template b/srcpkgs/libtool/template
index cd7c684c5945..4842aa06ee1a 100644
--- a/srcpkgs/libtool/template
+++ b/srcpkgs/libtool/template
@@ -1,7 +1,7 @@
 # Template file for 'libtool'
 pkgname=libtool
 version=2.4.7
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="texinfo perl automake help2man xz gnulib tar"
 depends="tar sed grep"
@@ -22,9 +22,13 @@ post_extract() {
 }
 
 do_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		CXX="${XBPS_CROSS_TRIPLET}-g++"
+	fi
+
 	./bootstrap --force --no-git --skip-po \
 		--gnulib-srcdir=/usr/share/gnulib/ --copy
-	./configure ${configure_args} SED=/bin/sed GREP=/bin/grep
+	./configure ${configure_args} SED=/bin/sed GREP=/bin/grep CXX=${CXX}
 }
 
 post_install() {
@@ -39,7 +43,7 @@ post_install() {
 	# 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:=ar}"
-		vsed -i -e "s,\([A-Z]\+\)=\"${XBPS_CROSS_TRIPLET}\-\(.*\)\",\1=\$\{\1:=\2\},g" \
+		vsed -i -e "s,\([A-Z]\+\)=\"${XBPS_CROSS_TRIPLET}\-\(.*\)\",\1=\"\2\",g" \
 		 ${PKGDESTDIR}/usr/bin/libtool
 
 		# clear out any sysroot present
@@ -50,6 +54,20 @@ post_install() {
 		vsed -i -e "s,\-I${XBPS_CROSS_BASE}/usr/include,,g" \
 		 ${PKGDESTDIR}/usr/bin/libtool
 
+		# Strip cross sysroot from paths
+		vsed -i -e "s,${XBPS_CROSS_BASE},,g" \
+		 ${PKGDESTDIR}/usr/bin/libtool
+
+		if [ "$XBPS_TARGET_WORDSIZE" = "64" ]; then
+			vsed -i \
+			 -e "s,/${XBPS_CROSS_TRIPLET}/lib/../lib64,/lib64,g" \
+			 ${PKGDESTDIR}/usr/bin/libtool
+		else
+			vsed -i \
+			 -e "s,/${XBPS_CROSS_TRIPLET}/lib,/lib,g" \
+			 ${PKGDESTDIR}/usr/bin/libtool
+		fi
+
 		# canonicalize host_alias, replace build(_alias,_os)
 		_canonical_host=$(grep "^host=" ${PKGDESTDIR}/usr/bin/libtool | sed 's/host=//')
 		_host_os=$(grep "^host_os=" ${PKGDESTDIR}/usr/bin/libtool | sed 's/host_os=//')

Re: [PR PATCH] [Updated] libtool: fix include paths when cross compiling

[oreo639]

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

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

https://github.com/oreo639/void-packages libtool
https://github.com/void-linux/void-packages/pull/40606

libtool: fix include paths when cross compiling
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**

@dkwo Can you test this? (whenever you are available ofc)

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From b94a5d42ec5de65e4ec1b2fd6f3cd34b8f4dbc50 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 14 Feb 2023 18:36:41 -0800
Subject: [PATCH] libtool: fix include paths when cross compiling

Fix library and object include paths.
Fix ntl build by directly assigning cc/cxx/etc instead of using := assignment.
Use g++ for CXX when cross compiling to match native.
---
 srcpkgs/libtool/template | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libtool/template b/srcpkgs/libtool/template
index cd7c684c5945..4842aa06ee1a 100644
--- a/srcpkgs/libtool/template
+++ b/srcpkgs/libtool/template
@@ -1,7 +1,7 @@
 # Template file for 'libtool'
 pkgname=libtool
 version=2.4.7
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="texinfo perl automake help2man xz gnulib tar"
 depends="tar sed grep"
@@ -22,9 +22,13 @@ post_extract() {
 }
 
 do_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		CXX="${XBPS_CROSS_TRIPLET}-g++"
+	fi
+
 	./bootstrap --force --no-git --skip-po \
 		--gnulib-srcdir=/usr/share/gnulib/ --copy
-	./configure ${configure_args} SED=/bin/sed GREP=/bin/grep
+	./configure ${configure_args} SED=/bin/sed GREP=/bin/grep CXX=${CXX}
 }
 
 post_install() {
@@ -39,7 +43,7 @@ post_install() {
 	# 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:=ar}"
-		vsed -i -e "s,\([A-Z]\+\)=\"${XBPS_CROSS_TRIPLET}\-\(.*\)\",\1=\$\{\1:=\2\},g" \
+		vsed -i -e "s,\([A-Z]\+\)=\"${XBPS_CROSS_TRIPLET}\-\(.*\)\",\1=\"\2\",g" \
 		 ${PKGDESTDIR}/usr/bin/libtool
 
 		# clear out any sysroot present
@@ -50,6 +54,20 @@ post_install() {
 		vsed -i -e "s,\-I${XBPS_CROSS_BASE}/usr/include,,g" \
 		 ${PKGDESTDIR}/usr/bin/libtool
 
+		# Strip cross sysroot from paths
+		vsed -i -e "s,${XBPS_CROSS_BASE},,g" \
+		 ${PKGDESTDIR}/usr/bin/libtool
+
+		if [ "$XBPS_TARGET_WORDSIZE" = "64" ]; then
+			vsed -i \
+			 -e "s,/${XBPS_CROSS_TRIPLET}/lib/../lib64,/lib64,g" \
+			 ${PKGDESTDIR}/usr/bin/libtool
+		else
+			vsed -i \
+			 -e "s,/${XBPS_CROSS_TRIPLET}/lib,/lib,g" \
+			 ${PKGDESTDIR}/usr/bin/libtool
+		fi
+
 		# canonicalize host_alias, replace build(_alias,_os)
 		_canonical_host=$(grep "^host=" ${PKGDESTDIR}/usr/bin/libtool | sed 's/host=//')
 		_host_os=$(grep "^host_os=" ${PKGDESTDIR}/usr/bin/libtool | sed 's/host_os=//')

Re: libtool: fix include paths when cross compiling

[oreo639]

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/40606#issuecomment-1430811971

Comment:
Alright, I think I see the issue.
`libtool: link: cc  -fPIC -DPIC -shared -nostdlib /usr/lib/../lib64/crti.o ...` is supposed to be `libtool: link: g++  -fPIC -DPIC -shared -nostdlib /usr/lib/../lib64/crti.o` 

That seems to be due to it being sed'ed to the form of `CC=${CC:=c++}` which is just a regular assignment when compiled natively.

The latest commit works for me with binfmt, feel free to verify on native when you are available @dkwo 

Re: libtool: fix include paths when cross compiling

[oreo639]

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/40606#issuecomment-1430811971

Comment:
Alright, I think I see the issue.
`libtool: link: cc  -fPIC -DPIC -shared -nostdlib /usr/lib/../lib64/crti.o ...` is supposed to be `libtool: link: g++  -fPIC -DPIC -shared -nostdlib /usr/lib/../lib64/crti.o ...`  

That seems to be due to it being sed'ed to the form of `CC=${CC:=c++}` which is just a regular assignment when compiled natively.

The latest commit works for me with binfmt, feel free to verify on native when you are available @dkwo 

Re: libtool: fix include paths when cross compiling

[oreo639]

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/40606#issuecomment-1430811971

Comment:
Alright, I think I see the issue.
`libtool: link: cc  -fPIC -DPIC -shared -nostdlib /usr/lib/../lib64/crti.o ...` is supposed to be `libtool: link: g++  -fPIC -DPIC -shared -nostdlib /usr/lib/../lib64/crti.o ...`  

That seems to be due to it being sed'ed to the form of `CC=${CC:=c++}` where that is just a regular assignment when compiled natively.

The latest commit works for me with binfmt, feel free to verify on native when you are available @dkwo 

Re: libtool: fix include paths when cross compiling

[oreo639]

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/40606#issuecomment-1430811971

Comment:
Alright, I think I see the issue.
`libtool: link: cc  -fPIC -DPIC -shared -nostdlib /usr/lib/../lib64/crti.o ...` is supposed to be `libtool: link: g++  -fPIC -DPIC -shared -nostdlib /usr/lib/../lib64/crti.o ...`  

That seems to be due to it being sed'ed to the form of `CC=${CC:=c++}` where that is just a regular assignment when compiled natively. (`CC="g++"`)

The latest commit works for me with binfmt, feel free to verify on native when you are available @dkwo 

Re: libtool: fix include paths when cross compiling

[oreo639]

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/40606#issuecomment-1430811971

Comment:
Alright, I think I see the issue.
`libtool: link: cc  -fPIC -DPIC -shared -nostdlib /usr/lib/../lib64/crti.o ...` is supposed to be `libtool: link: g++  -fPIC -DPIC -shared -nostdlib /usr/lib/../lib64/crti.o ...`  

That seems to be due to it being sed'ed to the form of `CC=${CC:=c++}` where that is just a regular assignment when compiled natively. (`CC="g++"`)

The latest commit works for me with binfmt, feel free to verify when you are available @dkwo 

Re: libtool: fix include paths when cross compiling

[oreo639]

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/40606#issuecomment-1430811971

Comment:
Alright, I think I see the issue.
`libtool: link: cc  -fPIC -DPIC -shared -nostdlib /usr/lib/../lib64/crti.o ...` is supposed to be `libtool: link: g++  -fPIC -DPIC -shared -nostdlib /usr/lib/../lib64/crti.o ...`  

That seems to be due to it being sed'ed to the form of `CC=${CC:=c++}` where that is just a regular assignment when compiled natively. (`CC="g++"`)

The latest commit works for me with binfmt/qemu, feel free to verify when you are available @dkwo 

Re: libtool: fix include paths when cross compiling

[dkwo]

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/40606#issuecomment-1431960609

Comment:
It works :) Thanks for figuring this out!

Re: [PR PATCH] [Updated] libtool: fix include paths when cross compiling

[oreo639]

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

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

https://github.com/oreo639/void-packages libtool
https://github.com/void-linux/void-packages/pull/40606

libtool: fix include paths when cross compiling
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

@dkwo Can you test this? (whenever you are available ofc)

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From c18998be566d28c41db33cb572fcecebdebee0c3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 14 Feb 2023 18:36:41 -0800
Subject: [PATCH] libtool: fix include paths when cross compiling

Fix library and object include paths.
Fix ntl build by directly assigning cc/cxx/etc instead of using := assignment.
Use g++ for CXX when cross compiling to match native.
---
 srcpkgs/libtool/template | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libtool/template b/srcpkgs/libtool/template
index cd7c684c5945..42443c12a15c 100644
--- a/srcpkgs/libtool/template
+++ b/srcpkgs/libtool/template
@@ -1,7 +1,7 @@
 # Template file for 'libtool'
 pkgname=libtool
 version=2.4.7
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="texinfo perl automake help2man xz gnulib tar"
 depends="tar sed grep"
@@ -22,9 +22,13 @@ post_extract() {
 }
 
 do_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		CXX="${XBPS_CROSS_TRIPLET}-g++"
+	fi
+
 	./bootstrap --force --no-git --skip-po \
 		--gnulib-srcdir=/usr/share/gnulib/ --copy
-	./configure ${configure_args} SED=/bin/sed GREP=/bin/grep
+	./configure ${configure_args} SED=/bin/sed GREP=/bin/grep CXX=${CXX}
 }
 
 post_install() {
@@ -38,8 +42,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:=ar}"
-		vsed -i -e "s,\([A-Z]\+\)=\"${XBPS_CROSS_TRIPLET}\-\(.*\)\",\1=\$\{\1:=\2\},g" \
+		# e.g. AR="armv7l-linux-gnueabihf-ar" becomes AR="ar"
+		vsed -i -e "s,\([A-Z]\+\)=\"${XBPS_CROSS_TRIPLET}\-\(.*\)\",\1=\"\2\",g" \
 		 ${PKGDESTDIR}/usr/bin/libtool
 
 		# clear out any sysroot present
@@ -50,6 +54,20 @@ post_install() {
 		vsed -i -e "s,\-I${XBPS_CROSS_BASE}/usr/include,,g" \
 		 ${PKGDESTDIR}/usr/bin/libtool
 
+		# Strip cross sysroot from paths
+		vsed -i -e "s,${XBPS_CROSS_BASE},,g" \
+		 ${PKGDESTDIR}/usr/bin/libtool
+
+		if [ "$XBPS_TARGET_WORDSIZE" = "64" ]; then
+			vsed -i \
+			 -e "s,/${XBPS_CROSS_TRIPLET}/lib/../lib64,/lib64,g" \
+			 ${PKGDESTDIR}/usr/bin/libtool
+		else
+			vsed -i \
+			 -e "s,/${XBPS_CROSS_TRIPLET}/lib,/lib,g" \
+			 ${PKGDESTDIR}/usr/bin/libtool
+		fi
+
 		# canonicalize host_alias, replace build(_alias,_os)
 		_canonical_host=$(grep "^host=" ${PKGDESTDIR}/usr/bin/libtool | sed 's/host=//')
 		_host_os=$(grep "^host_os=" ${PKGDESTDIR}/usr/bin/libtool | sed 's/host_os=//')

Re: [PR PATCH] [Updated] libtool: fix include paths when cross compiling

[oreo639]

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

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

https://github.com/oreo639/void-packages libtool
https://github.com/void-linux/void-packages/pull/40606

libtool: fix include paths when cross compiling
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

@dkwo Can you test this? (whenever you are available ofc)

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 8d8303764d954eda8d604416cd8b621ff6f86646 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 14 Feb 2023 18:36:41 -0800
Subject: [PATCH] libtool: fix include paths when cross compiling

Fix library and object include paths.
Fix ntl build by directly assigning cc/cxx/etc instead of using := assignment.
Use g++ for CXX when cross compiling to match native.
---
 srcpkgs/libtool/template | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libtool/template b/srcpkgs/libtool/template
index cd7c684c5945..4eea61b17c49 100644
--- a/srcpkgs/libtool/template
+++ b/srcpkgs/libtool/template
@@ -1,7 +1,7 @@
 # Template file for 'libtool'
 pkgname=libtool
 version=2.4.7
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="texinfo perl automake help2man xz gnulib tar"
 depends="tar sed grep"
@@ -38,8 +38,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:=ar}"
-		vsed -i -e "s,\([A-Z]\+\)=\"${XBPS_CROSS_TRIPLET}\-\(.*\)\",\1=\$\{\1:=\2\},g" \
+		# e.g. AR="armv7l-linux-gnueabihf-ar" becomes AR="ar"
+		vsed -i -e "s,\([A-Z]\+\)=\"${XBPS_CROSS_TRIPLET}\-\(.*\)\",\1=\"\2\",g" \
 		 ${PKGDESTDIR}/usr/bin/libtool
 
 		# clear out any sysroot present
@@ -50,6 +50,20 @@ post_install() {
 		vsed -i -e "s,\-I${XBPS_CROSS_BASE}/usr/include,,g" \
 		 ${PKGDESTDIR}/usr/bin/libtool
 
+		# Strip cross sysroot from paths
+		vsed -i -e "s,${XBPS_CROSS_BASE},,g" \
+		 ${PKGDESTDIR}/usr/bin/libtool
+
+		if [ "$XBPS_TARGET_WORDSIZE" = "64" ]; then
+			vsed -i \
+			 -e "s,/${XBPS_CROSS_TRIPLET}/lib/../lib64,/lib64,g" \
+			 ${PKGDESTDIR}/usr/bin/libtool
+		else
+			vsed -i \
+			 -e "s,/${XBPS_CROSS_TRIPLET}/lib,/lib,g" \
+			 ${PKGDESTDIR}/usr/bin/libtool
+		fi
+
 		# canonicalize host_alias, replace build(_alias,_os)
 		_canonical_host=$(grep "^host=" ${PKGDESTDIR}/usr/bin/libtool | sed 's/host=//')
 		_host_os=$(grep "^host_os=" ${PKGDESTDIR}/usr/bin/libtool | sed 's/host_os=//')

Re: [PR PATCH] [Updated] libtool: fix include paths when cross compiling

[oreo639]

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

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

https://github.com/oreo639/void-packages libtool
https://github.com/void-linux/void-packages/pull/40606

libtool: fix include paths when cross compiling
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

@dkwo Can you test this? (whenever you are available ofc)

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 676b9b45d13fa972b6c85b7a078079c8da9518cf Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 14 Feb 2023 18:36:41 -0800
Subject: [PATCH] libtool: fix include paths when cross compiling

Fix library and object include paths.
Fix ntl build by directly assigning cc/cxx/etc instead of using := assignment.
---
 srcpkgs/libtool/template | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libtool/template b/srcpkgs/libtool/template
index cd7c684c5945..4eea61b17c49 100644
--- a/srcpkgs/libtool/template
+++ b/srcpkgs/libtool/template
@@ -1,7 +1,7 @@
 # Template file for 'libtool'
 pkgname=libtool
 version=2.4.7
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="texinfo perl automake help2man xz gnulib tar"
 depends="tar sed grep"
@@ -38,8 +38,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:=ar}"
-		vsed -i -e "s,\([A-Z]\+\)=\"${XBPS_CROSS_TRIPLET}\-\(.*\)\",\1=\$\{\1:=\2\},g" \
+		# e.g. AR="armv7l-linux-gnueabihf-ar" becomes AR="ar"
+		vsed -i -e "s,\([A-Z]\+\)=\"${XBPS_CROSS_TRIPLET}\-\(.*\)\",\1=\"\2\",g" \
 		 ${PKGDESTDIR}/usr/bin/libtool
 
 		# clear out any sysroot present
@@ -50,6 +50,20 @@ post_install() {
 		vsed -i -e "s,\-I${XBPS_CROSS_BASE}/usr/include,,g" \
 		 ${PKGDESTDIR}/usr/bin/libtool
 
+		# Strip cross sysroot from paths
+		vsed -i -e "s,${XBPS_CROSS_BASE},,g" \
+		 ${PKGDESTDIR}/usr/bin/libtool
+
+		if [ "$XBPS_TARGET_WORDSIZE" = "64" ]; then
+			vsed -i \
+			 -e "s,/${XBPS_CROSS_TRIPLET}/lib/../lib64,/lib64,g" \
+			 ${PKGDESTDIR}/usr/bin/libtool
+		else
+			vsed -i \
+			 -e "s,/${XBPS_CROSS_TRIPLET}/lib,/lib,g" \
+			 ${PKGDESTDIR}/usr/bin/libtool
+		fi
+
 		# canonicalize host_alias, replace build(_alias,_os)
 		_canonical_host=$(grep "^host=" ${PKGDESTDIR}/usr/bin/libtool | sed 's/host=//')
 		_host_os=$(grep "^host_os=" ${PKGDESTDIR}/usr/bin/libtool | sed 's/host_os=//')

Re: [PR PATCH] [Merged]: libtool: fix include paths when cross compiling

[paper42]

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

There's a merged pull request on the void-packages repository

libtool: fix include paths when cross compiling
https://github.com/void-linux/void-packages/pull/40606

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

@dkwo Can you test this? (whenever you are available ofc)

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->