From 6be7c2e0db5a770fe86eeff0f538820a2b3ee434 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Sat, 5 Feb 2022 20:18:27 +0000 Subject: muparser: update to 2.3.3 --- muparser/build/muparser.SlackBuild | 71 +++++++++++++++++++++----------------- 1 file changed, 39 insertions(+), 32 deletions(-) diff --git a/muparser/build/muparser.SlackBuild b/muparser/build/muparser.SlackBuild index e95c04ee..947a33d3 100755 --- a/muparser/build/muparser.SlackBuild +++ b/muparser/build/muparser.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # $Id$ -# Copyright 2016 Eric Hameleers, Eindhoven, NL +# Copyright 2016, 2022 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -27,12 +27,14 @@ # By: Eric Hameleers # For: muparser # Descr: fast math parser library -# URL: http://muparser.sourceforge.net/ +# URL: https://github.com/beltoforion/muparser # Build needs: # Needs: # Changelog: # 2.2.5-1: 15/nov/2016 by Eric Hameleers # * Initial build. +# 2.3.3-1: 05/feb/2022 by Eric Hameleers +# * Update. # # Run 'sh muparser.SlackBuild' to build a Slackware package. # The package (.t?z) and .txt file as well as build logs are created in /tmp . @@ -41,7 +43,7 @@ # ----------------------------------------------------------------------------- PRGNAM=muparser -VERSION=${VERSION:-2.2.5} +VERSION=${VERSION:-2.3.3} BUILD=${BUILD:-1} TAG=${TAG:-alien} @@ -56,26 +58,26 @@ PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.gz" -SRCURL="https://github.com/beltoforion/${PRGNAM}/archive/v${VERSION}.tar.gz" +SRCURL="https://github.com/beltoforion/${PRGNAM}/archive/v${VERSION}-1/${PRGNAM}-${VERSION}.tar.gz" ## ## --- with a little luck, you won't have to edit below this point --- ## ## # Automatically determine the architecture we're building on: -MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$MARCH" in - i?86) export ARCH=i486 ;; - armv7hl) export ARCH=$MARCH ;; - arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$MARCH ;; + case "$(uname -m)" in + i?86) ARCH=i586 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + # Unless $ARCH is already set, use uname -m for all oter archs: + *) ARCH=$(uname -m) ;; esac + export ARCH fi + # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX: case "$ARCH" in - i486) SLKCFLAGS="-O2 -march=i486 -mtune=i686" + i?86) SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686" SLKLDFLAGS=""; LIBDIRSUFFIX="" ;; x86_64) SLKCFLAGS="-O2 -fPIC" @@ -84,11 +86,12 @@ case "$ARCH" in armv7hl) SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" SLKLDFLAGS=""; LIBDIRSUFFIX="" ;; - *) SLKCFLAGS=${SLKCFLAGS:-"O2"} + *) SLKCFLAGS=${SLKCFLAGS:-"-O2"} SLKLDFLAGS=${SLKLDFLAGS:-""}; LIBDIRSUFFIX=${LIBDIRSUFFIX:-""} ;; esac + case "$ARCH" in arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; *) TARGET=$ARCH-slackware-linux ;; @@ -148,28 +151,32 @@ echo "++" cd $TMP/tmp-$PRGNAM echo "Extracting the source archive(s) for $PRGNAM..." tar -xvf ${SOURCE} -cd ${PRGNAM}-${VERSION} +cd ${PRGNAM}-${VERSION}* chown -R root:root . chmod -R u+w,go+r-w,a+rX-st . echo Building ... -LDFLAGS="$SLKLDFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -CFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --localstatedir=/var \ - --sysconfdir=/etc \ - --program-prefix= \ - --program-suffix= \ - --build=$TARGET \ +export LDFLAGS="$SLKLDFLAGS" \ +export CXXFLAGS="$SLKCFLAGS" \ +export CFLAGS="$SLKCFLAGS" \ +mkdir -p build-${PRGNAM} +cd build-${PRGNAM} + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DMAN_INSTALL_DIR=/usr/man \ + -DSYSCONF_INSTALL_DIR=/etc \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DENABLE_WIDE_CHAR \ + .. \ 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log - -make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log -make DESTDIR=$PKG install 2>&1 | tee $OUTPUT/install-${PRGNAM}.log + make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log + make DESTDIR=$PKG install 2>&1 | tee $OUTPUT/install-${PRGNAM}.log +cd - 1>/dev/null # Add documentation: mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION @@ -194,9 +201,9 @@ cat $SRCDIR/slack-desc > $PKG/install/slack-desc # Build the package: cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz} 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log +makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz}.md5 +md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 cd - cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -- cgit v1.2.3-65-gdbad