From cc50262cddf7f8d89371a7880e03712f77d363f7 Mon Sep 17 00:00:00 2001 From: Sergej Pupykin <spupykin@archlinux.org> Date: Tue, 4 Jun 2013 14:18:42 +0000 Subject: [PATCH] upd --- PKGBUILD | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 7dc8f50..58d4644 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,12 +5,12 @@ pkgname=lilypond pkgver=2.16.2 -pkgrel=1 +pkgrel=3 pkgdesc="An automated music engraving system" arch=('i686' 'x86_64') url="http://lilypond.org" license=('GPL') -depends=('guile' 'python2' 'texlive-core' 'ghostscript' 'pango' 'fontconfig') +depends=('guile1.8' 'python2' 'texlive-core' 'ghostscript' 'pango' 'fontconfig') makedepends=('flex' 'bison' 'gettext' 'mftrace' 'texinfo' 'fontforge' 't1utils' 'gsfonts' 'texi2html') options=('emptydirs') @@ -18,7 +18,7 @@ install=lilypond.install source=(http://download.linuxaudio.org/lilypond/sources/v2.16/$pkgname-$pkgver.tar.gz) md5sums=('6db27f17d47e4f66a3b0716c65db3041') -build() { +prepare() { cd "$srcdir/$pkgname-$pkgver" # python2 fix @@ -27,9 +27,18 @@ build() { sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file done + 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 + rm -rf python/out/ +} - PYTHON=/usr/bin/python2 ./configure --prefix=/usr +build() { + cd "$srcdir/$pkgname-$pkgver" + export PYTHON=/usr/bin/python2 + export GUILE=/usr/bin/guile1.8 + export GUILE_CONFIG=/usr/bin/guile-config1.8 + ./configure --prefix=/usr --disable-documentation make } -- GitLab