From ea37acebf87f914b0d3c50706020e7a4d65bbcf1 Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Fri, 22 Apr 2022 10:01:40 -0400 Subject: [PATCH] libraries/cloog: Fix PRINT_PACKAGE_NAME. Signed-off-by: B. Watson --- libraries/cloog/cloog.SlackBuild | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/libraries/cloog/cloog.SlackBuild b/libraries/cloog/cloog.SlackBuild index 3113be3bba..90b4bf3327 100644 --- a/libraries/cloog/cloog.SlackBuild +++ b/libraries/cloog/cloog.SlackBuild @@ -24,7 +24,9 @@ # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# + +# 20220419 bkw: Modified by SlackBuilds.org: +# - fix PRINT_PACKAGE_NAME when ARCH not set in env. cd $(dirname $0) ; CWD=$(pwd) @@ -34,11 +36,6 @@ BUILD=${BUILD:-1} TAG="${TAG:-_SBo}" PKGTYPE="${PKGTYPE:-tgz}" -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - # PKG build dir vars CWD=$(pwd) TMP=${TMP:-/tmp/SBo} @@ -56,6 +53,11 @@ if [ -z "$ARCH" ]; then esac fi +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + # Set ARCH CFLAGS if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" @@ -85,9 +87,9 @@ cd $PRGNAM-"$VERSION" chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ + -o -perm 511 \) -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -102,15 +104,11 @@ CXXFLAGS="$SLKCFLAGS" \ # Compile PKG make -make install DESTDIR="$PKG" +make install-strip DESTDIR="$PKG" # Don't ship .la files: rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la -# Strip some libraries and binaries -find "$PKG" | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - # Copy PKG docs mkdir -p "$PKG"/usr/doc/$PRGNAM-"$VERSION" "$PKG"/install cp -a LICENSE README "$PKG"/usr/doc/$PRGNAM-"$VERSION"