diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2014-02-19 07:36:12 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2014-02-19 07:50:34 +0000 |
| commit | 3a5340eca2273ccb3f8e3b38e40283c56e6cbaf8 (patch) | |
| tree | 785698c24812846bb77f9326452253faa61041e7 /main/musl/APKBUILD | |
| parent | 054c297c3ee32d6b584bc2bcb3477d646bc30167 (diff) | |
| download | aports-3a5340eca2273ccb3f8e3b38e40283c56e6cbaf8.tar.bz2 aports-3a5340eca2273ccb3f8e3b38e40283c56e6cbaf8.tar.xz | |
main/musl: cherry-pick flock64 fix from upstream, add getconf
needed for openjdk6/icedtea building
Diffstat (limited to 'main/musl/APKBUILD')
| -rw-r--r-- | main/musl/APKBUILD | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/main/musl/APKBUILD b/main/musl/APKBUILD index d9dd4056b..1518990bc 100644 --- a/main/musl/APKBUILD +++ b/main/musl/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Timo Teräs <timo.teras@iki.fi> pkgname=musl pkgver=0.9.15 -pkgrel=3 +pkgrel=4 pkgdesc="the musl c library (libc) implementation" url="http://www.musl-libc.org/" arch="all" @@ -15,11 +15,14 @@ subpackages="$pkgname-dev $pkgname-utils" [ "${CTARGET#*musl}" = "$CTARGET" ] && subpackages="$subpackages musl-gcc:crosstool" source="http://www.musl-libc.org/releases/musl-$pkgver.tar.gz 0001-git-0.9.15-to-3e02ce1b411.patch + 0002-add-flock64-alias-for-struct-flock-in-fcntl.h.patch 1001-add-basic-dns-record-parsing-functions.patch + 1002-fix-confstr-return-value.patch 2001-workaround-gcc-pr58245.patch getopt_long.c __stack_chk_fail_local.c + getconf.c getent ldconfig " @@ -63,6 +66,9 @@ build() { ${CROSS_COMPILE}gcc $CPPFLAGS $CFLAGS -c "$srcdir"/__stack_chk_fail_local.c -o __stack_chk_fail_local.o || return 1 ${CROSS_COMPILE}ar r libssp_nonshared.a __stack_chk_fail_local.o || return 1 + # getconf + ${CROSS_COMPILE}gcc $CPPFLAGS $CFLAGS "$srcdir"/getconf.c -o getconf || return 1 + # note: not autotools LDFLAGS="$LDFLAGS -Wl,-soname,libc.musl-${CARCH}.so.1" \ ./configure \ @@ -97,6 +103,7 @@ utils() { mv "$pkgdir"/usr/bin/ldd "$subpkgdir"/usr/bin find "$pkgdir" -type d -delete 2>/dev/null install -D "$srcdir"/getent "$subpkgdir"/usr/bin/getent + install -D "$_builddir"/getconf "$subpkgdir"/usr/bin/getconf install -D "$srcdir"/ldconfig "$subpkgdir"/sbin/ldconfig } @@ -109,25 +116,34 @@ crosstool() { md5sums="06f590a38c85722ee9343db2416425f4 musl-0.9.15.tar.gz 06ec0e41d9b426acbd47869038ba0588 0001-git-0.9.15-to-3e02ce1b411.patch +2275f7138a7dc6869122cc68f7f7c710 0002-add-flock64-alias-for-struct-flock-in-fcntl.h.patch a3810683ef61ac27e2f6ec9801280c81 1001-add-basic-dns-record-parsing-functions.patch +499bced87843940199898d1508ef58df 1002-fix-confstr-return-value.patch 7a09c5cd7b3e9532e6902f54a5e928bb 2001-workaround-gcc-pr58245.patch 61c6c1e84ed1df82abbe6d75e90cf21c getopt_long.c 0df687757221bbb0fc1aa67f1bd646f9 __stack_chk_fail_local.c +7b391300396e58fe9073866b5a80cfe8 getconf.c ef81489a6258501cf45db58dfc6d5211 getent 33e4fd94e2560e008e2c3b431d0e3419 ldconfig" sha256sums="4a7baab8f295511196dee48d33b8b82a159a81233facb89433707c792033cbe7 musl-0.9.15.tar.gz 8c03e089985384e2fc2765db3b7c09c91bce1144f5ebf2456ce8ca642104e4b0 0001-git-0.9.15-to-3e02ce1b411.patch +d2146fcf11b2bf7b55b02dccadf4539fdf5b300777bfca6dc98a8188e9c6b1e2 0002-add-flock64-alias-for-struct-flock-in-fcntl.h.patch 758390768b1bc4159d56908ca332b9640cd0552ed3b4b2b8d4a6d499c54c11a1 1001-add-basic-dns-record-parsing-functions.patch +dba7e5155efab40829ec0202f1135942004e8e79cff287cbb455355a0d67705f 1002-fix-confstr-return-value.patch 45d6efda7450809e4e68f6e951431dcadf6cb7f0260930d50a9f1a8667aca49f 2001-workaround-gcc-pr58245.patch d9b644ec20bc33e81a7c52b9fcf7973d835923a69faf50f03db45534b811bd96 getopt_long.c 299a7d75a09de3e2e11e7fb4acc3182e4a14e868093d2f30938fce9bfcff13da __stack_chk_fail_local.c +530ea449f93d53fafcb377fa0a23a7564f2961e49c07a8fdef6c960110317301 getconf.c d6996273f5aaaed429058257e4646b243d9e3a4d8609522f802762453f5be4cb getent 306c6ca7407560340797866e077e053627ad409277d1b9da58106fce4cf717cb ldconfig" sha512sums="2c5f3e742cf29fd76db8079b6012b1b359eda635593995ea8add008abc9744f0ca504e915f7828692aeafc3bddc66e0716492182cd5696e2fa24d9a2289601b8 musl-0.9.15.tar.gz b721a91b5ff520b5406ecf43f033a82dc71686ccf2d025293b6457d6e77f3a6619fefeb3f3af620d8297b79f820d2bb7c94ca5695b0a284e19305bd4e54c8bed 0001-git-0.9.15-to-3e02ce1b411.patch +4167de98c13661c0be2eb83bd36f123f0ab52744dae6bdeb41f793021b0fd8a001280bddba3411093a5c17067261679bb0e9c6c2e9fef8c537c6f0f91627266d 0002-add-flock64-alias-for-struct-flock-in-fcntl.h.patch dad965258daf69371b844f76bfe5a914b0eca0ca76f3fc340b8fd7acf598b5f87bbe6d68b1f43ed0293ee0ed3bfd85d5173ccc169aa6265646248d5b8a906708 1001-add-basic-dns-record-parsing-functions.patch +d4c5f3c5a8ab3a9f1f63a22933bf4dcc67d6aff630066c9e3bb0edf9f46ab8b6e228ded906e4f82b7849d3b7e84ca25c9322bf5c5787fca10203482a38176700 1002-fix-confstr-return-value.patch 69ad3fc851b44f33dd7c98b83fd0adbd149b37263d17b989f4d7338ee0703dfe8994f4299744e2509492300227d652de6f21b6cdba9b633fcefd3d9f7ca0cf20 2001-workaround-gcc-pr58245.patch 140f3f20d30bd95ebce8c41b8cc7f616c6cbedf4ea06c729c21014e74f6043796825cc40ebc5180620ea38173afdba23f09ebf6d8b11fa05440b14d23764fca9 getopt_long.c 062bb49fa54839010acd4af113e20f7263dde1c8a2ca359b5fb2661ef9ed9d84a0f7c3bc10c25dcfa10bb3c5a4874588dff636ac43d5dbb3d748d75400756d0b __stack_chk_fail_local.c +d638cdd02371351190fd0545fb83f44b822fa8c930e9fb47ef93d32a1aaee27641f875e10fa2e9833f1a56dfc2055fb89932a89c88da3e2eb17529bca58f5182 getconf.c 4d92f934d760cf5157d80f19fd766be6b673c65317229b32ac824d9d192f6abcc414e2382b2416dfd5c2f757b46ced98c18e4762bf91f5a48647e0ee61813b06 getent 69f097faa9ccb981e78c3a914ad68a51771637d9aecd2dbc807003ac30663e6d921091a48ff529dfff27a6cd55b0808f91683118acf7acdf406d37266e622b17 ldconfig" |