summaryrefslogtreecommitdiffstats
path: root/source/d/vala
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2018-11-24 20:44:07 +0000
committer Eric Hameleers <alien@slackware.com>2018-11-25 08:59:43 +0100
commit6b0434cfef488f332faad7efd1359d5f07b02a49 (patch)
tree91d2f8553617c5a33ab7abb899ced54559cf74cb /source/d/vala
parent8a98ceb6bd8b2b73b4b386e6435862f51ddb197e (diff)
downloadcurrent-6b0434cfef488f332faad7efd1359d5f07b02a49.tar.gz
current-6b0434cfef488f332faad7efd1359d5f07b02a49.tar.xz
Sat Nov 24 20:44:07 UTC 201820181124204407
a/tree-1.8.0-x86_64-1.txz: Upgraded. ap/cups-filters-1.21.4-x86_64-1.txz: Upgraded. ap/itstool-2.0.5-x86_64-1.txz: Upgraded. d/Cython-0.29.1-x86_64-1.txz: Upgraded. l/dconf-0.30.1-x86_64-1.txz: Upgraded. l/elfutils-0.175-x86_64-1.txz: Upgraded. l/gc-8.0.0-x86_64-1.txz: Upgraded. l/gobject-introspection-1.58.1-x86_64-1.txz: Upgraded. l/json-glib-1.4.4-x86_64-1.txz: Upgraded. l/keyutils-1.6-x86_64-1.txz: Upgraded. l/libjpeg-turbo-2.0.1-x86_64-1.txz: Upgraded. l/libpsl-0.20.2-x86_64-1.txz: Upgraded. l/libsecret-0.18.6-x86_64-3.txz: Rebuilt. Recompiled with --enable-introspection (also picks up Vala support). n/cyrus-sasl-2.1.27-x86_64-1.txz: Upgraded. n/dovecot-2.3.4-x86_64-1.txz: Upgraded. n/mailx-12.5-x86_64-4.txz: Removed. n/s-nail-14.9.11-x86_64-1.txz: Added. This package replaces mailx. Thanks to Johannes Schoepfer. tcl/tcl-8.6.9-x86_64-1.txz: Upgraded. tcl/tk-8.6.9.1-x86_64-1.txz: Upgraded. xap/gucharmap-11.0.3-x86_64-1.txz: Upgraded. xfce/xfce4-clipman-plugin-1.4.3-x86_64-1.txz: Upgraded. xfce/xfce4-screenshooter-1.9.3-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/d/vala')
-rwxr-xr-xsource/d/vala/vala.SlackBuild11
1 files changed, 7 insertions, 4 deletions
diff --git a/source/d/vala/vala.SlackBuild b/source/d/vala/vala.SlackBuild
index 0fb816992..86c8ec5ff 100755
--- a/source/d/vala/vala.SlackBuild
+++ b/source/d/vala/vala.SlackBuild
@@ -85,10 +85,7 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-# Don't use graphviz if it's not on the system. Unless you already have a Vala
-# compiler though, you'll need to build with graphviz the first time to use
-# the resulting package to bootstrap a non-graphviz build.
-# Sorry in advance to the Slackware From Scratch folks.
+# Don't use graphviz if it's not on the system.
if ! /bin/ls /usr/man/man7/graphviz.7.gz 1> /dev/null 2> /dev/null ; then
zcat $CWD/disable-graphviz.patch.gz | patch -p1 --verbose || exit 1
# The last one doesn't quite do it for 0.42.3.
@@ -111,6 +108,12 @@ CXXFLAGS="$SLKCFLAGS" \
--disable-static \
$GRAPHVIZ_SUPPORT \
--build=$ARCH-slackware-linux || exit 1
+
+# Hack to build if valac isn't already installed:
+if [ ! -r /usr/bin/valac ]; then
+ PATH=$(pwd)/compiler:$PATH
+fi
+
make $NUMJOBS || make || exit 1
make install DESTDIR=$PKG || exit 1