From 2891d29af8907ce881662f4a02844926d7a293c7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 31 Dec 2018 13:43:35 +0000 Subject: gentoo resync : 31.12.2018 --- sys-apps/nawk/Manifest | 3 ++ .../nawk/files/nawk-20180827-parallel-build.patch | 35 +++++++++++++ sys-apps/nawk/nawk-20180827.ebuild | 57 ++++++++++++++++++++++ 3 files changed, 95 insertions(+) create mode 100644 sys-apps/nawk/files/nawk-20180827-parallel-build.patch create mode 100644 sys-apps/nawk/nawk-20180827.ebuild (limited to 'sys-apps/nawk') diff --git a/sys-apps/nawk/Manifest b/sys-apps/nawk/Manifest index c6aca03134a1..4664bcba59fd 100644 --- a/sys-apps/nawk/Manifest +++ b/sys-apps/nawk/Manifest @@ -1,4 +1,7 @@ AUX nawk-20121220-parallel-build.patch 1653 BLAKE2B be278714502f7bf267f57e0e50024f85d732b5cd4785f568e7c16dfe729d6bfaa584b1161e8adf11c476194cc04b8c3adca240530edbf2d30a060324d3a7ce5d SHA512 91201e4e09646726c10fb2d54b9418e4d1d410bfd0769613c766bacc1fda830d072ef14db15eddd7d3835d6e11fe48b2aa8e797e941649c0e114ee5c89b4e060 +AUX nawk-20180827-parallel-build.patch 913 BLAKE2B bc0df39ad9d8b0b723c0f66520ddbb8318ccae67c07b5cd5a5743ea1d6154d52da20d2f50eeb00ec45a9cb4bbb52b7244715c868daff77d1e93f89dead130c4c SHA512 aab5431373d7733c9ce8088cc1474f70e4fda352494092850625d34e288682d2d0cc9223d834241c9aecc2ce4411103945c87195336ea91cd4be7fd7b21fcdce DIST nawk-20121220.tar.gz 88970 BLAKE2B e00b9e55bb3b9139c00b8cc0be3f6cea2acc1162ee4326103c054c7270ef4a29b97cdddc9a692cad0773a72a17c399d2da5453939681a5d2456f0b740b6bc2ee SHA512 1dd62e1aa4c8cfad7ce599b10d88e9b450ecae3217cf8327cc0f3ce77d0d0dcb731101b8f211066462d46dc4ef23e20ccd7f70d799d7d48940026abe8fa79d4f +DIST nawk-20180827.tar.gz 1824076 BLAKE2B 4cfd000842d75d9a713fe73a85eefab33c17f9ecaca4f7f663d1157da411fd9fcf2badbf5180b4a90910445332095fe457e7acf0643621ac8a68da1a246b5e5f SHA512 cd6561149be71e6311aaa69c86b90ee4b29a057e5c2595470ccc8a41c40c653ec31b4bd46d7f58896d012f5fb5952103a76aa463a69e5128cba43d80eedf0b9b EBUILD nawk-20121220-r3.ebuild 1097 BLAKE2B fd71ffb9652957eafe2be709b702aa90c9aa4ca172c949ba71fdfb1397fb173bfd4fff0ae20b1e63967e99b4c83b8b5af684e3b49099b5cb9b6ed947287e5aa7 SHA512 e2908d0aef5c0a834c657338d22a4efd83e81106a5911ff537e05bffa525866a6f5fbd7b134a7d96d1d6231ce4562ccb126e26d986f6e23981d3d45f110af6e1 +EBUILD nawk-20180827.ebuild 1094 BLAKE2B c2a8b63d020cc4900cc1b5b6b759dd15dbbc248b04321e0d9e8dc5a262e592759f9d622f65376e52d9cd4d073647e6e3cb97b83ecad3ae778e19b273b3b652d9 SHA512 0d4abd8447fb0ef0d05d1922a1e4fc1271f385b69809a6085c8fbbdf44ed736f639a5e23ac1d1930b424f4683caa77dbbed4f543425083c300d2a6d9ea01d302 MISC metadata.xml 330 BLAKE2B 0f7e580c6988620e9e3cf452696c66e7ed5f383e878c898b0f90adf96dd847e6063a09bcccf85bf957c86d329617554e72413b4b7536319e37d8993287de3c5e SHA512 621c5fa8dc89857de39705622efcee6f0487e404de19424d0aaeec5b393a01176585139f98c2587d9169564c73585a339c86af21a41c2ab5ec084adee47d1ff3 diff --git a/sys-apps/nawk/files/nawk-20180827-parallel-build.patch b/sys-apps/nawk/files/nawk-20180827-parallel-build.patch new file mode 100644 index 000000000000..c6e3838313a0 --- /dev/null +++ b/sys-apps/nawk/files/nawk-20180827-parallel-build.patch @@ -0,0 +1,35 @@ +From fa4a9fd729a57a314f0aa10897216ce3b60ec653 Mon Sep 17 00:00:00 2001 +From: Christoph Junghans +Date: Mon, 10 Feb 2014 22:38:22 -0700 +Subject: [PATCH] fixed parallel build + +--- + makefile | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/makefile b/makefile +index ae80e4d..b3c8f9d 100644 +--- a/makefile ++++ b/makefile +@@ -54,10 +54,15 @@ a.out: ytab.o $(OFILES) + + $(OFILES): awk.h ytab.h proto.h + +-ytab.c: awk.h proto.h awkgram.y ++#Clear dependency for parallel build: (make -j) ++#YACC generated y.tab.c and y.tab.h at the same time ++#this needs to be a static pattern rules otherwise multiple target ++#are mapped onto multiple executions of yacc, which overwrite ++#each others outputs. ++y%.c y%.h: awk.h proto.h awkgram.y + $(YACC) $(YFLAGS) awkgram.y +- mv y.tab.c ytab.c +- mv y.tab.h ytab.h ++ mv y.$*.c y$*.c ++ mv y.$*.h y$*.h + + ytab.h: ytab.c + +-- +2.19.2 + diff --git a/sys-apps/nawk/nawk-20180827.ebuild b/sys-apps/nawk/nawk-20180827.ebuild new file mode 100644 index 000000000000..0a5c7119b754 --- /dev/null +++ b/sys-apps/nawk/nawk-20180827.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit toolchain-funcs + +DESCRIPTION="Brian Kernighan's pattern scanning and processing language" +HOMEPAGE="https://www.cs.princeton.edu/~bwk/btl.mirror/" +SRC_URI="https://github.com/onetrueawk/awk/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-macos" + +RDEPEND=" + app-eselect/eselect-awk + !sys-freebsd/freebsd-ubin" + +DEPEND=" + ${RDEPEND} + virtual/yacc" + +S="${WORKDIR}/awk-${PV}" + +PATCHES=( "${FILESDIR}/${P}"-parallel-build.patch ) + +DOCS=( README FIXES ) + +src_compile() { + emake \ + CC="$(tc-getCC)" \ + CFLAGS="${CFLAGS}" \ + CPPFLAGS=-DHAS_ISBLANK \ + ALLOC="${LDFLAGS}" \ + YACC=$(type -p yacc) \ + YFLAGS="-d" +} + +src_install() { + newbin a.out "${PN}" + sed \ + -e 's/awk/nawk/g' \ + -e 's/AWK/NAWK/g' \ + -e 's/Awk/Nawk/g' \ + awk.1 > "${PN}".1 || die "manpage patch failed" + doman "${PN}.1" + einstalldocs +} + +pkg_postinst() { + eselect awk update ifunset +} + +pkg_postrm() { + eselect awk update ifunset +} -- cgit v1.2.3