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/, dev-util/kbuild/files/
Date: Fri, 20 Oct 2017 08:28:17
Message-Id: 1508488087.1ad141de5578cd3389a9e36f18473e588bf27601.polynomial-c@gentoo
1 commit: 1ad141de5578cd3389a9e36f18473e588bf27601
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 20 08:27:06 2017 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 20 08:28:07 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ad141de
7
8 dev-util/kbuild: Bump to version 0.1.9998_pre20131130
9
10 Package-Manager: Portage-2.3.12, Repoman-2.3.3
11
12 dev-util/kbuild/Manifest | 1 +
13 .../files/kbuild-0.1.9998_pre20171020-gold.patch | 11 ++++
14 dev-util/kbuild/kbuild-0.1.9998_pre20171020.ebuild | 62 ++++++++++++++++++++++
15 3 files changed, 74 insertions(+)
16
17 diff --git a/dev-util/kbuild/Manifest b/dev-util/kbuild/Manifest
18 index dca309fd1f5..a483ba76729 100644
19 --- a/dev-util/kbuild/Manifest
20 +++ b/dev-util/kbuild/Manifest
21 @@ -1,2 +1,3 @@
22 DIST kBuild-0.1.9998-pre20131130-src.tar.xz 1707632 SHA256 def0a44cc0a91b6aa8a80f73ace0cfc315f298ba3e0d3d81fe52834091b68586 SHA512 66f418c0e052389d2b5cfc4d46bc8598ceaeded369151047e455e921bef494ec42099cdc368d24b572eacd809bb7c124d07e0fab54788af01664b72f571fb047 WHIRLPOOL 95caf78eaa6ead0d9a009879a2ba9a01b138760345eb38a6786ceaf0262520e1827b5e4401884cd6d3849bfa5528f45a9a5cdac5ae61e6cbd1753dec0ba0da2f
23 DIST kbuild-0.1.9998_pre20131130-tools_and_units_updates.patch.xz 7344 SHA256 0dcfb79274a96f1a67aa466ca468bebf00a39544517ad0d05c09595341d11e1a SHA512 91aac638e9f4cc321f7d06c89be1a4ce4e57aa88165c71a4f68a73ad51f049f631b2d7427178014408b551fac5678f0c0bf806a61f9d749daf5019f1b6a61bb0 WHIRLPOOL bb0a295e93870364ab176eaca3d07e18567148e5ba431a205085220b305b5cd78c210bea8896611bd4b9b47a71a527afc55a9a30a64b707993c576466609ee8a
24 +DIST kbuild-0.1.9998_pre20171020-src.tar.xz 2190856 SHA256 96b031b183ffb63cbbf77b1c68325868c1064d377c799ffcab0cdfb61d01aea7 SHA512 53c55a520f3711d1141b10eaeb3bec5dc57bb8476c6b658826e05dbb525eda43a0007dd94dcdde31ea39ad0bb29223ef8ad2a72da1404e53919e444039794043 WHIRLPOOL 86ce166505191eca0a83a238d61c6d2935fc43bd6d6a93c0b0dcec529a797d8a9589be4bf9498934bf7b6b80dcbfe5cf4193cd2969bf1fff5bc41209a51e5af0
25
26 diff --git a/dev-util/kbuild/files/kbuild-0.1.9998_pre20171020-gold.patch b/dev-util/kbuild/files/kbuild-0.1.9998_pre20171020-gold.patch
27 new file mode 100644
28 index 00000000000..4c98942c0f3
29 --- /dev/null
30 +++ b/dev-util/kbuild/files/kbuild-0.1.9998_pre20171020-gold.patch
31 @@ -0,0 +1,11 @@
32 +--- kbuild-0.1.9998_pre20171020/src/kmk/Makefile.kmk
33 ++++ kbuild-0.1.9998_pre20171020/src/kmk/Makefile.kmk
34 +@@ -57,7 +57,7 @@
35 + ifneq ($(KBUILD_TARGET),os2)
36 + TEMPLATE_BIN-KMK_INCS += glob
37 + endif
38 +-TEMPLATE_BIN-KMK_LIBS = $(LIB_KUTIL) $(TEMPLATE_BIN-THREADED_LIBS) $(kmkmissing_1_TARGET) $(LIB_KUTIL)
39 ++TEMPLATE_BIN-KMK_LIBS = $(LIB_KUTIL) $(TEMPLATE_BIN-THREADED_LIBS) $(kmkmissing_1_TARGET) $(LIB_KUTIL) pthread
40 + ifdef ELECTRIC_HEAP # for electric heap (see electric.c) - windows only.
41 + ifeq ($(KBUILD_TARGET),win)
42 + TEMPLATE_BIN-KMK_CFLAGS = $(TEMPLATE_BIN-THREADED_CFLAGS) /FI$(kmk_DEFPATH)/electric.h -DELECTRIC_HEAP=1
43
44 diff --git a/dev-util/kbuild/kbuild-0.1.9998_pre20171020.ebuild b/dev-util/kbuild/kbuild-0.1.9998_pre20171020.ebuild
45 new file mode 100644
46 index 00000000000..612e8ebbab1
47 --- /dev/null
48 +++ b/dev-util/kbuild/kbuild-0.1.9998_pre20171020.ebuild
49 @@ -0,0 +1,62 @@
50 +# Copyright 1999-2017 Gentoo Foundation
51 +# Distributed under the terms of the GNU General Public License v2
52 +
53 +EAPI=6
54 +
55 +inherit eutils autotools toolchain-funcs
56 +
57 +MY_P="${P}-src"
58 +DESCRIPTION="A makefile framework for writing simple makefiles for complex tasks"
59 +HOMEPAGE="http://svn.netlabs.org/kbuild/wiki"
60 +#SRC_URI="ftp://ftp.netlabs.org/pub/${PN}/${MY_P}.tar.gz"
61 +SRC_URI="https://dev.gentoo.org/~polynomial-c/${MY_P}.tar.xz"
62 +
63 +LICENSE="GPL-3+"
64 +SLOT="0"
65 +KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
66 +IUSE=""
67 +
68 +DEPEND="
69 + sys-apps/texinfo
70 + sys-devel/flex
71 + sys-devel/gettext
72 + virtual/yacc
73 +"
74 +RDEPEND=""
75 +
76 +PATCHES=(
77 + "${FILESDIR}/${PN}-unknown-configure-opt.patch"
78 + "${FILESDIR}/${PN}-0.1.5-gentoo-docdir.patch"
79 + "${FILESDIR}/${PN}-0.1.9998_pre20120806-qa.patch"
80 + "${FILESDIR}/${PN}-0.1.9998_pre20110817-kash-link-pthread.patch"
81 + "${FILESDIR}/${PN}-0.1.9998_pre20171020-gold.patch"
82 +)
83 +
84 +src_prepare() {
85 + rm -rf "${S}/kBuild/bin"
86 +
87 + default
88 +
89 + mv src/kmk/configure.{in,ac} || die
90 +
91 + cd "${S}/src/kmk" || die
92 + eautoreconf
93 + cd "${S}/src/sed" || die
94 + # AM_CONFIG_HEADER is obsolete since automake-1.13 (bug #467104)
95 + sed 's@AM_CONFIG_HEADER@AC_CONFIG_HEADERS@' -i configure.ac || die
96 + eautoreconf
97 +
98 + sed -e "s@_LDFLAGS\.$(tc-arch)*.*=@& ${LDFLAGS}@g" \
99 + -i "${S}"/Config.kmk || die #332225
100 + tc-export CC RANLIB #AR does not work here
101 +}
102 +
103 +src_compile() {
104 + kBuild/env.sh --full emake -f bootstrap.gmk AUTORECONF=true AR="$(tc-getAR)" \
105 + || die "bootstrap failed"
106 +}
107 +
108 +src_install() {
109 + kBuild/env.sh kmk NIX_INSTALL_DIR=/usr PATH_INS="${D}" install \
110 + || die "install failed"
111 +}