From 573c30b80482a8c3304859c3c08dfc696203c2e7 Mon Sep 17 00:00:00 2001
From: Jose V Beneyto <sepen@crux.nu>
Date: Tue, 18 May 2010 12:16:37 +0200
Subject: [PATCH] Fixed installation of .la files which were affected due to
 crosscompilation paths.

---
 pkgmk-cross  | 2 +-
 src/pkgmk.in | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgmk-cross b/pkgmk-cross
index 49d0065..f5ecafc 100755
--- a/pkgmk-cross
+++ b/pkgmk-cross
@@ -19,7 +19,7 @@ while [ "$1" ]; do
 done
 
 if [ ! -z "$PKGMK_OPTIMIZE" ]; then
-	_cflags="$(grep "^${PKGMK_OPTIMIZE}_CFLAGS=" $PKGMK_CONF | cut -d'=' -f2- | sed 's|"||g')"
+  _cflags="$(grep "^${PKGMK_OPTIMIZE}_CFLAGS=" $PKGMK_CONF | cut -d'=' -f2- | sed 's|"||g')"
   if [ ! -z "$_cflags" ]; then
     sed '/_CFLAGS=/d' $PKGMK_CONF | sed "s|CFLAGS=.*|CFLAGS=\"$_cflags\"|" > $TMP_CONF
     PKGMK_CONF="$TMP_CONF"
diff --git a/src/pkgmk.in b/src/pkgmk.in
index 7378def..9c20c67 100755
--- a/src/pkgmk.in
+++ b/src/pkgmk.in
@@ -305,6 +305,13 @@ compress_manpages() {
 	done
 }
 
+fix_cross_paths() {
+	# remove the last / from CLFS path if appeared
+	CLFS=${CLFS%*/}
+
+	find $PKG -type f -name '*.la' -exec sed "s|$CLFS||g" -i {} \;
+}
+
 check_footprint() {
 	local FILE="$PKGMK_WORK_DIR/.tmp"
 	
@@ -377,6 +384,7 @@ build_package() {
 		fi
 		
 		compress_manpages
+		fix_cross_paths
 		
 		cd $PKG
 		info "Build result:"
-- 
2.26.2