diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-02-12 08:30:26 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-02-12 08:30:58 +0000 |
| commit | 281502e6457e44efd3e330e24d7890543ce362a4 (patch) | |
| tree | 742a1950cb2ec04f1c2210f942f3ca1138e9f042 | |
| parent | be4b159e625b5d627bf135dc1746f75273677956 (diff) | |
| download | aports-281502e6457e44efd3e330e24d7890543ce362a4.tar.bz2 aports-281502e6457e44efd3e330e24d7890543ce362a4.tar.xz | |
main/elinks: fix build on x86_64 musl
| -rw-r--r-- | main/elinks/APKBUILD | 19 | ||||
| -rw-r--r-- | main/elinks/musl-va_copy.patch | 18 |
2 files changed, 32 insertions, 5 deletions
diff --git a/main/elinks/APKBUILD b/main/elinks/APKBUILD index 465162c17..564bf6857 100644 --- a/main/elinks/APKBUILD +++ b/main/elinks/APKBUILD @@ -3,7 +3,7 @@ pkgname=elinks pkgver=0.12_pre6 _ver=${pkgver/_/} -pkgrel=0 +pkgrel=1 pkgdesc="a text mode web browser" url="http://elinks.or.cz/" arch="all" @@ -12,11 +12,17 @@ depends= makedepends="bzip2-dev zlib-dev openssl-dev expat-dev libiconv-dev gettext-dev" install= subpackages="$pkgname-doc $pkgname-lang" -source="http://elinks.or.cz/download/elinks-$_ver.tar.bz2" +source="http://elinks.or.cz/download/elinks-$_ver.tar.bz2 + musl-va_copy.patch" _builddir="$srcdir"/$pkgname-$_ver prepare() { cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done update_config_sub || return 1 } @@ -43,6 +49,9 @@ package() { rm "$pkgdir"/usr/share/locale/locale.alias } -md5sums="3d0962f4b65fb039342fefd3ada050a9 elinks-0.12pre6.tar.bz2" -sha256sums="383646375b8a325bef5a132c8300caab90eb0b842c5f8eff68febc00e29acada elinks-0.12pre6.tar.bz2" -sha512sums="bff70faafea7c4739695a7fad8f659109894b318588f5a035a5594a6053238789259ce6067c2f5cb97448f138db143adebb23f84bf689bea209ba37573484b7f elinks-0.12pre6.tar.bz2" +md5sums="3d0962f4b65fb039342fefd3ada050a9 elinks-0.12pre6.tar.bz2 +8e7c2deee72e1832adab563ba04214da musl-va_copy.patch" +sha256sums="383646375b8a325bef5a132c8300caab90eb0b842c5f8eff68febc00e29acada elinks-0.12pre6.tar.bz2 +8beba82169662655aa075b9453334a14c87580282a1e5472fe89393b8b923020 musl-va_copy.patch" +sha512sums="bff70faafea7c4739695a7fad8f659109894b318588f5a035a5594a6053238789259ce6067c2f5cb97448f138db143adebb23f84bf689bea209ba37573484b7f elinks-0.12pre6.tar.bz2 +56378b4744783e8a07c5e92f3f75cdb7edf7b26881eb033789d71612c3971b3a3c5ada5f02ec422391242cbceb64ff31a2be68298608ed6448c37056d6dedf40 musl-va_copy.patch" diff --git a/main/elinks/musl-va_copy.patch b/main/elinks/musl-va_copy.patch new file mode 100644 index 000000000..5074d1e20 --- /dev/null +++ b/main/elinks/musl-va_copy.patch @@ -0,0 +1,18 @@ +--- ./src/util/snprintf.h.orig ++++ ./src/util/snprintf.h +@@ -12,10 +12,14 @@ + /* XXX: This is not quite the best place for it, perhaps. But do we have + * a better one now? --pasky */ + #ifndef VA_COPY ++#ifdef va_copy ++#define VA_COPY va_copy ++#else + #ifdef HAVE_VA_COPY + #define VA_COPY(dest, src) __va_copy(dest, src) + #else + #define VA_COPY(dest, src) (dest) = (src) ++#endif + #endif + #endif + + |