From d0147d202bc021a7df4d332620361015d42c7749 Mon Sep 17 00:00:00 2001 From: Jose V Beneyto Date: Wed, 9 Mar 2016 15:14:39 +0100 Subject: [PATCH] Removed trick for .la files in pkgadd-cross. That was moved to pkgadd.conf on previous changeset --- pkgadd-cross | 8 -------- pkgadd.conf | 4 +++- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgadd-cross b/pkgadd-cross index 61bb88f..1686171 100755 --- 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 25a98c4..4143aea 100644 --- 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 -- 2.26.2