diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2014-01-10 10:06:40 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-01-10 10:09:04 +0000 |
commit | 8af59cc54a9feedad4f4d72b9db12148076e4d36 (patch) | |
tree | 7940be03e36ac2e48d8867d85e163f792479512b /main/openssl/APKBUILD | |
parent | e4b6faf7857c27c14a7237bf09f7f6d7968f3ea6 (diff) | |
download | aports-8af59cc54a9feedad4f4d72b9db12148076e4d36.tar.bz2 aports-8af59cc54a9feedad4f4d72b9db12148076e4d36.tar.xz |
main/openssl: build fixes
fixes parallel build and linking to dynamic libcrypto of c_rehash in
case openssl-dev is not installed.
Diffstat (limited to 'main/openssl/APKBUILD')
-rw-r--r-- | main/openssl/APKBUILD | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/main/openssl/APKBUILD b/main/openssl/APKBUILD index 6464cd72a9..3a28744b80 100644 --- a/main/openssl/APKBUILD +++ b/main/openssl/APKBUILD @@ -26,6 +26,7 @@ source="http://www.openssl.org/source/${pkgname}-${pkgver}.tar.gz openssl-use-termios.patch fix-default-apps-capath.patch c_rehash.c + openssl-1.0.1-parallel-build.patch " _builddir="$srcdir"/$pkgname-$pkgver @@ -85,7 +86,7 @@ build() { -Wa,--noexecstack \ || return 1 - make -j1 || return 1 + make && make build-shared || return 1 # replace the c_rehash perl script with our C-version $CC $CFLAGS -I include -L . "$srcdir"/c_rehash.c -o tools/c_rehash -lcrypto || return 1 @@ -93,7 +94,7 @@ build() { package() { cd "$_builddir" - make -j1 INSTALL_PREFIX="$pkgdir" MANDIR=/usr/share/man install + make INSTALL_PREFIX="$pkgdir" MANDIR=/usr/share/man install } libcrypto() { @@ -128,7 +129,8 @@ c5b1042a3acaf3591f3f5620b7086e12 0005-s_client-ircv3-starttls.patch d1f3aaad7c36590f21355682983cd14e openssl-1.0.1-version-eglibc.patch 2681796363085d01db8a81c249cd2d7b openssl-use-termios.patch efec1bce615256961b1756e575ee1d0a fix-default-apps-capath.patch -05ad806219cef6fa5692ac727af7fab6 c_rehash.c" +05ad806219cef6fa5692ac727af7fab6 c_rehash.c +60ca340e32944e4825747e3681ccd553 openssl-1.0.1-parallel-build.patch" sha256sums="6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a openssl-1.0.1f.tar.gz fe844e21b2c42da2d8e9c89350211d70c0829f45532b89b7e492bfde589ee7ed fix-manpages.patch 82863c2fed659a7186c7f3905a1853b8bd8060350ad101ce159fa7e7d2ba27e8 openssl-bb-basename.patch @@ -140,7 +142,8 @@ cbb2493ec9157e78035e9cc02be17655996ee9cd0a71b79507fc19f3862f452b 0003-engines-e 51146851d8454dcb73138f794ced8bd629658b4a0524c466f61b653fff536c93 openssl-1.0.1-version-eglibc.patch 05266a671143cf17367dee8d409ad6d0857201392c99731d7ebb8f8cdcdc32f7 openssl-use-termios.patch 1e11d6b8cdcdd6957c69d33ab670c5918fc96c12fdb9b76b4287cb8f69c3545d fix-default-apps-capath.patch -7b0947fd09ad1e8d9cea360b883090025b40193d0fc8a631f2e3bb42db28d76b c_rehash.c" +7b0947fd09ad1e8d9cea360b883090025b40193d0fc8a631f2e3bb42db28d76b c_rehash.c +bd56e5fe1b6fe594ab93f34d25fef0b7372633bad8532f81da998f3e6655d221 openssl-1.0.1-parallel-build.patch" sha512sums="8a50892ce0c32707486e248b273631c38e9743371f28f96b635a9e61dac31919e5cf00690d0926c1f425c718cb56c4fe18a87c6e679e0543ad453e42f7a811ef openssl-1.0.1f.tar.gz 880411d56da49946d24328445728367e0bf13b0fd47954971514bee8cd5613a038ad8aeaf68da2c92f4634deb022febd7b3e37f9bbfc5d2c9c8b3b5ffd971407 fix-manpages.patch 6c4f4b0c1b606b3e5a8175618c4398923392f9c25ad8d3f5b65b0424fe51e104c4f456d2da590d9f572382225ab320278e88db1585790092450cad60a02819a5 openssl-bb-basename.patch @@ -152,4 +155,5 @@ b019320869d215014ad46e0b29aa239e31243571c4d45256b3ce6449a67fdc106a381c1cf3abd55d 6db9d9ee62048d27f80e392eda99a46712ee85f1c8fd49f4931be73c880da8b84844a72657f7bceddb7db0026daddd31870d9c5065494f8d359ee8560284fd4a openssl-1.0.1-version-eglibc.patch 22261ad902ad4826db889fa0e6196b57d6cb389c1707f5827ba48a4630097e590979257f16f4a36fe611199fa33ba32d5f412c8b93beb84001865c2501b288da openssl-use-termios.patch f2e737146a473d55b99f27457718ca299a02a0c74009026a30c3d1347c575bc264962b5708995e02ef7d68521b8366ccea7320523efb87b1ab2632d73fec5658 fix-default-apps-capath.patch -17b5ecda9c51a4a6b7a2b5fea65abc90091ae9c8d43527546148769d8fcfd87450075830b874fcff21b9ad0c31366213b4bfb8665e09cbd2559a8f3688b9aebd c_rehash.c" +17b5ecda9c51a4a6b7a2b5fea65abc90091ae9c8d43527546148769d8fcfd87450075830b874fcff21b9ad0c31366213b4bfb8665e09cbd2559a8f3688b9aebd c_rehash.c +7255b3315133e415631b2ecadc8f5c50a705b9db507c46efded0190363ce9eb31ffbfe01c500669c060878e5202f858b1d2475c64948426fbf70820b4c798ba1 openssl-1.0.1-parallel-build.patch" |