summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author B. Watson2022-03-23 07:35:07 +0100
committer Willy Sudiarto Raharjo2022-03-25 19:20:11 +0100
commit0338d3c98fc978f64a800c732e3b569121cb3c8a (patch)
treecb122bec3635518b90f90f7a56178711c3f1afe8
parentf214e77ec7de7b44be92b91ed204271ae7ba8cd4 (diff)
downloadslackbuilds-0338d3c98fc978f64a800c732e3b569121cb3c8a.tar.gz
system/bulk_extractor: Fix 32-bit build.
Signed-off-by: B. Watson <yalhcru@gmail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--system/bulk_extractor/bulk_extractor.SlackBuild20
1 files changed, 13 insertions, 7 deletions
diff --git a/system/bulk_extractor/bulk_extractor.SlackBuild b/system/bulk_extractor/bulk_extractor.SlackBuild
index 11ba4e4151..65325f5c6a 100644
--- a/system/bulk_extractor/bulk_extractor.SlackBuild
+++ b/system/bulk_extractor/bulk_extractor.SlackBuild
@@ -24,11 +24,16 @@
# edited for 20210928_692ee97, October of 2021)
+# 20220323 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - fix 32-bit build.
+# - remove 0-byte README from doc dir.
+# - remove useless INSTALL from doc dir.
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=bulk_extractor
VERSION=${VERSION:-20210928_692ee97}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -40,9 +45,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -77,9 +79,13 @@ 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 {} \+
+
+# 20220323 bkw: fix 32-bit build. Ugh.
+[ -z "$LIBDIRSUFFIX" ] && \
+ sed -i 's,8UL,(size_t)8,g' src/be13_api/sbuf.cpp
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
@@ -102,7 +108,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -ar AUTHORS COPYING ChangeLog INSTALL NEWS README doc/ $PKG/usr/doc/$PRGNAM-$VERSION
+cp -ar AUTHORS COPYING ChangeLog NEWS doc/ $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
find $PKG/usr/doc -type f -exec chmod 644 {} \;