diff options
-rw-r--r-- | libre/pacman/PKGBUILD | 10 | ||||
-rw-r--r-- | libre/pacman/config.site | 9 |
2 files changed, 3 insertions, 16 deletions
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index 9170adaf1..6c3d1a12d 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -3,7 +3,7 @@ pkgname=pacman pkgver=3.5.4 -pkgrel=4 +pkgrel=4.1 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64' 'mips64el') url="http://www.archlinux.org/pacman/" @@ -20,8 +20,7 @@ source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz pacman.conf.x86_64 pacman.conf.mips64el makepkg.conf - 0001-makepkg-fix-removing-symbolic-link.patch - config.site) + 0001-makepkg-fix-removing-symbolic-link.patch) # keep an upgrade path for older installations PKGEXT='.pkg.tar.gz' @@ -63,8 +62,6 @@ package() { mychost="mips64el-unknown-linux-gnu" myflags="-O2 -march=loongson2f -mabi=n32 -pipe -mplt -Wa,-mfix-loongson2f-nop -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2" myldflags="-Wl,--as-needed" - install -m644 $srcdir/config.site $pkgdir/etc - install -m644 $srcdir/config.site $pkgdir/usr/share ;; esac install -m644 $srcdir/makepkg.conf $pkgdir/etc/ @@ -88,5 +85,4 @@ md5sums=('2dd3a85d55ee3dd89abd349aa837447c' '7aaccf24479f396d4a5987c8ccd2f3a2' '150a2854816cd67b1608e00f99701c1c' 'be10d3d2e533515a0470237761415568' - '749a4ddc6d8418d8d031f1c9b4e09d6f' - 'ffdc154c1af4f52870874d553b7d439a') + '749a4ddc6d8418d8d031f1c9b4e09d6f') diff --git a/libre/pacman/config.site b/libre/pacman/config.site deleted file mode 100644 index 44f8a58ba..000000000 --- a/libre/pacman/config.site +++ /dev/null @@ -1,9 +0,0 @@ -# Use ABI-specific libdir on mips64el. - -if [ $(uname -m) = mips64 -a "$libdir" = '${exec_prefix}/lib' ]; then - case "$CFLAGS" in - *mabi=32*) libdir='${exec_prefix}/lib';; - *mabi=n32*) libdir='${exec_prefix}/lib32';; - *mabi=64*) libdir='${exec_prefix}/lib64';; - esac -fi |