summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD16
2 files changed, 8 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3ddb545d581c..70b0e3be8eb4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = android-x86-libsasl
pkgdesc = Cyrus Simple Authentication Service Layer (SASL) library (Android, x86)
pkgver = 2.1.28
- pkgrel = 1
+ pkgrel = 4
url = https://www.cyrusimap.org/sasl/
arch = any
groups = android-libsasl
diff --git a/PKGBUILD b/PKGBUILD
index cd99df0475de..ad5e627a12f0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ _android_arch=x86
pkgname=android-${_android_arch}-libsasl
pkgver=2.1.28
-pkgrel=1
+pkgrel=4
arch=('any')
pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library (Android, ${_android_arch})"
url="https://www.cyrusimap.org/sasl/"
@@ -20,7 +20,7 @@ makedepends=('android-configure'
"android-${_android_arch}-postgresql"
"android-${_android_arch}-sqlite")
options=(!strip !buildflags staticlibs !emptydirs)
-source=("https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-$pkgver/cyrus-sasl-$pkgver.tar.gz"{,.sig}
+source=("https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-${pkgver}/cyrus-sasl-${pkgver}.tar.gz"{,.sig}
'0001-Add-missing-headers.patch'
'0002-Disable-endpwent.patch')
md5sums=('6f228a692516f5318a64505b46966cfa'
@@ -33,7 +33,7 @@ validpgpkeys=(
)
prepare() {
- cd "${srcdir}/cyrus-sasl-$pkgver"
+ cd "${srcdir}/cyrus-sasl-${pkgver}"
source android-env ${_android_arch}
patch -Np1 -i ../0001-Add-missing-headers.patch
@@ -46,7 +46,7 @@ prepare() {
}
build() {
- cd "${srcdir}/cyrus-sasl-$pkgver"
+ cd "${srcdir}/cyrus-sasl-${pkgver}"
source android-env ${_android_arch}
export CFLAGS="${CFLAGS} -DHAVE_TIME_H=1"
@@ -70,7 +70,6 @@ build() {
--enable-login \
--enable-ntlm \
--enable-plain \
- --enable-shared \
--enable-sql \
--disable-krb4 \
--disable-macos-framework \
@@ -78,7 +77,6 @@ build() {
--disable-passdss \
--disable-srp \
--disable-srp-setpass \
- --disable-static \
--disable-sample \
--with-dblib=gdbm \
--with-ldap \
@@ -91,12 +89,12 @@ build() {
}
package() {
- cd "${srcdir}/cyrus-sasl-$pkgver"
+ cd "${srcdir}/cyrus-sasl-${pkgver}"
source android-env ${_android_arch}
make DESTDIR="$pkgdir" install
rm -rf "${pkgdir}/${ANDROID_PREFIX_BIN}"
rm -rf "${pkgdir}/${ANDROID_PREFIX_SHARE}"
- ${ANDROID_STRIP} -g --strip-unneeded "${pkgdir}"/${ANDROID_PREFIX_LIB}/*.so
- ${ANDROID_STRIP} -g --strip-unneeded "${pkgdir}"/${ANDROID_PREFIX_LIB}/sasl2/*.so
+ find "${pkgdir}/${ANDROID_PREFIX_LIB}" -type f -name '*.so' -exec ${ANDROID_STRIP} -g --strip-unneeded {} \;
+ find "${pkgdir}/${ANDROID_PREFIX_LIB}" -type f -name '*.a' -exec ${ANDROID_STRIP} -g {} \;
}