diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-18 10:54:09 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-18 10:54:09 +0200 |
commit | d4a02502a9a74a21bc0ca0a0fa9813efe0fe70f4 (patch) | |
tree | 3e5dfb37d192bd42d9218934800e1f5aeeb0990e /core/readline | |
parent | 16d51ac66fa18675d49ef64f4a3c1dbe53b5711a (diff) | |
parent | 637c1cfdcd258a870ad5367cbf47a8a2799039c7 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/shotwell/PKGBUILD
community/recoll/PKGBUILD
cross/cross-mips64el-unknown-linux-gnu-gcc-core/PKGBUILD
cross/cross-mips64el-unknown-linux-gnu-glibc-headers/PKGBUILD
cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.12.2-ignore-origin-of-privileged-program.patch
cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-__i686.patch
cross/mips64el-unknown-linux-gnu-binutils/PKGBUILD
cross/mips64el-unknown-linux-gnu-glibc/PKGBUILD
cross/mips64el-unknown-linux-gnu-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
cross/mips64el-unknown-linux-gnu-glibc/glibc-__i686.patch
staging/nx-common/PKGBUILD
staging/nx/PKGBUILD
testing/devhelp/PKGBUILD
testing/empathy/PKGBUILD
testing/evolution-data-server/PKGBUILD
testing/evolution-ews/PKGBUILD
testing/evolution-exchange/PKGBUILD
testing/evolution/PKGBUILD
testing/folks/PKGBUILD
testing/gcr/PKGBUILD
testing/gnome-control-center/PKGBUILD
testing/gnome-desktop/PKGBUILD
testing/gnome-documents/PKGBUILD
testing/gnome-keyring/PKGBUILD
testing/gnome-panel/PKGBUILD
testing/gnome-session/PKGBUILD
testing/gnome-settings-daemon/PKGBUILD
testing/gnome-terminal/PKGBUILD
testing/gnome-themes-standard/PKGBUILD
testing/gthumb/PKGBUILD
testing/gtkhtml4/PKGBUILD
testing/gtksourceview3/PKGBUILD
testing/gvfs/PKGBUILD
testing/libgnome-keyring/PKGBUILD
testing/librsvg/PKGBUILD
testing/librsvg/librsvg.install
testing/mousetweaks/PKGBUILD
testing/seahorse/PKGBUILD
testing/sushi/PKGBUILD
testing/totem-plparser/PKGBUILD
testing/totem/PKGBUILD
testing/vte3/PKGBUILD
Diffstat (limited to 'core/readline')
-rw-r--r-- | core/readline/PKGBUILD | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/core/readline/PKGBUILD b/core/readline/PKGBUILD index e86d50fcb..b2f59ddbc 100644 --- a/core/readline/PKGBUILD +++ b/core/readline/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 143254 2011-11-24 01:36:28Z allan $ +# $Id: PKGBUILD 156214 2012-04-16 06:12:04Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> @@ -6,7 +6,7 @@ pkgname=readline _basever=6.2 _patchlevel=002 #prepare for some patches pkgver=$_basever.$_patchlevel -pkgrel=1 +pkgrel=2 pkgdesc="GNU readline library" arch=('i686' 'x86_64' 'mips64el') url="http://tiswww.case.edu/php/chet/readline/rltop.html" @@ -43,7 +43,7 @@ build() { # build with -fPIC for x86_64 (FS#15634) [ $CARCH == "x86_64" ] && CFLAGS="$CFLAGS -fPIC" - ./configure --prefix=/usr --libdir=/lib + ./configure --prefix=/usr make SHLIB_LIBS=-lncurses } @@ -52,13 +52,4 @@ package() { make DESTDIR=${pkgdir} install install -Dm644 ${srcdir}/inputrc ${pkgdir}/etc/inputrc - - # FHS recommends only shared libs in /lib - install -dm755 $pkgdir/usr/lib - mv $pkgdir/lib/*.a $pkgdir/usr/lib - - # to make the linker find the shared lib and fix compile issues - cd ${pkgdir}/usr/lib - ln -sv /lib/libreadline.so . - ln -sv /lib/libhistory.so . } |