From 959f70f78d0797b2b0d87403f4a9d153bc521dfd Mon Sep 17 00:00:00 2001
From: Jose V Beneyto <sepen@crux.nu>
Date: Tue, 20 Aug 2013 23:25:29 +0000
Subject: [PATCH] Replaced libdir value in .la files instead of remove them

---
 pkgadd-cross | 8 ++++++++
 pkgadd.conf  | 5 -----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgadd-cross b/pkgadd-cross
index 1686171..c1ac751 100755
--- a/pkgadd-cross
+++ b/pkgadd-cross
@@ -39,4 +39,12 @@ done
 
 $PKGADD -c $PKGADD_CONF -r $CLFS $ARGS
 
+# we need to adjust .la files for our temporary root filesystem tree (CLFS)
+if [ $? -eq 0 ]; then
+  LIBTOOL_FILES=$(tar tf $PATH_TO_PACKAGE | grep '.la')
+  for la_file in $LIBTOOL_FILES; do
+    sed -e "s|libdir='/|libdir='$CLFS/|" -i $CLFS/$la_file
+  done
+fi
+
 # End of file
diff --git a/pkgadd.conf b/pkgadd.conf
index 234f961..6af9cb8 100644
--- a/pkgadd.conf
+++ b/pkgadd.conf
@@ -2,11 +2,6 @@
 # /etc/pkgadd.conf: pkgadd(8) configuration
 #
 
-# Crosscompiling rules to avoid libtool issues
-# with the hardcoded libdir variable
-INSTALL         .*\.la                  NO
-UPGRADE         .*\.la                  NO
-
 # Default rule (implicit)
 #UPGRADE	^.*$			YES
 
-- 
2.26.2