diff options
| author | Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org> | 2014-08-02 00:54:06 +0200 |
|---|---|---|
| committer | Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org> | 2014-08-02 00:54:06 +0200 |
| commit | 9c0c792f6ec077837b1381f777fe69c634d2dc3f (patch) | |
| tree | 51da9cf08cc17a448411979c39919f0cd9855ff6 /main/polarssl | |
| parent | f4252f16e259774095ac22dc397cfedeab41d770 (diff) | |
| download | aports-9c0c792f6ec077837b1381f777fe69c634d2dc3f.tar.bz2 aports-9c0c792f6ec077837b1381f777fe69c634d2dc3f.tar.xz | |
main/polarssl: fix Makefile to correctly build cert_write
Diffstat (limited to 'main/polarssl')
| -rw-r--r-- | main/polarssl/APKBUILD | 18 | ||||
| -rw-r--r-- | main/polarssl/programs.makefile.patch | 22 |
2 files changed, 31 insertions, 9 deletions
diff --git a/main/polarssl/APKBUILD b/main/polarssl/APKBUILD index c7a517a0a2..198be2895c 100644 --- a/main/polarssl/APKBUILD +++ b/main/polarssl/APKBUILD @@ -8,22 +8,19 @@ arch=all url='https://www.polarssl.org/' license='GPL2' subpackages="$pkgname-dev $pkgname-utils" -source="https://polarssl.org/code/releases/polarssl-$pkgver-gpl.tgz" +source="https://polarssl.org/code/releases/polarssl-$pkgver-gpl.tgz + programs.makefile.patch" prepare() { cd "$srcdir"/$pkgname-$pkgver sed -i 's|//\(#define POLARSSL_THREADING_C\)|\1|' include/polarssl/config.h sed -i 's|//\(#define POLARSSL_THREADING_PTHREAD\)|\1|' include/polarssl/config.h + patch -p1 -i ../programs.makefile.patch } build() { cd "$srcdir"/$pkgname-$pkgver LDFLAGS="$LDFLAGS -I../include " make SHARED=1 no_test || return 1 - - # bundled makefile omit this tool completely without good reason - cd programs/x509 - cc -Wall -Wextra -W -Wdeclaration-after-statement cert_write.c \ - -o cert_write -rdynamic ../../library/libpolarssl.a } check() { @@ -45,6 +42,9 @@ utils() { "$subpkgdir"/usr/bin/polarssl_cert_write } -md5sums="d1a2b4f21727e888f143414d2e3144e6 polarssl-1.3.8-gpl.tgz" -sha256sums="318171db41335cacbb5b0047c94f1faf91442ab70a223b5223436703c9406ff1 polarssl-1.3.8-gpl.tgz" -sha512sums="e1bf2b111510582ebf071b11d9d0663fbd02ac61f6ded9611e2f0eb5ff64b421d72768dd94ec5e52353d3bde06bc62d673211c26debab2cd7b3c86108d2de627 polarssl-1.3.8-gpl.tgz" +md5sums="d1a2b4f21727e888f143414d2e3144e6 polarssl-1.3.8-gpl.tgz +b4c7ae55bd3c32cdcb067fd71faf8577 programs.makefile.patch" +sha256sums="318171db41335cacbb5b0047c94f1faf91442ab70a223b5223436703c9406ff1 polarssl-1.3.8-gpl.tgz +c1341f041cedcb0a321f23851c1d2756fe3c2340e76e2604fdb6af824344f034 programs.makefile.patch" +sha512sums="e1bf2b111510582ebf071b11d9d0663fbd02ac61f6ded9611e2f0eb5ff64b421d72768dd94ec5e52353d3bde06bc62d673211c26debab2cd7b3c86108d2de627 polarssl-1.3.8-gpl.tgz +32570b0f5f1e92ea0ac1c12e79a888289f35b03b4350935c585738c1d3875768b048c9b830b0286ea99be3c96b72cb62c079bc0b4106fab93a39a6590861c251 programs.makefile.patch" diff --git a/main/polarssl/programs.makefile.patch b/main/polarssl/programs.makefile.patch new file mode 100644 index 0000000000..421f39cfcb --- /dev/null +++ b/main/polarssl/programs.makefile.patch @@ -0,0 +1,22 @@ +--- programs/Makefile 2014-07-31 12:20:17.748459143 -0400 ++++ programs/Makefile 2014-07-31 12:21:35.388454356 -0400 +@@ -43,7 +43,7 @@ + test/selftest test/ssl_test \ + util/pem2der util/strerror \ + x509/cert_app x509/crl_app \ +- x509/cert_req ++ x509/cert_req x509/cert_write + + ifdef OPENSSL + APPS += test/o_p_test +@@ -241,6 +241,10 @@ + echo " CC x509/cert_req.c" + $(CC) $(CFLAGS) $(OFLAGS) x509/cert_req.c $(LDFLAGS) -o $@ + ++x509/cert_write: x509/cert_write.c ../library/libpolarssl.a ++ echo " CC x509/cert_write.c" ++ $(CC) $(CFLAGS) $(OFLAGS) x509/cert_write.c $(LDFLAGS) -o $@ ++ + clean: + ifndef WINDOWS + rm -f $(APPS) |