diff options
author | shackra <elcorreo@deshackra.com> | 2014-05-18 23:19:29 -0600 |
---|---|---|
committer | shackra <elcorreo@deshackra.com> | 2014-05-18 23:19:29 -0600 |
commit | 113793e5d19301552423a95947efc704424a7167 (patch) | |
tree | c1804e43e11d5f9a152436b42a7ce182e88d500b /libre/pacman/PKGBUILD | |
parent | 01011325d60e0262ba0d5a51c4d3b2be57f5924c (diff) | |
parent | 1287ab2629ed3997b6ec6e603847eafb1e6aa199 (diff) | |
download | abslibre-113793e5d19301552423a95947efc704424a7167.tar.gz abslibre-113793e5d19301552423a95947efc704424a7167.tar.bz2 abslibre-113793e5d19301552423a95947efc704424a7167.zip |
Merge branch 'master' of ssh://projects.parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'libre/pacman/PKGBUILD')
-rw-r--r-- | libre/pacman/PKGBUILD | 45 |
1 files changed, 23 insertions, 22 deletions
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index 15d16466d..8fb58771b 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -1,11 +1,11 @@ # vim: set ts=2 sw=2 et: -# $Id: PKGBUILD 202690 2013-12-24 21:35:48Z dreisner $ -# Maintainer: Dan McGee <dan@archlinux.org> -# Maintainer: Dave Reisner <dreisner@archlinux.org> +# $Id: PKGBUILD 211992 2014-05-04 02:54:25Z allan $ +# Maintainer (Arch): Dan McGee <dan@archlinux.org> +# Maintainer (Arch): Dave Reisner <dreisner@archlinux.org> pkgname=pacman pkgver=4.1.2 -pkgrel=5.2 +pkgrel=6 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64' 'mips64el') url="http://www.archlinux.org/pacman/" @@ -33,7 +33,7 @@ md5sums=('063c8b0ff6bdf903dc235445525627cd' 'f0f310df411f943dbc4e2dd376c88662') build() { - cd $srcdir/$pkgname-$pkgver + cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --enable-doc \ @@ -48,47 +48,48 @@ check() { } package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install - make DESTDIR=$pkgdir -C contrib install + cd "$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C contrib install # install Arch specific stuff - install -dm755 $pkgdir/etc - install -m644 $srcdir/pacman.conf.$CARCH $pkgdir/etc/pacman.conf - - case "$CARCH" in + install -dm755 "$pkgdir/etc" + install -m644 "$srcdir/pacman.conf.$CARCH" "$pkgdir/etc/pacman.conf" + + case $CARCH in i686) mycarch="i686" mychost="i686-pc-linux-gnu" - myflags="-march=i686 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4" + myflags="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong --param=ssp-buffer-size=4" myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu" ;; x86_64) mycarch="x86_64" mychost="x86_64-unknown-linux-gnu" - myflags="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4" + myflags="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong --param=ssp-buffer-size=4" myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu" ;; mips64el) mycarch="mips64el" mychost="mips64el-unknown-linux-gnu" - myflags="-O2 -march=mips3 -mtune=loongson2f -mabi=n32 -pipe -mplt -Wa,-mfix-loongson2f-nop -fstack-protector --param=ssp-buffer-size=4" + myflags="-O2 -march=mips3 -mtune=loongson2f -mabi=n32 -pipe -mplt -Wa,-mfix-loongson2f-nop -fstack-protector-strong --param=ssp-buffer-size=4" myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro" ;; esac - install -m644 $srcdir/makepkg.conf $pkgdir/etc/ + # set things correctly in the default conf file - sed -i $pkgdir/etc/makepkg.conf \ + install -m644 "$srcdir/makepkg.conf" "$pkgdir/etc" + sed -i "$pkgdir/etc/makepkg.conf" \ -e "s|@CARCH[@]|$mycarch|g" \ -e "s|@CHOST[@]|$mychost|g" \ -e "s|@LDFLAGS[@]|$myldflags|g" \ -e "s|@CARCHFLAGS[@]|$myflags|g" - + # put bash_completion in the right location - install -dm755 ${pkgdir}/usr/share/bash-completion/completions - mv ${pkgdir}/etc/bash_completion.d/pacman \ - ${pkgdir}/usr/share/bash-completion/completions - rmdir ${pkgdir}/etc/bash_completion.d + install -dm755 "$pkgdir/usr/share/bash-completion/completions" + mv "$pkgdir/etc/bash_completion.d/pacman" "$pkgdir/usr/share/bash-completion/completions" + rmdir "$pkgdir/etc/bash_completion.d" for f in makepkg pacman-key; do ln -s pacman "$pkgdir/usr/share/bash-completion/completions/$f" |