From f8ca23f9f6e4a55e4195e553ca2f3e7dd425f51c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 12 Aug 2022 20:22:37 +0100 Subject: gentoo auto-resync : 12:08:2022 - 20:22:37 --- sys-libs/Manifest.gz | Bin 14259 -> 14260 bytes sys-libs/slang/Manifest | 3 + sys-libs/slang/files/slang-2.3.3-slsh-libs.patch | 21 ++++++ sys-libs/slang/slang-2.3.3.ebuild | 83 +++++++++++++++++++++++ 4 files changed, 107 insertions(+) create mode 100644 sys-libs/slang/files/slang-2.3.3-slsh-libs.patch create mode 100644 sys-libs/slang/slang-2.3.3.ebuild (limited to 'sys-libs') diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz index 427aa37a86c0..1bcbede47771 100644 Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ diff --git a/sys-libs/slang/Manifest b/sys-libs/slang/Manifest index c498da5322ab..87cd1bc8ff95 100644 --- a/sys-libs/slang/Manifest +++ b/sys-libs/slang/Manifest @@ -1,4 +1,7 @@ AUX slang-2.3.1-slsh-libs.patch 761 BLAKE2B a0bc1a573fa1031e44c998bb75c80113ccd86be47f7d0b80da0ba53c7fa066d780ebb86b9cc5ff503e0d4c99b49fe75cb4c916088cc7b18a5a6c1670cbca4ba3 SHA512 77516f0b0373a08fbf61765e4eb83cbfa91b29a58a41e0006d1041672c6107dc5a2410056d65dd64fe68de40e01c211feb9f748a8238473cd5c98dfe2125f7b2 +AUX slang-2.3.3-slsh-libs.patch 1638 BLAKE2B 5d187745c96d44780e4f335f4db7d52905b7153cbfd3aca81e18362464a925425dfdfbaa9dbf78fd760d2fa6a3c60bc2647dd79e9ff8ae844361eab2353e6f11 SHA512 a5ad139bbceaa94bf232c13fcc21f88d31218bcf8979b1409ecbe3cb25d5bf4f78fba14ae3201938e87008e07bb171e0410b800af049ec8d9a9db9e91a0ceb33 DIST slang-2.3.2.tar.bz2 1586720 BLAKE2B e923a431e6273f1783c40dc09b2e324ace22e41a163fd46dcb8ab16c9ef27f190651df8da24432edc75890b83cd95051a835d5e582385bb23e36cd8ae18e6d24 SHA512 35cdfe8af66dac62ee89cca60fa87ddbd02cae63b30d5c0e3786e77b1893c45697ace4ac7e82d9832b8a9ac342560bc35997674846c5022341481013e76f74b5 +DIST slang-2.3.3.tar.bz2 1646311 BLAKE2B 2f304b25e807fe38b544479f4a6e98723816d08cda576177a270df736d7db8992a478f980333afc10a7bc0b5dc5508e49b33a13de02f0466f065efdfa3b7b351 SHA512 f882f09e3fcd53427de0f233c9fc3ab15497f2323007be9a084696c8cf810ffe2726cd003149e757df26198b390b9f8c1ff411dc6473513457bd0f94722f8490 EBUILD slang-2.3.2.ebuild 2245 BLAKE2B ce75e58672dc3e44bf8bbc8e98293bf8903f4b7063f40cb08a7b38bfc17515b76826185ddb1e8e3bf56fcfc013e3da3f846ab700e437e6e420f752daca8304c4 SHA512 226e5e32b38e6328540853fbcf38f00540a7be72bf50353f0be635f3c3d39c845286794479226e565902b265013a473096835f6a92c9d4e146eef199abb6268c +EBUILD slang-2.3.3.ebuild 2257 BLAKE2B 4725ee88c11936321a9176363800902ca1d99b797a548154c234492a9d367a429bd52a2ceb7c5c8ebe23dbe5962b1aca9ac46346be4754cc364e30d726e7b93f SHA512 283f715aca9a83bf56bdd16e501c575464956339bad924eee77c7d071a48cdbd7b6629ea5468b8aa25c56f237c2593dec672c64d87d07afcbf28b2d20de81426 MISC metadata.xml 235 BLAKE2B a3e5a3109b59e3f97ef14f8d55ba13b16dc5371a1b7d6f238230aa4494db32dd4a42e3ee012ec8b18fae394feb2b1b56882bc70504aa7c6b969c1b20140f0ece SHA512 7c4e5f5dea465e45c662f5f53513626088aff514e1326593426af227d77e63d8a00d8af05aa208881a399f83dd41e73cd2ef81c8b7f275a2fa891f295231d67c diff --git a/sys-libs/slang/files/slang-2.3.3-slsh-libs.patch b/sys-libs/slang/files/slang-2.3.3-slsh-libs.patch new file mode 100644 index 000000000000..15062ee7d420 --- /dev/null +++ b/sys-libs/slang/files/slang-2.3.3-slsh-libs.patch @@ -0,0 +1,21 @@ +Fix build issue: +``` +make -j32 -j1 -C slsh slsh +make: Entering directory '/var/tmp/portage/sys-libs/slang-2.3.3/work/slang-2.3.3-abi_x86_32.x86/slsh' +x86_64-pc-linux-gnu-gcc -m32 amd64objs/slsh.o amd64objs/readline.o -o amd64objs/slsh -Wl,-O1 -Wl,--as-needed -Wl,--defsym=__gentoo_check_ldflags__=0 -Wl,-z,pack-relative-relocs -fuse-ld=bfd -Wl,-O1 -Wl,--as-needed -Wl,-export-dynamic -L/usr/lib -Wl,-R/usr/lib -L/usr/lib -lslang -Wl,-O1 -Wl,--as-needed -Wl,--defsym=__gentoo_check_ldflags__=0 -Wl,-z,pack-relative-relocs -fuse-ld=bfd -Wl,-O1 -Wl,--as-needed -lreadline -ldl -lm +/usr/lib/gcc/x86_64-pc-linux-gnu/12.1.1/../../../../x86_64-pc-linux-gnu/bin/ld.bfd: cannot find -lslang: No such file or directory +collect2: error: ld returned 1 exit status +make: *** [Makefile:95: amd64objs/slsh] Error 1 +make: Leaving directory '/var/tmp/portage/sys-libs/slang-2.3.3/work/slang-2.3.3-abi_x86_32.x86/slsh' +``` +--- a/slsh/Makefile.in ++++ b/slsh/Makefile.in +@@ -92,7 +92,7 @@ slsh: $(OBJDIR)/slsh + $(OBJDIR)/slsh_exe: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o + $(CC) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh_exe $(LDFLAGS) $(DLINK_FLAGS) $(SRC_LIBS) + $(OBJDIR)/slsh: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o +- $(CC) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(DLINK_FLAGS) $(INST_LIBS) ++ $(CC) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(DLINK_FLAGS) $(SRC_LIBS) + $(OBJDIR)/slsh.o: $(OBJDIR_TSTAMP) slsh.c slsh.h config.h Makefile + cd $(OBJDIR) && $(CC) $(SLANG_SRCINC) $(CFLAGS) -c $(DEFS) $(SRCDIR)/slsh.c + $(OBJDIR)/readline.o: $(OBJDIR_TSTAMP) readline.c slsh.h config.h Makefile diff --git a/sys-libs/slang/slang-2.3.3.ebuild b/sys-libs/slang/slang-2.3.3.ebuild new file mode 100644 index 000000000000..8332aeb6fc27 --- /dev/null +++ b/sys-libs/slang/slang-2.3.3.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit multilib-minimal + +DESCRIPTION="Multi-platform library designed to allow a developer to create robust software" +HOMEPAGE="https://www.jedsoft.org/slang/" + +if [[ ${PV} == *_pre* ]] ; then + MY_P="${PN}-pre${PV/_pre/-}" + SRC_URI="https://www.jedsoft.org/snapshots/${MY_P}.tar.gz" + S="${WORKDIR}/${MY_P}" +else + SRC_URI="https://www.jedsoft.org/releases/${PN}/${P}.tar.bz2 + https://www.jedsoft.org/releases/${PN}/old/${P}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="cjk pcre png readline static-libs zlib" + +# ncurses for ncurses5-config to get terminfo directory +RDEPEND=" + sys-libs/ncurses:= + cjk? ( >=dev-libs/oniguruma-5.9.5:=[${MULTILIB_USEDEP}] ) + pcre? ( >=dev-libs/libpcre-8.33-r1[${MULTILIB_USEDEP}] ) + png? ( >=media-libs/libpng-1.6.10:=[${MULTILIB_USEDEP}] ) + readline? ( >=sys-libs/readline-6.2_p5-r1:=[${MULTILIB_USEDEP}] ) + zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND}" + +MAKEOPTS+=" -j1" + +PATCHES=( + "${FILESDIR}"/${PN}-2.3.3-slsh-libs.patch +) + +src_prepare() { + default + + # 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 myeconfargs=( + --with-readline=$(usex readline gnu slang) + $(use_with pcre) + $(use_with cjk onig) + $(use_with png) + $(use_with zlib z) + ) + + econf "${myeconfargs[@]}" +} + +multilib_src_compile() { + emake elf $(usex static-libs static '') + emake -C slsh slsh +} + +multilib_src_install() { + emake DESTDIR="${D}" install $(usex static-libs install-static '') +} + +multilib_src_install_all() { + rm -r "${ED}"/usr/share/doc/{slang,slsh} || die + + local -a DOCS=( NEWS README *.txt doc/{,internal,text}/*.txt ) + local -a HTML_DOCS=( doc/slangdoc.html slsh/doc/html/*.html ) + + einstalldocs +} -- cgit v1.2.3