diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-06-03 11:03:00 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-06-03 11:03:00 +0000 |
| commit | d4713623ebb976a3b8b04b54370d575507adb998 (patch) | |
| tree | 885fe1d8f7b7159342554714ad00ecd42813c1e5 | |
| parent | d254a977afca2015b255f0994cfe96973b09e1c6 (diff) | |
| download | alpine_aports-d4713623ebb976a3b8b04b54370d575507adb998.tar.bz2 alpine_aports-d4713623ebb976a3b8b04b54370d575507adb998.tar.xz alpine_aports-d4713623ebb976a3b8b04b54370d575507adb998.zip | |
testing/figlet: fix build with musl
| -rw-r--r-- | testing/figlet/APKBUILD | 13 | ||||
| -rw-r--r-- | testing/figlet/musl-fix-cplusplus-decls.patch | 22 |
2 files changed, 31 insertions, 4 deletions
diff --git a/testing/figlet/APKBUILD b/testing/figlet/APKBUILD index 648c52d670..1e48581559 100644 --- a/testing/figlet/APKBUILD +++ b/testing/figlet/APKBUILD | |||
| @@ -12,7 +12,9 @@ depends_dev="" | |||
| 12 | makedepends="$depends_dev" | 12 | makedepends="$depends_dev" |
| 13 | install="" | 13 | install="" |
| 14 | subpackages="$pkgname-doc" | 14 | subpackages="$pkgname-doc" |
| 15 | source="ftp://ftp.figlet.org/pub/figlet/program/unix/${pkgname}-${pkgver}.tar.gz" | 15 | source="ftp://ftp.figlet.org/pub/figlet/program/unix/${pkgname}-${pkgver}.tar.gz |
| 16 | musl-fix-cplusplus-decls.patch | ||
| 17 | " | ||
| 16 | _builddir="$srcdir"/$pkgname-$pkgver | 18 | _builddir="$srcdir"/$pkgname-$pkgver |
| 17 | prepare() { | 19 | prepare() { |
| 18 | local i | 20 | local i |
| @@ -36,6 +38,9 @@ package() { | |||
| 36 | install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" | 38 | install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" |
| 37 | } | 39 | } |
| 38 | 40 | ||
| 39 | md5sums="d88cb33a14f1469fff975d021ae2858e figlet-2.2.5.tar.gz" | 41 | md5sums="d88cb33a14f1469fff975d021ae2858e figlet-2.2.5.tar.gz |
| 40 | sha256sums="bf88c40fd0f077dab2712f54f8d39ac952e4e9f2e1882f1195be9e5e4257417d figlet-2.2.5.tar.gz" | 42 | 7944a8b5731da408cd791b9ed154f4d9 musl-fix-cplusplus-decls.patch" |
| 41 | sha512sums="bb9610fd89a51dd3e65c485653fe1292f47dbca7cb9a05af4ce317f5d776bb346ae455aec07fc37c290f6658639920fd7c431c1135a0f4d456a21c0bd25f99fb figlet-2.2.5.tar.gz" | 43 | sha256sums="bf88c40fd0f077dab2712f54f8d39ac952e4e9f2e1882f1195be9e5e4257417d figlet-2.2.5.tar.gz |
| 44 | f2d83fdeb0678c51b64385bcd3bf99d0da533bb559ae89ed9faaa6e9f2fb409c musl-fix-cplusplus-decls.patch" | ||
| 45 | sha512sums="bb9610fd89a51dd3e65c485653fe1292f47dbca7cb9a05af4ce317f5d776bb346ae455aec07fc37c290f6658639920fd7c431c1135a0f4d456a21c0bd25f99fb figlet-2.2.5.tar.gz | ||
| 46 | 4ac1788686ff89c27747fe10b43de90f43c2aaa40476610cf5af52ff43c00e180b91acc1646658330fd534d223cef4643ab3c7f7bf0f6c9b5861601b1d8a05fe musl-fix-cplusplus-decls.patch" | ||
diff --git a/testing/figlet/musl-fix-cplusplus-decls.patch b/testing/figlet/musl-fix-cplusplus-decls.patch new file mode 100644 index 0000000000..2a08327eaa --- /dev/null +++ b/testing/figlet/musl-fix-cplusplus-decls.patch | |||
| @@ -0,0 +1,22 @@ | |||
| 1 | --- figlet-2.2.5.orig/utf8.h | ||
| 2 | +++ figlet-2.2.5/utf8.h | ||
| 3 | @@ -27,13 +27,17 @@ | ||
| 4 | #define UTF8_IGNORE_ERROR 0x01 | ||
| 5 | #define UTF8_SKIP_BOM 0x02 | ||
| 6 | |||
| 7 | -__BEGIN_DECLS | ||
| 8 | +#ifdef __cplusplus | ||
| 9 | +extern "C" { | ||
| 10 | +#endif | ||
| 11 | |||
| 12 | size_t utf8_to_wchar(const char *in, size_t insize, wchar_t *out, | ||
| 13 | size_t outsize, int flags); | ||
| 14 | size_t wchar_to_utf8(const wchar_t *in, size_t insize, char *out, | ||
| 15 | size_t outsize, int flags); | ||
| 16 | |||
| 17 | -__END_DECLS | ||
| 18 | +#ifdef __cplusplus | ||
| 19 | +} | ||
| 20 | +#endif | ||
| 21 | |||
| 22 | #endif /* !_UTF8_H_ */ | ||