Add archs and keep headers intact

1 files changed, 22 insertions, 19 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 4ce9502b910d..920b7c31adff 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,44 @@
-# Maintainer: Issam Maghni <me at concati dot me>
+# Maintainer: Issam E. Maghni <issam.e.maghni at mailbox dot org>
 
 pkgname=bearssl
 pkgver=0.6
-pkgrel=2
+pkgrel=3
 pkgdesc='Implementation of the SSL/TLS protocol (RFC 5246) written in C'
-arch=('x86_64')
+arch=('i486' 'i686' 'pentium4' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
 url='https://bearssl.org'
 depends=('glibc')
 license=('MIT')
-source=("$url/$pkgname-$pkgver.tar.gz")
+source=("${url}/${pkgname}-${pkgver}.tar.gz")
 sha256sums=('6705bba1714961b41a728dfc5debbe348d2966c117649392f8c8139efc83ff14')
 
 build() {
-	make -C"$pkgname-$pkgver" CFLAGS="$CFLAGS -fpic" LDFLAGS="$LDFLAGS" D=".so.$pkgver" \
-		LDDLLFLAGS="$LDFLAGS -shared -Wl,-soname,lib$pkgname.so.${pkgver%%.*}"
+	cd "./${pkgname}-${pkgver}"
+	make CFLAGS="${CFLAGS} -fpic" \
+	     LDFLAGS="$LDFLAGS" \
+	     LDDLLFLAGS="${LDFLAGS} -shared -Wl,-soname,lib${pkgname}.so.${pkgver%%.*}" \
+	     D=".so.${pkgver}"
 }
 
 check() {
-	cd "$pkgname-$pkgver/build"
+	cd "./${pkgname}-${pkgver}/build"
 	./testcrypto all
 	./testx509
 }
 
 package() {
-	mkdir -p "$pkgdir/usr/bin" "$pkgdir/usr/lib" "$pkgdir/usr/include/$pkgname" "$pkgdir/usr/share/licenses/$pkgname"
-	cd "$pkgname-$pkgver/build"
+	mkdir -p "${pkgdir}/usr/bin" "${pkgdir}/usr/lib" "${pkgdir}/usr/share/licenses/${pkgname}" # "${pkgdir}/usr/include/${pkgname}"
+	cd "./${pkgname}-${pkgver}/build"
 
-	# fix includes
-	sed -e 's|"bearssl_|"bearssl/|g' -i ../inc/*
-	mv ../inc/bearssl.h "$pkgdir/usr/include"
-	for h in ../inc/*
-	do  mv $h "$pkgdir/usr/include/bearssl/${h#*_}"
+	# ideally, we should encapsulate headers in a namespace, but not now
+	#sed -i 's|"bearssl_|"bearssl/|g' ../inc/*
+	cp '../inc/bearssl.h' "${pkgdir}/usr/include"
+	for h in ../inc/*; do
+		cp "$h" "${pkgdir}/usr/include" # "${pkgdir}/usr/include/bearssl/${h#*_}"
 	done
 
-	mv ../LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname"
-	mv brssl "$pkgdir/usr/bin"
-	mv  "lib$pkgname.so.$pkgver" "lib$pkgname.a" "$pkgdir/usr/lib"
-	ln -s "lib$pkgname.so.$pkgver" "$pkgdir/usr/lib/lib$pkgname.so.${pkgver%%.*}"
-	ln -s "lib$pkgname.so.${pkgver%%.*}" "$pkgdir/usr/lib/lib$pkgname.so"
+	cp '../LICENSE.txt' "${pkgdir}/usr/share/licenses/${pkgname}"
+	cp './brssl' "${pkgdir}/usr/bin"
+	cp  "./lib${pkgname}.so.${pkgver}" "./lib${pkgname}.a" "${pkgdir}/usr/lib"
+	ln -s "lib${pkgname}.so.${pkgver}"     "${pkgdir}/usr/lib/lib${pkgname}.so.${pkgver%%.*}"
+	ln -s "lib${pkgname}.so.${pkgver%%.*}" "${pkgdir}/usr/lib/lib${pkgname}.so"
 }