Replaced libdir value in .la files instead of remove them

diff --git a/pkgadd-cross b/pkgadd-cross
index 168617144c86562320b666f7b170e38323cef231..c1ac751b493c034008955ff43abf1876957337cd 100755 (executable)
--- 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 234f961b17c5f745fa887b72baf26d02df5f5bf2..6af9cb809439ba838be9b68960d245e54ffd7390 100644 (file)
--- 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