From 013e0ab71504032f00a0350eb460e706674ab746 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Sun, 16 Mar 2014 23:34:41 +0000 Subject: This one builds a good package --- cryptopp/build/cryptopp.SlackBuild | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'cryptopp') diff --git a/cryptopp/build/cryptopp.SlackBuild b/cryptopp/build/cryptopp.SlackBuild index 46b48503..4116b3f3 100755 --- a/cryptopp/build/cryptopp.SlackBuild +++ b/cryptopp/build/cryptopp.SlackBuild @@ -157,8 +157,8 @@ unzip ${SOURCE} -d ${PRGNAM}-${VERSION} cd ${PRGNAM}-${VERSION} chown -R root:root . -# Use a debian patch to install Test* in /usr/share/cryptopp/: -cat $SRCDIR/cryptopp-data-files-location.patch | patch -p1 --verbose \ +# Do not mess up the CXXFLAGS: +cat $SRCDIR/cryptopp_slkcflags.patch | patch -p1 --verbose \ 2>&1 | tee $OUTPUT/patch-${PRGNAM}.log chmod -R u+w,go+r-w,a+rX-st . @@ -171,7 +171,8 @@ export CFLAGS="$SLKCFLAGS" # Care for 64-bit Slackware: sed -i -e "s,(PREFIX)/lib,(PREFIX)/lib${LIBDIRSUFFIX},g" GNUmakefile -make $NUMJOBS dynamic static 2>&1 | tee $OUTPUT/make-${PRGNAM}.log +make $NUMJOBS CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" dynamic static \ + 2>&1 | tee $OUTPUT/make-${PRGNAM}.log make PREFIX=$PKG/usr install 2>&1 | tee $OUTPUT/install-${PRGNAM}.log # Install the pkg-config file: @@ -181,11 +182,6 @@ sed -e "s,@LIBDIRSUFFIX@,${LIBDIRSUFFIX},g" \ -e "s,@VERSION@,${VERSION},g" \ -i $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/cryptopp.pc -# Install test vectors & data: -mkdir -p $PKG/usr/share/${PRGNAM}/{TestData,TestVectors} -install -m644 TestVectors/* $PKG/usr/share/${PRGNAM}/TestVectors -install -m644 TestData/* $PKG/usr/share/${PRGNAM}/TestData - # Add documentation: mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true -- cgit v1.2.3