summaryrefslogtreecommitdiff
path: root/system/guix/guix.SlackBuild
diff options
context:
space:
mode:
Diffstat (limited to 'system/guix/guix.SlackBuild')
-rw-r--r--system/guix/guix.SlackBuild35
1 files changed, 19 insertions, 16 deletions
diff --git a/system/guix/guix.SlackBuild b/system/guix/guix.SlackBuild
index bed37f5e06..2f1dacbcbf 100644
--- a/system/guix/guix.SlackBuild
+++ b/system/guix/guix.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for Guix
-# Copyright 2015 Hunter Sezen California, USA
+# Copyright 2015-2016 Hunter Sezen California, 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=guix
-VERSION=${VERSION:-0.9.0}
+VERSION=${VERSION:-0.11.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,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -72,18 +72,19 @@ find -L . \
# To share the store with nix
SHARE=${SHARE:-no}
if [ "${SHARE:-yes}" = "yes" ]; then
- share="--with-store-dir=/nix/store"
- var="--localstatedir=/nix/var"
+ share="--with-store-dir=/nix/store"
+ var="--localstatedir=/nix/var"
else
- var="--localstatedir=/var"
+ var="--localstatedir=/var"
fi
# To use the nix-daemon instead of the guix-daemon
NIX=${NIX:-no}
-if [ "${NIX:-yes}" = "yes" ]; then nix="--disable-daemon"; else nix=""; fi
-
-# https://www.mail-archive.com/guix-commits@gnu.org/msg12674.html
-zcat $CWD/pypi-guile-json.diff.gz | patch -p1
+if [ "${NIX:-yes}" = "yes" ]; then
+ nix="--disable-daemon"
+else
+ nix=""
+fi
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
@@ -98,7 +99,7 @@ CXXFLAGS="$SLKCFLAGS" \
--host=$ARCH-slackware-linux \
$nix \
$share \
- $var \
+ $var
make
make install DESTDIR=$PKG
@@ -115,11 +116,13 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
rm -f $PKG/usr/info/dir
gzip -9 $PKG/usr/info/*.info*
-rm -fr $PKG/usr/lib${LIBDIRSUFFIX}/systemd
+for i in systemd upstart; do rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/$i; done
+
+DOCS="ABOUT-NLS AUTHORS CODE-OF-CONDUCT COPYING ChangeLog HACKING INSTALL NEWS \
+ README ROADMAP THANKS TODO"
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ABOUT-NLS AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README ROADMAP THANKS TODO \
- $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install