Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/kbuild/files/, dev-util/kbuild/
Date: Sat, 03 Nov 2018 20:48:01
Message-Id: 1541277964.25ea2ac3672e58ca5baa29252207e2f3b395225a.polynomial-c@gentoo
1 commit: 25ea2ac3672e58ca5baa29252207e2f3b395225a
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Sat Nov 3 20:46:04 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Sat Nov 3 20:46:04 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25ea2ac3
7
8 dev-util/kbuild: Removed old.
9
10 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
11 Package-Manager: Portage-2.3.51, Repoman-2.3.11
12
13 dev-util/kbuild/Manifest | 2 -
14 .../kbuild-0.1.9998_pre20110817-gcc-4.7.patch | 11 ----
15 .../files/kbuild-0.1.9998_pre20110817-gold.patch | 16 ------
16 dev-util/kbuild/files/kbuild-glibc-2.10.patch | 31 ----------
17 .../kbuild/kbuild-0.1.9998_pre20131130-r1.ebuild | 66 ----------------------
18 5 files changed, 126 deletions(-)
19
20 diff --git a/dev-util/kbuild/Manifest b/dev-util/kbuild/Manifest
21 index dab33c879b6..04c82e912dc 100644
22 --- a/dev-util/kbuild/Manifest
23 +++ b/dev-util/kbuild/Manifest
24 @@ -1,4 +1,2 @@
25 -DIST kBuild-0.1.9998-pre20131130-src.tar.xz 1707632 BLAKE2B 51d68203d38a6cc86a32e6c66431739a87df738e920bfc9ff902433a46279fd62c704d9bcae02f0a1cb6a1f97cf68dab059c636ebd425d2b15c50c9c9cb4fcc6 SHA512 66f418c0e052389d2b5cfc4d46bc8598ceaeded369151047e455e921bef494ec42099cdc368d24b572eacd809bb7c124d07e0fab54788af01664b72f571fb047
26 DIST kbuild-0.1.9998.3127-src.tar.xz 2221336 BLAKE2B 12eb542553c2abe4419440d124ed9c6b3c485fc77ca20bc8b8d5265cf2d91003e3bee21ad7e247f1da43c88bd29fdc5d317e42bfca213cde1ac0c900cce03fcf SHA512 b4cfca917efdb19b015a70efc15fdb0f2f08a4b6e493c7ac121dada97866b2f57cb9be9db9dd9b337eda4d5772ab850bf0586e5bfdc370e1332659363374f78d
27 DIST kbuild-0.1.9998.3149-src.tar.xz 2314792 BLAKE2B 84aa1dbbaefc64a3ecc954c383d0516d88efd1a1791180164dd7bc3b26cd82a4a8c35c4b308e9fc960f114c40e77ea4a27acd94b62883c379acefb324a7c3f72 SHA512 74808e6279c01739170535655edbbffb73809f60b18c7ee63a110af7af651628789b9e5d253821f5685f8e8c072890c4669493e64886f53587b810ea0f67826c
28 -DIST kbuild-0.1.9998_pre20131130-tools_and_units_updates.patch.xz 7344 BLAKE2B 75d24ba49ee69a11b8e1d798ebee4470fa50ec4970299faaa67b0537d21729053fa24142d02e428cb56c429c6c17d581d147d659c3a3ad11693e2fa6ab4e6d72 SHA512 91aac638e9f4cc321f7d06c89be1a4ce4e57aa88165c71a4f68a73ad51f049f631b2d7427178014408b551fac5678f0c0bf806a61f9d749daf5019f1b6a61bb0
29
30 diff --git a/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gcc-4.7.patch b/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gcc-4.7.patch
31 deleted file mode 100644
32 index eb71fb02f4f..00000000000
33 --- a/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gcc-4.7.patch
34 +++ /dev/null
35 @@ -1,11 +0,0 @@
36 ---- kBuild-0.1.9998-pre20110817/src/sed/lib/regex_internal.c
37 -+++ kBuild-0.1.9998-pre20110817/src/sed/lib/regex_internal.c
38 -@@ -781,7 +781,7 @@
39 - }
40 -
41 - static unsigned char
42 --internal_function __attribute ((pure))
43 -+internal_function
44 - re_string_fetch_byte_case (re_string_t *pstr)
45 - {
46 - if (BE (!pstr->mbs_allocated, 1))
47
48 diff --git a/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gold.patch b/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gold.patch
49 deleted file mode 100644
50 index 8ad2ab3269c..00000000000
51 --- a/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gold.patch
52 +++ /dev/null
53 @@ -1,16 +0,0 @@
54 - src/kmk/Makefile.kmk | 2 +-
55 - 1 files changed, 1 insertions(+), 1 deletions(-)
56 -
57 -diff --git a/src/kmk/Makefile.kmk b/src/kmk/Makefile.kmk
58 -index fe2cd43..135431e 100644
59 ---- a/src/kmk/Makefile.kmk
60 -+++ b/src/kmk/Makefile.kmk
61 -@@ -59,7 +59,7 @@ TEMPLATE_BIN-KMK_INCS.dragonfly = glob
62 - TEMPLATE_BIN-KMK_INCS.freebsd = glob
63 - TEMPLATE_BIN-KMK_INCS.openbsd = glob
64 - TEMPLATE_BIN-KMK_INCS.solaris = glob
65 --TEMPLATE_BIN-KMK_LIBS = $(TEMPLATE_BIN-THREADED_LIBS) $(kmkmissing_1_TARGET) $(LIB_KUTIL)
66 -+TEMPLATE_BIN-KMK_LIBS = $(TEMPLATE_BIN-THREADED_LIBS) $(kmkmissing_1_TARGET) $(LIB_KUTIL) pthread
67 - ifdef ELECTRIC_HEAP # for electric heap (see electric.c) - windows only.
68 - ifeq ($(KBUILD_TARGET),win)
69 - TEMPLATE_BIN-KMK_CFLAGS = $(TEMPLATE_BIN-THREADED_CFLAGS) /FI$(kmk_DEFPATH)/electric.h -DELECTRIC_HEAP=1
70
71 diff --git a/dev-util/kbuild/files/kbuild-glibc-2.10.patch b/dev-util/kbuild/files/kbuild-glibc-2.10.patch
72 deleted file mode 100644
73 index d24a8f7439d..00000000000
74 --- a/dev-util/kbuild/files/kbuild-glibc-2.10.patch
75 +++ /dev/null
76 @@ -1,31 +0,0 @@
77 ---- kBuild-0.1.5/src/ash/output.c
78 -+++ kBuild-0.1.5/src/ash/output.c
79 -@@ -230,6 +230,7 @@
80 - va_end(ap);
81 - }
82 -
83 -+#if 0
84 - void
85 - dprintf(const char *fmt, ...)
86 - {
87 -@@ -240,6 +241,7 @@
88 - va_end(ap);
89 - flushout(out2);
90 - }
91 -+#endif
92 -
93 - void
94 - fmtstr(char *outbuf, size_t length, const char *fmt, ...)
95 ---- kBuild-0.1.5/src/ash/output.h
96 -+++ kBuild-0.1.5/src/ash/output.h
97 -@@ -65,8 +65,10 @@
98 - __attribute__((__format__(__printf__,2,3)));
99 - void out1fmt(const char *, ...)
100 - __attribute__((__format__(__printf__,1,2)));
101 -+#if 0
102 - void dprintf(const char *, ...)
103 - __attribute__((__format__(__printf__,1,2)));
104 -+#endif
105 - void fmtstr(char *, size_t, const char *, ...)
106 - __attribute__((__format__(__printf__,3,4)));
107 - void doformat(struct output *, const char *, va_list);
108
109 diff --git a/dev-util/kbuild/kbuild-0.1.9998_pre20131130-r1.ebuild b/dev-util/kbuild/kbuild-0.1.9998_pre20131130-r1.ebuild
110 deleted file mode 100644
111 index b4fd8a1a4f0..00000000000
112 --- a/dev-util/kbuild/kbuild-0.1.9998_pre20131130-r1.ebuild
113 +++ /dev/null
114 @@ -1,66 +0,0 @@
115 -# Copyright 1999-2017 Gentoo Foundation
116 -# Distributed under the terms of the GNU General Public License v2
117 -
118 -EAPI=6
119 -
120 -inherit eutils autotools toolchain-funcs
121 -
122 -MY_P=kBuild-${PV/_/-}-src
123 -DESCRIPTION="A makefile framework for writing simple makefiles for complex tasks"
124 -HOMEPAGE="http://svn.netlabs.org/kbuild/wiki"
125 -#SRC_URI="ftp://ftp.netlabs.org/pub/${PN}/${MY_P}.tar.gz"
126 -SRC_URI="https://dev.gentoo.org/~polynomial-c/${MY_P}.tar.xz
127 - https://dev.gentoo.org/~polynomial-c/${P}-tools_and_units_updates.patch.xz"
128 -
129 -LICENSE="GPL-3"
130 -SLOT="0"
131 -KEYWORDS="amd64 x86 ~amd64-fbsd ~x86-fbsd"
132 -IUSE=""
133 -
134 -DEPEND="sys-apps/texinfo
135 - sys-devel/flex
136 - sys-devel/gettext
137 - virtual/yacc"
138 -RDEPEND=""
139 -
140 -S=${WORKDIR}/${MY_P/-src}
141 -
142 -PATCHES=(
143 - "${FILESDIR}/${PN}-unknown-configure-opt.patch"
144 - "${FILESDIR}/${PN}-glibc-2.10.patch"
145 - "${FILESDIR}/${PN}-0.1.5-gentoo-docdir.patch"
146 - "${FILESDIR}/${PN}-0.1.9998_pre20120806-qa.patch"
147 - "${FILESDIR}/${PN}-0.1.9998_pre20110817-kash-link-pthread.patch"
148 - "${FILESDIR}/${PN}-0.1.9998_pre20110817-gold.patch"
149 - "${FILESDIR}/${PN}-0.1.9998_pre20110817-gcc-4.7.patch"
150 - "${WORKDIR}/${P}-tools_and_units_updates.patch"
151 -)
152 -
153 -src_prepare() {
154 - rm -rf "${S}/kBuild/bin"
155 -
156 - default
157 -
158 - mv src/kmk/configure.{in,ac} || die
159 -
160 - cd "${S}/src/kmk" || die
161 - eautoreconf
162 - cd "${S}/src/sed" || die
163 - # AM_CONFIG_HEADER is obsolete since automake-1.13 (bug #467104)
164 - sed 's@AM_CONFIG_HEADER@AC_CONFIG_HEADERS@' -i configure.ac || die
165 - eautoreconf
166 -
167 - sed -e "s@_LDFLAGS\.$(tc-arch)*.*=@& ${LDFLAGS}@g" \
168 - -i "${S}"/Config.kmk || die #332225
169 - tc-export CC RANLIB #AR does not work here
170 -}
171 -
172 -src_compile() {
173 - kBuild/env.sh --full emake -f bootstrap.gmk AUTORECONF=true AR="$(tc-getAR)" \
174 - || die "bootstrap failed"
175 -}
176 -
177 -src_install() {
178 - kBuild/env.sh kmk NIX_INSTALL_DIR=/usr PATH_INS="${D}" install \
179 - || die "install failed"
180 -}