summaryrefslogtreecommitdiff
path: root/system/hardinfo
diff options
context:
space:
mode:
authorWilly Sudiarto Raharjo <willysr@slackbuilds.org>2015-12-19 09:42:32 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2015-12-19 09:42:32 +0700
commite40b09091822e15c64784cfcf530398631b22763 (patch)
treed1a8dd9dafee52467f0d380878b34289fd41ccac /system/hardinfo
parent230c7d9ebbfa50a98caac9394cb33fb64b5d28bf (diff)
downloadslackbuilds-e40b09091822e15c64784cfcf530398631b22763.tar.gz
system/hardinfo: Patched for newer GCC.
Thanks to _gin in LQ. Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'system/hardinfo')
-rw-r--r--system/hardinfo/hardinfo.SlackBuild13
-rw-r--r--system/hardinfo/makefile.patch10
2 files changed, 17 insertions, 6 deletions
diff --git a/system/hardinfo/hardinfo.SlackBuild b/system/hardinfo/hardinfo.SlackBuild
index 4a3bd5b127..6296223cd7 100644
--- a/system/hardinfo/hardinfo.SlackBuild
+++ b/system/hardinfo/hardinfo.SlackBuild
@@ -23,7 +23,7 @@
PRGNAM=hardinfo
VERSION=${VERSION:-0.5.1}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -63,14 +63,15 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
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 \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -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 {} \;
# Fix mandir
sed -i "s|share/man|man|" configure
+patch -p1 < $CWD/makefile.patch
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -86,7 +87,7 @@ make install DESTDIR=$PKG
rm -rf $PKG/usr/local
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/system/hardinfo/makefile.patch b/system/hardinfo/makefile.patch
new file mode 100644
index 0000000000..a32b77e423
--- /dev/null
+++ b/system/hardinfo/makefile.patch
@@ -0,0 +1,10 @@
+--- hardinfo-0.5.1/Makefile.in.old 2015-12-19 09:39:19.955074713 +0700
++++ hardinfo-0.5.1/Makefile.in 2015-12-19 09:39:40.254827496 +0700
+@@ -1,6 +1,6 @@
+
+ CCFLAGS = -fPIC -pipe -Wall -g
+-CFLAGS = $(GTK_CFLAGS) $(SOUP_CFLAGS) -I.
++CFLAGS = $(GTK_CFLAGS) $(SOUP_CFLAGS) -I. -std=gnu89
+ CC = gcc $(ARCHOPTS) -g
+ CCSLOW = gcc -O0 -g
+