diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-08 10:54:13 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-08 10:54:13 -0300 |
| commit | e0981df8c5fce1353e1499a5085e27f92afddcea (patch) | |
| tree | 06de6ad8de74d4b7b040d67f050c1fd43fe83a33 /community/root | |
| parent | 97a74a6a87ccbeb5649f226377d0c10ae824f1e1 (diff) | |
| parent | 0f9e4ba23bb6296d8bb8010f70d868fd08db9c54 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/curlftpfs/PKGBUILD
core/libcap/PKGBUILD
core/libsasl/PKGBUILD
core/udev/PKGBUILD
extra/cyrus-sasl/PKGBUILD
extra/dbus/PKGBUILD
extra/fluidsynth/PKGBUILD
extra/mercurial/PKGBUILD
extra/redland/PKGBUILD
extra/soprano/PKGBUILD
multilib/lib32-curl/PKGBUILD
multilib/lib32-freetype2/PKGBUILD
multilib/lib32-mesa/PKGBUILD
multilib/wine/PKGBUILD
Diffstat (limited to 'community/root')
| -rw-r--r-- | community/root/PKGBUILD | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/community/root/PKGBUILD b/community/root/PKGBUILD index cfea810b2..d85a132a4 100644 --- a/community/root/PKGBUILD +++ b/community/root/PKGBUILD @@ -3,7 +3,7 @@ pkgname=root pkgver=5.30.00 -pkgrel=2 +pkgrel=5 pkgdesc='C++ data analysis framework and interpreter from CERN.' arch=('i686' 'x86_64' 'mips64el') url='http://root.cern.ch' @@ -40,7 +40,15 @@ build() { # python2 switch find . -type f -exec sed -i -e 's/python -O/python2 -O/g' -e 's/python -c/python2 -c/g' {} \; - sed -i 's/python 2/python2 2/g' configure + sed \ + -e 's/python 2/python2 2/g' \ + -i configure + sed \ + -e 's/python $(pkgpyexecdir)/python2 $(pkgpyexecdir)/g' \ + -i cint/reflex/python/genreflex/Makefile.am + sed \ + -e 's/python /python2 /' \ + -i config/genreflex.in config/genreflex-rootcint.in ./configure \ ${TARGET} \ @@ -58,7 +66,8 @@ build() { --enable-roofit \ --enable-python \ --with-python-incdir=/usr/include/python2.7 \ - --with-python-libdir=/usr/lib + --with-python-libdir=/usr/lib \ + --enable-explicitlink # move from aur #--disable-builtin-afterimage \ |