aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2020-10-21 12:24:08 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2020-10-21 12:25:33 +0000
commit12768dcbda1853f1dbb980f9e9df8320fe64cff1 (patch)
tree7d575e01ea9475de8e47efcb71d6e415b391de00
parent9de348c8a380524d77e318198e8d208bfaa7d15f (diff)
downloadaports-12768dcbda1853f1dbb980f9e9df8320fe64cff1.tar.gz
aports-12768dcbda1853f1dbb980f9e9df8320fe64cff1.tar.bz2
aports-12768dcbda1853f1dbb980f9e9df8320fe64cff1.tar.xz
main/gnupg1: remove provides for gnupg
don't let gnupg1 provide gnupg so that gnupg-2.x is used. also add -fcommon to build with gcc 10.
-rw-r--r--main/gnupg1/APKBUILD22
1 files changed, 5 insertions, 17 deletions
diff --git a/main/gnupg1/APKBUILD b/main/gnupg1/APKBUILD
index b945e9a737..eaeaaf0de9 100644
--- a/main/gnupg1/APKBUILD
+++ b/main/gnupg1/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gnupg1
pkgver=1.4.23
-pkgrel=0
+pkgrel=1
pkgdesc="GNU Privacy Guard 1 - a PGP replacement tool"
url="http://www.gnupg.org/"
arch="all"
@@ -10,8 +10,6 @@ depends="pinentry"
makedepends="curl-dev libassuan libksba-dev libgcrypt-dev libgpg-error-dev
zlib-dev libassuan-dev"
subpackages="$pkgname-doc"
-provides="gnupg=$pkgver-r$pkgrel"
-replaces="gnupg"
source="https://www.gnupg.org/ftp/gcrypt/gnupg/gnupg-$pkgver.tar.bz2"
# secfixes:
@@ -23,20 +21,17 @@ source="https://www.gnupg.org/ftp/gcrypt/gnupg/gnupg-$pkgver.tar.bz2"
builddir="$srcdir/gnupg-$pkgver"
prepare() {
default_prepare
- cd "$builddir"
# Fix PIC definitions
sed -i -e 's:PIC:__PIC__:' \
mpi/i386/mpih-add1.S \
mpi/i386/mpih-sub1.S \
- intl/relocatable.c \
- || return 1
+ intl/relocatable.c
}
build() {
cd "$builddir"
- export CFLAGS="$CFLAGS -g"
- ./configure \
+ CFLAGS="$CFLAGS -g -fcommon" ./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
@@ -44,19 +39,12 @@ build() {
--mandir=/usr/share/man \
--localstatedir=/var \
--disable-nls \
- --enable-noexecstack \
- || return 1
- make || return 1
+ --enable-noexecstack
+ make
}
package() {
- cd "$builddir"
make -j1 DESTDIR="$pkgdir" install
}
-doc() {
- default_doc
- provides="gnupg-doc=$pkgver-r$pkgrel"
-}
-
sha512sums="78dc52a2010202a4afc8814b29fda657a6c9fe230d5e7db11ae040edd2b0ca819e1baa4dbd6c0d04d36cd353df484e83f52d17759d2891c2cf7025c0b5d36612 gnupg-1.4.23.tar.bz2"