Removed trick for .la files in pkgadd-cross. That was moved to pkgadd.conf on previou...

diff --git a/pkgadd-cross b/pkgadd-cross
index 61bb88f3516521fc8707787ba1202e9c2e332c60..168617144c86562320b666f7b170e38323cef231 100755 (executable)
--- a/pkgadd-cross
+++ b/pkgadd-cross
@@ -39,12 +39,4 @@ 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 2>/dev/null | 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 25a98c495608b459e00181232b636911a09c1ee4..4143aeab53fcbaa4d84107d2aa1e6668a21033b5 100644 (file)
--- a/pkgadd.conf
+++ b/pkgadd.conf
@@ -25,6 +25,8 @@ UPGRADE               ^etc/udev/hwdb.d/.*$    YES
 UPGRADE                ^etc/udev/hwdb.bin$     YES
 
 UPGRADE                ^etc/ssl/cert.pem$      YES
-INSTALL                /lib/.*\.la$    NO
+
+# required to avoid installation of .la files into CLFS
+INSTALL                /lib/.*\.la$            NO
 
 # End of file