diff options
| author | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-12-24 22:36:10 -0600 |
|---|---|---|
| committer | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-12-24 22:36:10 -0600 |
| commit | 14f1f7de0e32b27172968722644d5dbced226f52 (patch) | |
| tree | 251a5208ec65fd5551cb2ca7dab3afaf096e0409 /libre/pacman/PKGBUILD | |
| parent | ebef5099cd5f2ec0686b8f46d389c43ea5a53cac (diff) | |
| parent | 27fcef2038e5275af70e08f3f7249767b69a3e92 (diff) | |
Merge remote-tracking branch 'libre/master'
Conflicts:
libre/aspell-pl-libre/PKGBUILD
libre/audacious-plugins-libre/PKGBUILD
libre/icecat/PKGBUILD
libre/kdeutils-libre/PKGBUILD
libre/lame-libre/PKGBUILD
libre/linux-libre/PKGBUILD
libre/linux-libre/linux-libre.install
libre/metalog/PKGBUILD
libre/p7zip-libre/PKGBUILD
libre/pacman/PKGBUILD
libre/sdl-libre/PKGBUILD
libre/texlive-bin-libre/PKGBUILD
libre/thunderbird-libre/PKGBUILD
social/batctl/PKGBUILD
social/ffingerd/PKGBUILD
social/libowfat/PKGBUILD
social/miniupnpc/PKGBUILD
social/opentracker/PKGBUILD
~lukeshu/android-udev/51-android.rules
~lukeshu/android-udev/PKGBUILD
~lukeshu/openni-unstable/PKGBUILD
~mtjm/zbar/PKGBUILD
Diffstat (limited to 'libre/pacman/PKGBUILD')
| -rw-r--r-- | libre/pacman/PKGBUILD | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index c8b423486..dd0ff5fda 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -3,7 +3,11 @@ pkgname=pacman pkgver=3.5.4 +<<<<<<< HEAD pkgrel=4.2 +======= +pkgrel=4 +>>>>>>> libre/master pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64' 'mips64el') url="http://www.archlinux.org/pacman/" @@ -21,6 +25,15 @@ source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz pacman.conf.mips64el makepkg.conf 0001-makepkg-fix-removing-symbolic-link.patch) +<<<<<<< HEAD +======= +md5sums=('2dd3a85d55ee3dd89abd349aa837447c' + 'ba85525fe868f030bef209b0487dd5a5' + '7aaccf24479f396d4a5987c8ccd2f3a2' + '150a2854816cd67b1608e00f99701c1c' + 'be10d3d2e533515a0470237761415568' + '749a4ddc6d8418d8d031f1c9b4e09d6f') +>>>>>>> libre/master # keep an upgrade path for older installations PKGEXT='.pkg.tar.gz' @@ -61,7 +74,11 @@ 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" +<<<<<<< HEAD myldflags="-Wl,--as-needed" +======= + myldflags="" +>>>>>>> libre/master ;; esac install -m644 $srcdir/makepkg.conf $pkgdir/etc/ |