commit: bc28a41ad9368e91f6669740ee6ad5923751210d Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> AuthorDate: Thu Jul 16 17:08:32 2015 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Thu Jul 16 17:08:32 2015 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=bc28a41a
sys-libs/slang: avoid collision with posix_close(). Package-Manager: portage-2.2.18 RepoMan-Options: --force Manifest-Sign-Key: 0xF52D4BBA sys-libs/slang/Manifest | 6 ++ sys-libs/slang/files/slang-2.2.3-slsh-libs.patch | 11 ++++ sys-libs/slang/files/slang-2.2.4-memset.patch | 32 +++++++++ .../files/slang-2.2.4-rename-posix_close.patch | 21 ++++++ sys-libs/slang/metadata.xml | 5 ++ sys-libs/slang/slang-2.2.4-r99.ebuild | 75 ++++++++++++++++++++++ 6 files changed, 150 insertions(+) diff --git a/sys-libs/slang/Manifest b/sys-libs/slang/Manifest new file mode 100644 index 0000000..97e2a31 --- /dev/null +++ b/sys-libs/slang/Manifest @@ -0,0 +1,6 @@ +AUX slang-2.2.3-slsh-libs.patch 678 SHA256 820bb560dc76105756a0fa75661dd3cbf6fc6ecb7802dcbdb9fc4625de4ffb22 SHA512 62ce13a54178432463873e1f31e50bd47559ef0fff6c0a58497cfb908b055ea2f80d1af5d2c5bdafdf6e85e7c75d48bd0d39905977d1591e7559a285685a9b72 WHIRLPOOL 135fc5ea00fc3dcc7580753c5e9f02985762ecf758593728f273e8b252e3b86573ff50249cbb26d8da0678a7cd1fe965319e8bf9d7073c4158e57211c72bf707 +AUX slang-2.2.4-memset.patch 1054 SHA256 d389884d73811314a6dbdb6223a7241bca5abc97f8984eb4f238d327b30c1fad SHA512 ddbbd089c3d1128353951438fc527b6cc7e2268d5dc7384123fcf36dc198872a0cf229c850b3e6c1538807adaf3b426d3748f3ed2fd4b021080d5ebda30d56ee WHIRLPOOL b68492ca72f6ee35c28bde22fd87d8c33c85c47fcb820c9d17ec496301b7df46a4741e7baa9b3522b4142c9643a2942d8e619364039beba80cc9e59bb8131910 +AUX slang-2.2.4-rename-posix_close.patch 779 SHA256 2d17c884ca2fec500dff90358d3447e001c21f7597bb425feca231b0e8817b20 SHA512 e8b01306d10d2538b8113bdfbcf6e7c43d04570ad97a7bdf3cf3a1f9315ca0cba571a808b0a0d87a1413b1ee52eb4799602fb21aa600f3a196b26e89501370fe WHIRLPOOL ba14e577ba88df572c4d06e73ee5a973f7db71ce8d1f9a8429686d7045c34f6f55ca8726c78a3355cc8806785805dbcb0a4cc15033068d560b562d5c51b43c02 +DIST slang-2.2.4.tar.bz2 1427363 SHA256 9a8257a9a2a55099af858b13338dc8f3a06dd2069f46f0df2c9c3bb84a01d5db SHA512 aaf0dcea5f1583487732098bd9dfe47f4fd968d81783955f58ed7bbffb852c217cde8999f2a515d77c22d44efc79047fc841eea6fecc48f18b402461ce6a848f WHIRLPOOL 5a0c81ef103116733df952fec8593f476bd57c9b2799ee566b0bf93dfd465709ef5f565a369d89a92bfd13cfc7577a047c46116bcac2f0b3176e50556c7484e1 +EBUILD slang-2.2.4-r99.ebuild 2207 SHA256 ff504abbd971c6651e72d93a1adb55b50bc5822644f3cdd10a3da833fae9fb92 SHA512 1fc9847a7c29b83cd10b661478b6db99264d07d58ef7d493533d8ebba627d55ab8f68d59235c21ea499eb7699f577533f7284d9b6c9231fcee718aaecad6f1af WHIRLPOOL c50b4f360940a66df2a0af30b2d40c1dbbb6b0c72dc4f356e0405c46b13635bcfc43f314636cf8418a2cedf5a5a8ef00e9204eac8214a6a0a34ba29b4d35307e +MISC metadata.xml 157 SHA256 c3c089740b31ec0f4d7fbc3bf2d6bb8460ccfd0694f01bf91b22a2e1930d6d5d SHA512 eaa4f0b5e4f9173245bcb2158d56335c959e2b15571f9992efdcd89ab2375a771f6d06a8bde9aba369489bfe15c123abc2745ed93b7c3fd04af29b7262367040 WHIRLPOOL a5d0d7ac8ce5fe93f1a64440cb3cdb943c30d8deaa5a19e90d24917411bcb69c89d6f56bf5c84bb2604b42d9fd4211905c5c0d1f1710b936b41443b302cbff2c diff --git a/sys-libs/slang/files/slang-2.2.3-slsh-libs.patch b/sys-libs/slang/files/slang-2.2.3-slsh-libs.patch new file mode 100644 index 0000000..2c999fb --- /dev/null +++ b/sys-libs/slang/files/slang-2.2.3-slsh-libs.patch @@ -0,0 +1,11 @@ +--- slsh/Makefile.in ++++ slsh/Makefile.in +@@ -80,7 +80,7 @@ + $(OBJDIR)/slsh_exe: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o + $(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh_exe $(LDFLAGS) $(SRC_LIBS) + $(OBJDIR)/slsh: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o +- $(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(INST_LIBS) ++ $(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(SRC_LIBS) + $(OBJDIR)/slsh.o: $(OBJDIR) slsh.c slsh.h config.h Makefile + cd $(OBJDIR) && $(CC) -c $(CFLAGS) $(SLANG_SRCINC) $(DEFS) $(SRCDIR)/slsh.c + $(OBJDIR)/readline.o: $(OBJDIR) readline.c slsh.h config.h Makefile diff --git a/sys-libs/slang/files/slang-2.2.4-memset.patch b/sys-libs/slang/files/slang-2.2.4-memset.patch new file mode 100644 index 0000000..0be90fd --- /dev/null +++ b/sys-libs/slang/files/slang-2.2.4-memset.patch @@ -0,0 +1,32 @@ +From e06be392e42c23dd9bd7205445f3c5232ddb9ed7 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <[email protected]> +Date: Tue, 19 Nov 2013 15:17:52 +0300 +Subject: [PATCH] modules/png-module.c: add declaration of 'memset' +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + + * QA Notice: Package triggers severe warnings which indicate that it + * may exhibit random runtime failures. + * /tmp/portage/sys-libs/slang-2.2.4/work/slang-2.2.4/modules/png-module.c:122:2: warning: incompatible implicit declaration of built-in function ‘memset’ [enabled by default] + +Signed-off-by: Sergei Trofimovich <[email protected]> +--- + modules/png-module.c | 1 + + 3 files changed, 403 insertions(+), 259 deletions(-) + +diff --git a/modules/png-module.c b/modules/png-module.c +index 92ede3d..fed9392 100644 +--- a/modules/png-module.c ++++ b/modules/png-module.c +@@ -23,6 +23,7 @@ USA. + #include "config.h" + + #include <stdio.h> ++#include <string.h> /* memset() */ + #include <errno.h> + #include <slang.h> + +-- +1.8.4 + diff --git a/sys-libs/slang/files/slang-2.2.4-rename-posix_close.patch b/sys-libs/slang/files/slang-2.2.4-rename-posix_close.patch new file mode 100644 index 0000000..35235ed --- /dev/null +++ b/sys-libs/slang/files/slang-2.2.4-rename-posix_close.patch @@ -0,0 +1,21 @@ +diff -Naur slang-2.2.4.orig/src/slposio.c slang-2.2.4/src/slposio.c +--- slang-2.2.4.orig/src/slposio.c 2011-04-10 22:37:07.000000000 -0400 ++++ slang-2.2.4/src/slposio.c 2015-07-16 13:02:06.594941984 -0400 +@@ -363,7 +363,7 @@ + return 0; + } + +-static int posix_close (SLFile_FD_Type *f) ++static int posix_close_1 (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_1, I, F), + MAKE_INTRINSIC_1("_close", posix_close_fd, I, I), + #if defined(TTYNAME_R) + MAKE_INTRINSIC_0("ttyname", posix_ttyname, V), diff --git a/sys-libs/slang/metadata.xml b/sys-libs/slang/metadata.xml new file mode 100644 index 0000000..aef01fc --- /dev/null +++ b/sys-libs/slang/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> +<pkgmetadata> + <herd>cjk</herd> +</pkgmetadata> diff --git a/sys-libs/slang/slang-2.2.4-r99.ebuild b/sys-libs/slang/slang-2.2.4-r99.ebuild new file mode 100644 index 0000000..ed456f5 --- /dev/null +++ b/sys-libs/slang/slang-2.2.4-r99.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/slang-2.2.4-r1.ebuild,v 1.12 2015/03/03 10:08:14 dlan Exp $ + +EAPI=5 +inherit eutils multilib-minimal + +DESCRIPTION="A multi-platform programmer's library designed to allow a developer to create robust software" +HOMEPAGE="http://www.jedsoft.org/slang/"; +SRC_URI="mirror://slang/v${PV%.*}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm ~mips ppc x86" +IUSE="cjk pcre png readline static-libs zlib" + +# ncurses for ncurses5-config to get terminfo directory +RDEPEND="sys-libs/ncurses + pcre? ( >=dev-libs/libpcre-8.33-r1[${MULTILIB_USEDEP}] ) + png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] ) + cjk? ( >=dev-libs/oniguruma-5.9.5[${MULTILIB_USEDEP}] ) + readline? ( >=sys-libs/readline-6.2_p5-r1:0[${MULTILIB_USEDEP}] ) + zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) + abi_x86_32? ( + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + !<=app-emulation/emul-linux-x86-baselibs-20140406-r1 + )" +DEPEND="${RDEPEND}" + +MAKEOPTS="${MAKEOPTS} -j1" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-2.2.3-slsh-libs.patch + epatch "${FILESDIR}"/${PN}-2.2.4-memset.patch + epatch "${FILESDIR}"/${PN}-2.2.4-rename-posix_close.patch + + # avoid linking to -ltermcap race with some systems + sed -i -e '/^TERMCAP=/s:=.*:=:' configure || die + # we use the GNU linker also on Solaris + sed -i -e 's/-G -fPIC/-shared -fPIC/g' \ + -e 's/-Wl,-h,/-Wl,-soname,/g' configure || die + + # slang does not support configuration from another dir + multilib_copy_sources +} + +multilib_src_configure() { + local myconf=slang + use readline && myconf=gnu + + econf \ + --with-readline=${myconf} \ + $(use_with pcre) \ + $(use_with cjk onig) \ + $(use_with png) \ + $(use_with zlib z) +} + +multilib_src_compile() { + emake elf $(use static-libs && echo static) + + pushd slsh >/dev/null + emake slsh + popd +} + +multilib_src_install() { + emake DESTDIR="${D}" install $(use static-libs && echo install-static) +} + +multilib_src_install_all() { + rm -rf "${ED}"/usr/share/doc/{slang,slsh} + dodoc NEWS README *.txt doc/{,internal,text}/*.txt + dohtml doc/slangdoc.html slsh/doc/html/*.html +}
