diff options
Diffstat (limited to 'libre/pacman')
| -rw-r--r-- | libre/pacman/PKGBUILD | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index 9c19b4c82..3513376cb 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -1,5 +1,4 @@ # vim: set ts=2 sw=2 et: -# $Id$ # Maintainer (Arch): Dan McGee <dan@archlinux.org> # Maintainer (Arch): Dave Reisner <dreisner@archlinux.org> # Contributor (Hyperbola): André Silva <emulatorman@hyperbola.info> @@ -10,9 +9,9 @@ # Contributor: Daniel Milewski <niitotantei@riseup.net> pkgname=pacman -pkgver=5.1.1 -pkgrel=1 -pkgrel+=.parabola7 +pkgver=5.1.2 +pkgrel=2 +pkgrel+=.par1 pkgdesc="A library-based package manager with dependency support" arch=('x86_64') arch+=('i686' 'armv7h') @@ -25,7 +24,10 @@ depends=('bash' 'glibc' 'libarchive' 'curl' depends+=('parabola-keyring' 'archlinuxarm-keyring' 'archlinux32-keyring') makedepends=('asciidoc') checkdepends=('python2' 'fakechroot') -optdepends=('perl-locale-gettext: translation support in makepkg-template') +optdepends=('perl-locale-gettext: translation support in makepkg-template' + 'xdelta3: delta support in repo-add') +backup=(etc/pacman.conf + etc/makepkg.conf) provides=('pacman-parabola') conflicts=('pacman-parabola') replaces=('pacman-parabola') @@ -34,7 +36,6 @@ options=('strip' 'debug') validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD' # Allan McRae <allan@archlinux.org> 'B8151B117037781095514CA7BBDFFC92306B1121') # Andrew Gregory (pacman) <andrew@archlinux.org> source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig} - ltmain-asneeded.patch::"https://git.archlinux.org/pacman.git/plain/build-aux/ltmain-asneeded.patch?id=28cb22e3c20676c42a08593b5553ee896b53e030" "${arch[@]/#/pacman.conf.}" makepkg.conf.in pacman-keyring.service @@ -47,9 +48,8 @@ source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig source_armv7h=(0001-Sychronize-filesystem.patch 0002-Revert-close-stdin-before-running-install-scripts.patch 0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch) -sha256sums=('be04b9162d62d2567e21402dcbabb5bedfdb03909fa5ec6e8568e02ab325bd8d' +sha256sums=('ce4eef1585fe64fd1c65c269e263577261edd7535fe2278240103012d74b6ef6' 'SKIP' - '8e29d09b8ccf78eda393c44acc027b7b6125d89e5a586ad78991752fc9e62a8c' '53c3d28314fd8fc6f92a0720c41fc5bd4c7b24793f84158d07988b294c5480a2' '6baddd5a4651f147b9412d86dc8c5b4763e4f34deaf140a7fb986fb4d4a05949' '435f4e93355048f83697317b35aad7788162bab5f58f1b9268bc83ad03ed41d8' @@ -86,14 +86,6 @@ prepare() { # failing). Backported because some Parabola packages actually use # whirlpoolsums. patch -p1 -i ../0001-Revert-makepkg-add-whirlpool-to-the-list-of-hashing-.patch - - # Because a Makefile.am was edited by - # 0001-makepkg-Better-error-messages-for-versions-in-check-.patch - # - # This is based of of the 'autogen.sh' script, which is in - # pacman.it, but not included in the tarball. - autoreconf -i - patch -d build-aux -Np0 -i "$srcdir/ltmain-asneeded.patch" } build() { @@ -112,17 +104,17 @@ build() { i686) mycarch="i686" mychost="i686-pc-linux-gnu" - myflags="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt" + myflags="-march=i686 -mtune=generic -O2 -pipe -fno-plt" ;; x86_64) mycarch="x86_64" mychost="x86_64-pc-linux-gnu" - myflags="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt" + myflags="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt" ;; armv7h) mycarch="armv7h" mychost="armv7l-unknown-linux-gnueabihf" - myflags="-march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -O2 -pipe -fstack-protector-strong -fno-plt" + myflags="-march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -O2 -pipe -fno-plt" ;; esac myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now" |