summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorWilly Sudiarto Raharjo <willysr@slackbuilds.org>2013-11-19 08:13:22 +0700
committerRobby Workman <rworkman@slackbuilds.org>2013-11-19 01:10:16 -0600
commit06fe5e3cdbe65e0718e4397bd637df0a93ac1a69 (patch)
treefe5de5cf19c7c6a088158ae6617e0196c8ec72eb /graphics
parent7a005f99f92dcf5a35bcbc40aa20cc7f14fef2b7 (diff)
downloadslackbuilds-06fe5e3cdbe65e0718e4397bd637df0a93ac1a69.tar.gz
graphics/lilypond: Add LDFLAGS to work with guile1.8
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'graphics')
-rw-r--r--graphics/lilypond/lilypond.SlackBuild14
-rw-r--r--graphics/lilypond/lilypond.info2
2 files changed, 13 insertions, 3 deletions
diff --git a/graphics/lilypond/lilypond.SlackBuild b/graphics/lilypond/lilypond.SlackBuild
index cc2ba85eae..428f16b0c4 100644
--- a/graphics/lilypond/lilypond.SlackBuild
+++ b/graphics/lilypond/lilypond.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=lilypond
VERSION=${VERSION:-2.16.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -65,10 +65,20 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
-chmod -R u+w,go-w,a+rX-st .
+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 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+sed -i 's|GUILE_CFLAGS=.*|GUILE_CFLAGS="`pkg-config --cflags guile-1.8`"|' configure
+sed -i 's|GUILE_LDFLAGS=.*|GUILE_LDFLAGS="`pkg-config --libs guile-1.8`"|' configure
+
+export GUILE=/usr/bin/guile1.8
+export GUILE_CONFIG=/usr/bin/guile-config1.8
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
+LDFLAGS="-lX11 -lpthread" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/graphics/lilypond/lilypond.info b/graphics/lilypond/lilypond.info
index 7fe06b4fdd..9aaaf0ccbd 100644
--- a/graphics/lilypond/lilypond.info
+++ b/graphics/lilypond/lilypond.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://download.linuxaudio.org/lilypond/sources/v2.16/lilypond-2.16.2.
MD5SUM="6db27f17d47e4f66a3b0716c65db3041"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="fontforge mftrace"
+REQUIRES="fontforge mftrace guile1.8"
MAINTAINER="Kyle Guinn"
EMAIL="elyk03@gmail.com"