diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2013-07-22 09:45:03 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2013-07-22 09:46:09 +0300 |
| commit | b13ada564e9102fc59da4ac0935b3bc10e9ee8b7 (patch) | |
| tree | b71ad65147cc2e814d0848bf2bec375088ec55d7 /main | |
| parent | 29e515cf9182a68b789cf5b8512131c7eca2b47f (diff) | |
| download | aports-b13ada564e9102fc59da4ac0935b3bc10e9ee8b7.tar.bz2 aports-b13ada564e9102fc59da4ac0935b3bc10e9ee8b7.tar.xz | |
main/musl: fix the getopt_long we ship
It is originally from pkgconf, and it had additional non-conformant
changes. This reverts them.
Diffstat (limited to 'main')
| -rw-r--r-- | main/musl/APKBUILD | 8 | ||||
| -rw-r--r-- | main/musl/getopt_long.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/main/musl/APKBUILD b/main/musl/APKBUILD index df3998210f..539ea87445 100644 --- a/main/musl/APKBUILD +++ b/main/musl/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=musl pkgver=0.9.11 -pkgrel=3 +pkgrel=4 pkgdesc="the musl c library (libc) implementation" url="http://www.musl-libc.org/" arch="x86 x86_64 arm armel" @@ -96,7 +96,7 @@ f0254759e89b0b000f33c8116eb1aac0 0003-add-legacy-scsi-scsi_ioctl.h-header.patch 1763905f21ab6b94dfb2d6611c47a84d 0008-add-some-ARM-EABI-specific-exception-handling-infras.patch 980ad576c337b0bd75da128816a2e0a5 0009-add-PIE-support-for-ARM.patch 627a5b94e86e5d0ef4ed575d5e8da229 0010-make-posix_spawn-and-functions-that-use-it-use-CLONE.patch -acbb8a052228d9d5b89bc2ed55616fe3 getopt_long.c +61c6c1e84ed1df82abbe6d75e90cf21c getopt_long.c ef81489a6258501cf45db58dfc6d5211 getent" sha256sums="8b81fd9b71becb7b674ea93fd65d82a039fab79ab738957a5e9ee47ba08a13fd musl-0.9.11.tar.gz 61ed4546341484f682d70f57a9d3549d9c646f33c779adb171e31e13b7b62070 0001-fix-Makefile-so-make-install-works-before-include-bi.patch @@ -109,7 +109,7 @@ ce53c311a2bbaedce42e5f5749f9ea63f801bf5fa65bb4d406202d9e75f4c3c0 0004-add-legac 42cf78d84f6f03bfb5431a38f38b08ad752d466a63ec4197907d3ff2b6849ca7 0008-add-some-ARM-EABI-specific-exception-handling-infras.patch d0c70b9806329d384752bf4d344176e5dea8a3facb0cfba9d5284d6281f52378 0009-add-PIE-support-for-ARM.patch 7efc54e1943db188bee5398e0d709778fca6578d44a73f215cd96f18a29a6d7b 0010-make-posix_spawn-and-functions-that-use-it-use-CLONE.patch -5427781da6c5877c017eeccba58c70bce3451536355ac949699ed807137a476a getopt_long.c +d9b644ec20bc33e81a7c52b9fcf7973d835923a69faf50f03db45534b811bd96 getopt_long.c d6996273f5aaaed429058257e4646b243d9e3a4d8609522f802762453f5be4cb getent" sha512sums="7ca852eda3be7b34bfdaf1eb9e7d435987d5177f865737b211e62f4037825cc322436e1ff49c3f875b3a20679f6f21ba5ffff271d03d3d03c7a97854f4f51832 musl-0.9.11.tar.gz 69d387f9617757cc0ac66f5c9716c8167408bb848b39011e716a388b451bf3d85fd7ea810970d2deaf42e9b77844f15decb358a78cc6ec6b403fdf0a31a4ca29 0001-fix-Makefile-so-make-install-works-before-include-bi.patch @@ -122,5 +122,5 @@ e61e3483ac905b528afd421d1970e2e2f53f32cfadd4d6af6a6b00e73d861880c749234b8d1624e6 915d0e7cdd56f369759ea314e54c29d57c012df1ff0d9459f1b0ac941320e5bf5de3e7215224075aead4b6d3a60b7e0dba7f28de75a6c477ae6bf6caf1b65d28 0008-add-some-ARM-EABI-specific-exception-handling-infras.patch 8eb9a822a6529e5dabafc17b6013fdbb7e3b744574df230e3565637c354fe06eeb3a4576f56ef2e2d798aeaac6d2a0968823351f0ee76e6f06114f740f5ae432 0009-add-PIE-support-for-ARM.patch 6897ed7bf575d085fda0c1270090bb44d26712c4f513ed98b4c988a3f31fc808e7fe4b760a46c329b5b3b20a20049410c0c3f0f51d780568427b3f1fc4b7df5b 0010-make-posix_spawn-and-functions-that-use-it-use-CLONE.patch -e5e945f26daae5498e2a2e463d4bb3724294bc5dd4bf9a93a0f18e333f277e18e5977e144642bf45185d25ffa167316fe9914c9885d491a0034b2f4cccb0d07f getopt_long.c +140f3f20d30bd95ebce8c41b8cc7f616c6cbedf4ea06c729c21014e74f6043796825cc40ebc5180620ea38173afdba23f09ebf6d8b11fa05440b14d23764fca9 getopt_long.c 4d92f934d760cf5157d80f19fd766be6b673c65317229b32ac824d9d192f6abcc414e2382b2416dfd5c2f757b46ced98c18e4762bf91f5a48647e0ee61813b06 getent" diff --git a/main/musl/getopt_long.c b/main/musl/getopt_long.c index 173fed347e..65e19940d3 100644 --- a/main/musl/getopt_long.c +++ b/main/musl/getopt_long.c @@ -338,7 +338,7 @@ parse_long_options(char * const *nargv, const char *options, if (idx) *idx = match; if (long_options[match].flag) { - *long_options[match].flag |= long_options[match].val; + *long_options[match].flag = long_options[match].val; return (0); } else return (long_options[match].val); |