diff options
| -rw-r--r-- | development/cppunit/README | 9 | ||||
| -rw-r--r-- | development/cppunit/cppunit.SlackBuild | 25 | ||||
| -rw-r--r-- | development/cppunit/cppunit.info | 8 |
3 files changed, 29 insertions, 13 deletions
diff --git a/development/cppunit/README b/development/cppunit/README index 5ceecf9e8f381..1b55f72a268ff 100644 --- a/development/cppunit/README +++ b/development/cppunit/README @@ -1 +1,10 @@ CppUnit is a C++ unit testing framework. + +Starting with version 1.14.0, cppunit may require that your tests be compiled +with a C++11-conforming compiler (e.g. by adding the -std=c++11 flag to g++). +Since this is not yet the default for g++, if you intend on using cppunit with +projects that do not yet mandate C++11, then you may want to stick with an +older version. + +graphviz is an optional dependency. It will be used when creating the +Doxygen documentation if found. diff --git a/development/cppunit/cppunit.SlackBuild b/development/cppunit/cppunit.SlackBuild index 073cc84cd3ca1..c1437f07ad5c6 100644 --- a/development/cppunit/cppunit.SlackBuild +++ b/development/cppunit/cppunit.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for CppUnit -# Copyright 2014 Kyle Guinn <elyk03@gmail.com>, USA +# Copyright 2014-2017 Kyle Guinn <elyk03@gmail.com>, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=cppunit -VERSION=${VERSION:-1.13.2} +VERSION=${VERSION:-1.14.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$(uname -m) ;; esac @@ -40,11 +40,15 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -DOCS="AUTHORS BUGS COPYING ChangeLog CodingGuideLines.txt INSTALL* NEWS README THANKS TODO" +# Makefile.am handles AUTHORS, BUGS, CodingGuideLines.txt, INSTALL*, doc/FAQ +DOCS="COPYING ChangeLog NEWS README THANKS TODO" if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" +elif [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" LIBDIRSUFFIX="" @@ -67,28 +71,31 @@ cd $PRGNAM-$VERSION chown -R root:root . chmod -R u+w,go-w,a+rX-st . +# Fix a typo that breaks dot/graphviz detection. +sed -i 's/xenable_dot/x$enable_dot/' m4/bb_enable_doxygen.m4 # Make it respect --htmldir. sed -i '/^htmldir/d' doc/Makefile.am autoreconf -vif -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ + --infodir=/usr/info \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --htmldir=/usr/doc/$PRGNAM-$VERSION/html \ - --build=$ARCH-slackware-linux \ --disable-static \ - --disable-dependency-tracking + --disable-dependency-tracking \ + --build=$ARCH-slackware-linux \ + CFLAGS="$SLKCFLAGS" \ + CXXFLAGS="$SLKCFLAGS" \ make make install-strip DESTDIR=$PKG -find $PKG/usr/man -type f -exec gzip -9 {} + +find $PKG/usr/lib${LIBDIRSUFFIX} -name '*.la' -delete mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/development/cppunit/cppunit.info b/development/cppunit/cppunit.info index 4a4032f15fb82..40159682e0c2c 100644 --- a/development/cppunit/cppunit.info +++ b/development/cppunit/cppunit.info @@ -1,8 +1,8 @@ PRGNAM="cppunit" -VERSION="1.13.2" -HOMEPAGE="http://freedesktop.org/wiki/Software/cppunit/" -DOWNLOAD="http://dev-www.libreoffice.org/src/cppunit-1.13.2.tar.gz" -MD5SUM="d1c6bdd5a76c66d2c38331e2d287bc01" +VERSION="1.14.0" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/cppunit/" +DOWNLOAD="https://dev-www.libreoffice.org/src/cppunit-1.14.0.tar.gz" +MD5SUM="7ad93022171710a541bfe4bfd8b4a381" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |