commit: 400674952a39af6c1b89d239d877bf45201874d3 Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> AuthorDate: Wed Jan 11 15:30:39 2023 +0000 Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> CommitDate: Wed Jan 11 15:30:39 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40067495
dev-util/kbuild: drop 0.1.9998.3407 Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org> dev-util/kbuild/Manifest | 1 - .../files/kbuild-0.1.9998.3407-glibc-2.32+.patch | 59 ----------------- dev-util/kbuild/kbuild-0.1.9998.3407.ebuild | 73 ---------------------- 3 files changed, 133 deletions(-) diff --git a/dev-util/kbuild/Manifest b/dev-util/kbuild/Manifest index bcd3da9adc45..4632dc45dd6d 100644 --- a/dev-util/kbuild/Manifest +++ b/dev-util/kbuild/Manifest @@ -1,3 +1,2 @@ -DIST kbuild-0.1.9998.3407-src.tar.xz 2351596 BLAKE2B ed562a739831c465ba66b2c357b1ab52cb072e61fa597d96d9e66e1b57a7f790c7e37fc82ef7ff49114b0cb4cb623e558d96864e98ca36bd42fe16e58e863dc7 SHA512 0a1fddff595f7ccfdb65a1a660c82860f132796b42149b8b40808d0df489312dcd96402236150c8ec5ec32c1cc142ce7af1150e10fdb83bf798e4d690dd64314 DIST kbuild-0.1.9998.3499-src.tar.xz 2371580 BLAKE2B 847c5c67ded37ca87228ff7164d6c7f2f670a57f2fd94d6d0bf4f8896266e7fe5442666c03dbda016564a52dc91d10be83f0d4b0ef5093db0f5210ac8d5f3aaa SHA512 eebdcd1d2fa71313edd764d45a4aa3580078af22d7c5fed32d3d139a4f41c4e028282fdfdda0ee9b617ed0e8e63b8f5d065b3cf6647f08fe446560938b7577fc DIST kbuild-0.1.9998.3572-src.tar.xz 3973848 BLAKE2B 103e42d719fd77bc5c55aea48bdfd01c8ad136529cc76cc8c1297f87e21e5d4e2e7149f9321c5174808613a84331dbea8bb4c0a7662eb2de9e1045c8ad365047 SHA512 96bb5e1759990bf3acaca4b0ba7c02926c6607b0cd94f7fca222b13eee5c3364c64b35e3473c5cee45fa094cb2b851ac9f3a3a9fe60cff894baf46238ccb4006 diff --git a/dev-util/kbuild/files/kbuild-0.1.9998.3407-glibc-2.32+.patch b/dev-util/kbuild/files/kbuild-0.1.9998.3407-glibc-2.32+.patch deleted file mode 100644 index 68a39fc68deb..000000000000 --- a/dev-util/kbuild/files/kbuild-0.1.9998.3407-glibc-2.32+.patch +++ /dev/null @@ -1,59 +0,0 @@ -http://trac.netlabs.org/kbuild/changeset?format=diff&new=3408&old=3407&new_path=%2Ftrunk&old_path=%2Ftrunk - ---- a/src/kash/jobs.c -+++ b/src/kash/jobs.c -@@ -390,4 +390,5 @@ - fmtstr(s + col, 16, "Done"); - } else { -+ const char *pszSigNm; - #if JOBS - if (WIFSTOPPED(ps->status)) -@@ -397,6 +398,7 @@ - st = WTERMSIG(ps->status); - st &= 0x7f; -- if (st < NSIG && sys_siglist[st]) -- scopyn(sys_siglist[st], s + col, 32); -+ pszSigNm = st < NSIG ? strsignal(st) : NULL; -+ if (pszSigNm) -+ scopyn(pszSigNm, s + col, 32); - else - fmtstr(s + col, 16, "Signal %d", st); ---- a/src/kash/shinstance.h -+++ b/src/kash/shinstance.h -@@ -381,10 +381,6 @@ - /*# define SIGBREAK 21 */ - /*# define SIGABRT 22 */ -- --# define sys_siglist sys_signame -+const char *strsignal(int iSig); - #endif /* _MSC_VER */ --#ifdef __sun__ --# define sys_siglist _sys_siglist --#endif - #ifndef HAVE_SYS_SIGNAME - extern char sys_signame[NSIG][16]; ---- a/src/kash/sys_signame.c -+++ b/src/kash/sys_signame.c -@@ -12,5 +12,5 @@ - void init_sys_signame(void) - { -- unsigned i; -+ unsigned i; - if (sys_signame_initialized) - return; -@@ -120,2 +120,14 @@ - sys_signame_initialized = 1; - } -+ -+#if defined(_MSC_VER) -+const char *strsignal(int iSig) -+{ -+ if (!sys_signame_initialized) -+ init_sys_signame(); -+ if (iSig < NSIG) -+ return sys_signame(iSig); -+ return NULL; -+} -+#endif -+ - diff --git a/dev-util/kbuild/kbuild-0.1.9998.3407.ebuild b/dev-util/kbuild/kbuild-0.1.9998.3407.ebuild deleted file mode 100644 index 647c3de17e25..000000000000 --- a/dev-util/kbuild/kbuild-0.1.9998.3407.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools toolchain-funcs - -MY_P="${P}-src" -DESCRIPTION="A makefile framework for writing simple makefiles for complex tasks" -HOMEPAGE="http://svn.netlabs.org/kbuild/wiki"; -#SRC_URI="ftp://ftp.netlabs.org/pub/${PN}/${MY_P}.tar.gz"; -SRC_URI="https://dev.gentoo.org/~polynomial-c/${MY_P}.tar.xz"; - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -# We cannot depend on app-alternatives/yacc until bug #734354 has been fixed -DEPEND=" - sys-apps/texinfo - sys-devel/flex - sys-devel/gettext - virtual/pkgconfig - || ( - dev-util/byacc - dev-util/yacc - <sys-devel/bison-3.7 - ) -" -RDEPEND="" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/${PN}-0.1.9998.3407-unknown_configure_opt.patch" - "${FILESDIR}/${PN}-0.1.5-gentoo-docdir.patch" - "${FILESDIR}/${PN}-0.1.9998_pre20120806-qa.patch" - "${FILESDIR}/${PN}-0.1.9998_pre20110817-kash-link-pthread.patch" - "${FILESDIR}/${PN}-0.1.9998.3407-gold.patch" - "${FILESDIR}/${PN}-0.1.9998.3407-glibc-2.32+.patch" -) - -pkg_setup() { - # Package fails with distcc (bug #255371) - export DISTCC_DISABLE=1 -} - -src_prepare() { - default - - # Add a file with the svn revision this package was pulled from - printf '%s\n' "KBUILD_SVN_REV := $(ver_cut 4)" \ - > SvnInfo.kmk || die - - cd "${S}/src/kmk" || die - eautoreconf - cd "${S}/src/sed" || die - eautoreconf - - sed -e "s@_LDFLAGS\.$(tc-arch)*.*=@& ${LDFLAGS}@g" \ - -i "${S}"/Config.kmk || die #332225 - tc-export CC PKG_CONFIG RANLIB #AR does not work here -} - -src_compile() { - kBuild/env.sh --full emake -f bootstrap.gmk AUTORECONF=true AR="$(tc-getAR)" \ - || die "bootstrap failed" -} - -src_install() { - kBuild/env.sh kmk NIX_INSTALL_DIR=/usr PATH_INS="${D}" install \ - || die "install failed" -}
