From 8668c0f6c5fd1d084b8b2bdac1cfa1fcba412f65 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 19 Sep 2022 11:21:41 +0100 Subject: gentoo auto-resync : 19:09:2022 - 11:21:41 --- app-shells/ksh/Manifest | 5 +- app-shells/ksh/files/ksh-1.0.0-beta.2-gcc12.patch | 63 ------------------- app-shells/ksh/ksh-1.0.0_beta2.ebuild | 75 ----------------------- app-shells/ksh/ksh-1.0.3.ebuild | 2 + 4 files changed, 3 insertions(+), 142 deletions(-) delete mode 100644 app-shells/ksh/files/ksh-1.0.0-beta.2-gcc12.patch delete mode 100644 app-shells/ksh/ksh-1.0.0_beta2.ebuild (limited to 'app-shells/ksh') diff --git a/app-shells/ksh/Manifest b/app-shells/ksh/Manifest index e954901a4eec..bc8e3acafed2 100644 --- a/app-shells/ksh/Manifest +++ b/app-shells/ksh/Manifest @@ -1,7 +1,4 @@ -AUX ksh-1.0.0-beta.2-gcc12.patch 4174 BLAKE2B 6ad9afdb51530d211dbf904cdc8c40ef740f4798f0c98aa39e5101c6093f5a61ed3de52344f73433142a721a5358b19137b48623a24e2ad25c3acbf3e6ebc180 SHA512 5f59cf7ff32c49f58e4b4842e78cb8ab3f29e24460f91ffb0c273ae3fb22d47897534bbe58b28b57b649dcf871f725cc2bf4d2ba3713973a9d8bbacab2f4e8d5 -DIST ksh-v1.0.0-beta.2.tar.gz 2238224 BLAKE2B b4eb8e116d0dd8fda498fb8d2805613a73291be628ce87ebc1c47c9bc8c49b236b285accaf35b4c9e411df23b99c6a949b672edeea1f1f317fc85a2b4db48779 SHA512 c2cd5a4b442bcff1dd2c1c054ee79c4cb131dce28d811dcd3476164d6cb7e88e6b317a094b16f227564a1266708ef0cfeca2af0929c00a19497cf1b67c647cf2 DIST ksh-v1.0.3.tar.gz 2110771 BLAKE2B 4316c78f7889fb2e4630a83dd0f1c5c4c4b418a822e8f7d3d9415a83bbef6e993cbd21b4842c7f56cd8647305c4bdddc04562b8788f2ee6e14698a9cb090f386 SHA512 9d6e664bc6c8d102ba09e692d057b9546b07ba3ecb060449df6648e7c99f8dfd670401e6fcf34f6f3de13338a3c31c09596344931ccfdf4cd4e49eabdf005c23 -EBUILD ksh-1.0.0_beta2.ebuild 1548 BLAKE2B a0302d312d363f88e683fa77ca28c5a9798ca2b5827bbd8210a039f8b32d3f885cf3a5b5be7784b2eaef94656d607181d25bead15436f6a44b894005cc0a296b SHA512 1ca86eeb1dc7302d0636649a81448e02dc1840cd715cba70683954f58089571ad1fe4a2590f2037d71fd200cc886b589742d47df8a06579992877842bd392986 -EBUILD ksh-1.0.3.ebuild 1592 BLAKE2B 5908cdc2e7465da096d99df41cc95ee983a0896d3633b44a7debaee9b10c944ff6e50728d115b468c7f9da228fca60dd469ede03f59f7cc08984c76a8615e6d4 SHA512 031f2c6798ea4148798c8ee3d6296bdbf4faf6d4d03542e24a8395b5ab6dacf407cb678f25f4e14ad414699f411565caba9f7d2470e8f7530cbf10961681b72a +EBUILD ksh-1.0.3.ebuild 1646 BLAKE2B 4d78b22a8600e0e910f6edc172307e26194b48bd7be4389506ca2d14454df615ddcb14720d8b17aeb8cc224fe75edc22a971b100204ae93700a1e72963f8b6df SHA512 804f7b355fd6d7365a97499c4856d6a7c03fca45c13f0c7f589e325ae28c544a7b798fb1c4e7eed9f13b8dfc640d258fff2c4b02a818425c8666f5d28623bf09 EBUILD ksh-9999.ebuild 1592 BLAKE2B 5908cdc2e7465da096d99df41cc95ee983a0896d3633b44a7debaee9b10c944ff6e50728d115b468c7f9da228fca60dd469ede03f59f7cc08984c76a8615e6d4 SHA512 031f2c6798ea4148798c8ee3d6296bdbf4faf6d4d03542e24a8395b5ab6dacf407cb678f25f4e14ad414699f411565caba9f7d2470e8f7530cbf10961681b72a MISC metadata.xml 1489 BLAKE2B 8e0c5934f79c12702985656ddc95d5051c59f053c94bab595d3ec08aa336b9ab50de5e87aab7b47991c02aa6924932e59ab6fb4d3e38c60b139478a210d62cad SHA512 fa4422e4dbd25daed7ed21e66d06fb678ccbb3c37a62a090eddc9c3281e0d17310f5df5f172267f7a91935db4059b8dcdf78b88cd902d8f10f4f798e6264b0dc diff --git a/app-shells/ksh/files/ksh-1.0.0-beta.2-gcc12.patch b/app-shells/ksh/files/ksh-1.0.0-beta.2-gcc12.patch deleted file mode 100644 index 1d46cc3b3f5e..000000000000 --- a/app-shells/ksh/files/ksh-1.0.0-beta.2-gcc12.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 4a1dbcbaa04b6edf4c8c5d950031c6d853acf358 Mon Sep 17 00:00:00 2001 -From: Vincent Mihalkovic -Date: Wed, 11 May 2022 14:27:35 +0200 -Subject: [PATCH] Mamfile: add -lm flag where needed - ---- - src/cmd/builtin/Mamfile | 2 +- - src/cmd/ksh93/Mamfile | 8 ++++---- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/cmd/builtin/Mamfile b/src/cmd/builtin/Mamfile -index 16974ae54ad2..f6e726105e43 100644 ---- a/src/cmd/builtin/Mamfile -+++ b/src/cmd/builtin/Mamfile -@@ -50,7 +50,7 @@ make install - exec - ${CC} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -DERROR_CATALOG=\""builtin"\" -D_PACKAGE_ast -DCMD_STANDALONE=b_pty -c pty.c - done pty.o generated - bind -lutil dontcare -- exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${CCFLAGS} ${LDFLAGS} -lm ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o pty pty.o ${mam_libutil} ${mam_libast} ${mam_libcmd} -+ exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o pty pty.o ${mam_libutil} ${mam_libast} ${mam_libcmd} -lm - done pty generated - make ${INSTALLROOT}/bin - exec - if silent test ! -d ${INSTALLROOT}/bin -diff --git a/src/cmd/ksh93/Mamfile b/src/cmd/ksh93/Mamfile -index 3936ff926902..e2899523b634 100644 ---- a/src/cmd/ksh93/Mamfile -+++ b/src/cmd/ksh93/Mamfile -@@ -1219,7 +1219,7 @@ make install - make data/math.tab implicit - done data/math.tab - done features/math.sh dontcare -- exec - iffe ${IFFEFLAGS} -v -c "${CC} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${KSH_SHOPTFLAGS} ${CCFLAGS} ${LDFLAGS}" ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdll} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libnsl} : run features/math.sh ${PACKAGEROOT}/src/cmd/ksh93/data/math.tab -+ exec - iffe ${IFFEFLAGS} -v -c "${CC} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${KSH_SHOPTFLAGS} ${CCFLAGS} ${LDFLAGS}" ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdll} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libnsl} -lm : run features/math.sh ${PACKAGEROOT}/src/cmd/ksh93/data/math.tab - make ${PACKAGE_ast_INCLUDE}/ast_standards.h implicit - done ${PACKAGE_ast_INCLUDE}/ast_standards.h dontcare - make ${INSTALLROOT}/src/lib/libast/FEATURE/float implicit -@@ -1386,7 +1386,7 @@ make install - prev +li - prev ${mam_libsocket} - prev ${mam_libsecdb} -- exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${KSH_SHOPTFLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o ksh pmain.o ${mam_libshell} ${mam_libnsl} ${mam_libast} -+ exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${KSH_SHOPTFLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o ksh pmain.o ${mam_libshell} ${mam_libnsl} ${mam_libast} -lm - done ksh generated - make shcomp - make shcomp.o -@@ -1408,7 +1408,7 @@ make install - prev +li - prev ${mam_libsocket} - prev ${mam_libsecdb} -- exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${KSH_SHOPTFLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o shcomp shcomp.o ${mam_libshell} ${mam_libnsl} ${mam_libast} -+ exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${KSH_SHOPTFLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o shcomp shcomp.o ${mam_libshell} ${mam_libnsl} ${mam_libast} -lm - done shcomp generated - make suid_exec - make suid_exec.o -@@ -1429,7 +1429,7 @@ make install - prev +li - prev ${mam_libsocket} - prev ${mam_libsecdb} -- exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${KSH_SHOPTFLAGS} ${CCFLAGS} ${LDFLAGS} -lm ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o suid_exec suid_exec.o ${mam_libast} ${mam_libnsl} ${mam_libast} -+ exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${KSH_SHOPTFLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o suid_exec suid_exec.o ${mam_libast} ${mam_libnsl} ${mam_libast} -lm - done suid_exec generated - make shell - prev libshell.a archive diff --git a/app-shells/ksh/ksh-1.0.0_beta2.ebuild b/app-shells/ksh/ksh-1.0.0_beta2.ebuild deleted file mode 100644 index 297d09947372..000000000000 --- a/app-shells/ksh/ksh-1.0.0_beta2.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 2021-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="The Original ATT Korn Shell" -HOMEPAGE="http://www.kornshell.com/" - -MY_PV=$(ver_rs 3 - 4 .) -SRC_URI="https://github.com/ksh93/${PN}/archive/v${MY_PV}/ksh-v${MY_PV}.tar.gz" - -LICENSE="EPL-1.0" -SLOT="0" - -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" - -S="${WORKDIR}/${PN}-${MY_PV}" - -PATCHES=( - "${FILESDIR}/ksh-1.0.0-beta.2-gcc12.patch" -) - -src_prepare() { - default - - # disable register for debugging - sed -i 1i"#define register" src/lib/libast/include/ast.h || die -} - -src_compile() { - local extraflags=( - "-Wno-unknown-pragmas" - "-Wno-missing-braces" - "-Wno-unused-result" - "-Wno-return-type" - "-Wno-int-to-pointer-cast" - "-Wno-parentheses" - "-Wno-unused" - "-Wno-unused-but-set-variable" - "-Wno-cpp" - "-Wno-maybe-uninitialized" - "-Wno-lto-type-mismatch" - "-P" - ) - append-cflags $(test-flags-CC ${extraflags[@]}) - filter-flags '-fdiagnostics-color=always' # https://github.com/ksh93/ksh/issues/379 - export CCFLAGS="${CFLAGS} -fno-strict-aliasing" - - tc-export AR CC LD NM - - sh bin/package make SHELL="${BROOT}"/bin/sh || die -} - -src_test() { - # test tries to catch IO error - addwrite /proc/self/mem - - # arith.sh uses A for tests - unset A - - sh bin/shtests --compile || die -} - -src_install() { - local myhost="$(sh bin/package host)" - cd "arch/${myhost}" || die - - into / - dobin bin/ksh - dosym ksh /bin/rksh - - newman man/man1/sh.1 ksh.1 -} diff --git a/app-shells/ksh/ksh-1.0.3.ebuild b/app-shells/ksh/ksh-1.0.3.ebuild index 8fb7af0f3c4b..dd729029724d 100644 --- a/app-shells/ksh/ksh-1.0.3.ebuild +++ b/app-shells/ksh/ksh-1.0.3.ebuild @@ -41,6 +41,8 @@ src_compile() { "-Wno-cpp" "-Wno-maybe-uninitialized" "-Wno-lto-type-mismatch" + "-Wno-error=int-conversion" + "-Wno-int-conversion" "-P" ) append-cflags $(test-flags-CC ${extraflags[@]}) -- cgit v1.2.3