summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Demers2017-12-04 16:11:30 -0500
committerAlexandre Demers2017-12-04 16:11:30 -0500
commit45b3d419b96ace5bd2ace908749e01d7b147fa31 (patch)
tree0fcc06489beb21140a9702e358f9895ce3810363
parentd11e3fc49bf98064e2e6b8449e2a14b0b7a5cf90 (diff)
downloadaur-libgcrypt15-git.tar.gz
Clean up PKGBUILD and respect makepkg's build option
Signed-off-by: Alexandre Demers <alexandre.f.demers@gmail.com>
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD30
2 files changed, 22 insertions, 19 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 026c2099c42c..8791467f7f92 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,19 @@
pkgbase = libgcrypt15-git
pkgdesc = General purpose cryptographic library based on the code from GnuPG. Latest commit from 1.5 branch - API version 11.
- pkgver = 1.5.4.r3.g35cd81f
+ pkgver = 1.5.6.r1.g7104edfc
pkgrel = 1
url = http://www.gnupg.org
arch = i686
arch = x86_64
license = GPL2
- makedepends = git
- makedepends = transfig
makedepends = automake
+ makedepends = fig2dev
makedepends = ghostscript
+ makedepends = git
+ depends = glibc
depends = libgpg-error
- provides = libgcrypt=1.5.4.r3.g35cd81f
- provides = libgcrypt15=1.5.4.r3.g35cd81f
+ provides = libgcrypt=1.5.6.r1.g7104edfc
+ provides = libgcrypt15=1.5.6.r1.g7104edfc
conflicts = libgcrypt15
conflicts = libgcrypt11
source = git://git.gnupg.org/libgcrypt.git#branch=LIBGCRYPT-1-5-BRANCH
diff --git a/PKGBUILD b/PKGBUILD
index f4299b4b09d7..f3173f284a5c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,22 @@
# Maintainer: Alexandre Demers <alexandre.f.demers@gmail.com>
_gitname=libgcrypt
+_setPrefix="/usr"
+_setLibdir="$_setPrefix/lib"
pkgname=libgcrypt15-git
-pkgver=1.5.4.r3.g35cd81f
-pkgrel=2
+pkgver=1.5.6.r1.g7104edfc
+pkgrel=1
pkgdesc="General purpose cryptographic library based on the code from GnuPG. Latest commit from 1.5 branch - API version 11."
arch=('i686'
'x86_64')
url="http://www.gnupg.org"
license=('GPL2')
-depends=('libgpg-error')
-makedepends=('git'
- 'transfig'
- 'automake'
- 'ghostscript')
+depends=('glibc'
+ 'libgpg-error')
+makedepends=('automake'
+ 'fig2dev'
+ 'ghostscript'
+ 'git')
provides=("libgcrypt=${pkgver}"
"libgcrypt15=${pkgver}")
conflicts=("libgcrypt15"
@@ -28,19 +31,18 @@ pkgver() {
}
build() {
- _cpucount=$(grep -c processor /proc/cpuinfo 2>/dev/null)
- _jc=$((${_cpucount:-1}))
-
echo "$srcdir/$_gitname"
cd "$srcdir/$_gitname"
./autogen.sh --force
automake --add-missing
./configure --enable-maintainer-mode \
- --prefix=/usr \
+ --prefix=$_setPrefix \
+ --libdir=$_setLibdir \
--disable-static \
--disable-padlock-support
- make -j $_jc
+
+ make
}
# check() {
@@ -52,6 +54,6 @@ package() {
cd "$srcdir/$_gitname"
make DESTDIR="${pkgdir}" install
- rm -rf "$pkgdir"/usr/{bin,include,share}
- rm -rf "$pkgdir"/usr/lib/libgcrypt.so
+ rm -rf "$pkgdir/$_setPrefix"/{bin,include,share}
+ rm -rf "$pkgdir/$_setLibdir"/libgcrypt.so
}