diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2014-03-20 12:19:52 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2014-03-20 12:20:37 +0000 |
| commit | 26df47535ef1486f6502d65c160b1b85125a1af7 (patch) | |
| tree | 2125e2a7f4592e336397b0540374e0bf613e927c /main | |
| parent | b5858b1ccea9f3c1dcb57ba54bdfe0e1cd2b65a6 (diff) | |
| download | aports-26df47535ef1486f6502d65c160b1b85125a1af7.tar.bz2 aports-26df47535ef1486f6502d65c160b1b85125a1af7.tar.xz | |
main/slang: fix posix_close name clash
Diffstat (limited to 'main')
| -rw-r--r-- | main/slang/APKBUILD | 12 | ||||
| -rw-r--r-- | main/slang/musl-fix-posix_close-clash.patch | 20 |
2 files changed, 30 insertions, 2 deletions
diff --git a/main/slang/APKBUILD b/main/slang/APKBUILD index 1764873678..d00399a50a 100644 --- a/main/slang/APKBUILD +++ b/main/slang/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=slang pkgver=2.2.4 -pkgrel=1 +pkgrel=2 pkgdesc="S-Lang is a powerful interpreted language" url="http://www.s-lang.org/" arch="all" @@ -11,6 +11,7 @@ depends= makedepends="pcre-dev ncurses-dev" source="ftp://ftp.fu-berlin.de/pub/unix/misc/$pkgname/v${pkgver%.*}/$pkgname-$pkgver.tar.gz slang-2.2.3-slsh-libs.patch + musl-fix-posix_close-clash.patch " prepare () { @@ -40,4 +41,11 @@ package() { make -j1 install-all DESTDIR="$pkgdir" || return 1 } md5sums="86cd8689cd71e281b4720fef8453ceeb slang-2.2.4.tar.gz -7f67ad2059a7dd3cad289da97d547521 slang-2.2.3-slsh-libs.patch" +7f67ad2059a7dd3cad289da97d547521 slang-2.2.3-slsh-libs.patch +75edbc059fb9af7916e71ea932010aa4 musl-fix-posix_close-clash.patch" +sha256sums="e334028e0c75c35406d10fe9e1686f36a615dcc6e2af90e8de25d299e8e6129f slang-2.2.4.tar.gz +a60e88f3066fd69b676ad84c34777915f6c59649fabf34f45d8accc6e1c6ed8d slang-2.2.3-slsh-libs.patch +47359f7c02691895cafb6b2c1e3fbe8ec59bf8e65d22d1052eb415918dc5689c musl-fix-posix_close-clash.patch" +sha512sums="fe5335517d307beb7aea6482f1c78eaed2ce8350685149381eab1cdef69824affee5f1aed24ad0b5a3f13792159c1d0ebb087fb2d9bcd975c6348b9929600629 slang-2.2.4.tar.gz +0651a89670bbe9f0d15797986edb0c6ce2bc25f3662b530b716a75a30d4df697b08c466c13426372a426e6adf8da00ab34d125da0703e60fe684d7e3e0852a48 slang-2.2.3-slsh-libs.patch +09dacad6f7bcfc8ac1b946e395f70fa0a57441617a44cbf7a8b964111cd826ba779e454310e5125717f6700e7f1af5b89dd01dcf37e8d9d8f902b3d546f5d5b2 musl-fix-posix_close-clash.patch" diff --git a/main/slang/musl-fix-posix_close-clash.patch b/main/slang/musl-fix-posix_close-clash.patch new file mode 100644 index 0000000000..a02a17f901 --- /dev/null +++ b/main/slang/musl-fix-posix_close-clash.patch @@ -0,0 +1,20 @@ +--- slang-2.2.4.orig/src/slposio.c ++++ slang-2.2.4/src/slposio.c +@@ -363,7 +363,7 @@ + return 0; + } + +-static int posix_close (SLFile_FD_Type *f) ++static int posix_close_slfile (SLFile_FD_Type *f) + { + int status = do_close (f); + +@@ -1001,7 +1001,7 @@ + MAKE_INTRINSIC_2("write", posix_write, V, F, B), + MAKE_INTRINSIC_1("dup_fd", posix_dup, V, F), + MAKE_INTRINSIC_2("dup2_fd", posix_dup2, I, F, I), +- MAKE_INTRINSIC_1("close", posix_close, I, F), ++ MAKE_INTRINSIC_1("close", posix_close_slfile, I, F), + MAKE_INTRINSIC_1("_close", posix_close_fd, I, I), + #if defined(TTYNAME_R) + MAKE_INTRINSIC_0("ttyname", posix_ttyname, V), |