Skip to content

libtool: fix include paths when cross compiling #40606

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
paper42 merged 1 commit into from
Feb 26, 2023
Merged

libtool: fix include paths when cross compiling #40606

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions srcpkgs/libtool/template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -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
Expand All @@ -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=//')
Expand Down