diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2011-10-31 21:20:17 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2011-10-31 21:20:17 +0100 |
| commit | 198654a24cc0e99e96cb9e908c8ab0ab82863d50 (patch) | |
| tree | 2de2f03ef97637322e6364a10077dc6cfa3685a4 /libre/pacman | |
| parent | 97a832ff546d30bb6eec34f23fd94aecab9ac738 (diff) | |
Use ABI-specific libdir when building with new pacman.
Diffstat (limited to 'libre/pacman')
| -rw-r--r-- | libre/pacman/PKGBUILD | 18 | ||||
| -rw-r--r-- | libre/pacman/config.site | 9 |
2 files changed, 20 insertions, 7 deletions
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index 29d7d2b9c..6a803e220 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -20,7 +20,8 @@ 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) + 0001-makepkg-fix-removing-symbolic-link.patch + config.site) # keep an upgrade path for older installations PKGEXT='.pkg.tar.gz' @@ -61,7 +62,9 @@ package() { mycarch="mips64el" 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="" + 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/ @@ -80,9 +83,10 @@ package() { } # vim: set ts=2 sw=2 et: -md5sums=('c36c18ed4d8ec69c0ecb4f9684266901' - 'c7e6dbee04b7c492febea4366519b91d' - '8809642ed398d2b9b98c5974b8b5e348' - '3b2e740853e3d1463885675809d4c6ff' +md5sums=('2dd3a85d55ee3dd89abd349aa837447c' + 'ba85525fe868f030bef209b0487dd5a5' + '7aaccf24479f396d4a5987c8ccd2f3a2' + '150a2854816cd67b1608e00f99701c1c' 'be10d3d2e533515a0470237761415568' - '15d09319fae475f20ba11dd56e832c65') + '749a4ddc6d8418d8d031f1c9b4e09d6f' + '867f79028e6c4c87f8f4e29e283b2f4c') diff --git a/libre/pacman/config.site b/libre/pacman/config.site new file mode 100644 index 000000000..acd7737f0 --- /dev/null +++ b/libre/pacman/config.site @@ -0,0 +1,9 @@ +# 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 |