diff options
6 files changed, 77 insertions, 14 deletions
diff --git a/dev-util/kbuild/Manifest b/dev-util/kbuild/Manifest index 52025f0e509d..0f13a4a70b63 100644 --- a/dev-util/kbuild/Manifest +++ b/dev-util/kbuild/Manifest @@ -1,2 +1,3 @@ DIST kBuild-0.1.9998-pre20120806-src.tar.xz 1665728 SHA256 c8e1c78513b6a8c32cc9a4998f2645a17054b1740bc5f13f587bb8de23840d03 SHA512 61e3fb2405dbfdd464eec580a9b2ed953533abdb07b4aad051029e46a1cccb1cef9037c2f9d0b1a06b3e505e8b484f060bec1d97f10ef7933de484429efa281e WHIRLPOOL c88b2e0996905137bbf773c219a53a025cadb1a5362236b891b2d38e0ad0a9264d330f1a258a4c6d6cc3ffde3475fe9d7ae794f8a9b6f017ea1f4fab000fe978 DIST kBuild-0.1.9998-pre20131130-src.tar.xz 1707632 SHA256 def0a44cc0a91b6aa8a80f73ace0cfc315f298ba3e0d3d81fe52834091b68586 SHA512 66f418c0e052389d2b5cfc4d46bc8598ceaeded369151047e455e921bef494ec42099cdc368d24b572eacd809bb7c124d07e0fab54788af01664b72f571fb047 WHIRLPOOL 95caf78eaa6ead0d9a009879a2ba9a01b138760345eb38a6786ceaf0262520e1827b5e4401884cd6d3849bfa5528f45a9a5cdac5ae61e6cbd1753dec0ba0da2f +DIST kbuild-0.1.9998_pre20131130-tools_and_units_updates.patch.xz 7344 SHA256 0dcfb79274a96f1a67aa466ca468bebf00a39544517ad0d05c09595341d11e1a SHA512 91aac638e9f4cc321f7d06c89be1a4ce4e57aa88165c71a4f68a73ad51f049f631b2d7427178014408b551fac5678f0c0bf806a61f9d749daf5019f1b6a61bb0 WHIRLPOOL bb0a295e93870364ab176eaca3d07e18567148e5ba431a205085220b305b5cd78c210bea8896611bd4b9b47a71a527afc55a9a30a64b707993c576466609ee8a diff --git a/dev-util/kbuild/files/kbuild-0.1.5-gentoo-docdir.patch b/dev-util/kbuild/files/kbuild-0.1.5-gentoo-docdir.patch index 4f1653973bfe..b074a984af4c 100644 --- a/dev-util/kbuild/files/kbuild-0.1.5-gentoo-docdir.patch +++ b/dev-util/kbuild/files/kbuild-0.1.5-gentoo-docdir.patch @@ -1,5 +1,5 @@ ---- Config.kmk -+++ Config.kmk +--- a/Config.kmk ++++ b/Config.kmk @@ -147,7 +147,7 @@ MY_INST_DATA := $(MY_INST_ROOT)share/kBuild/ endif 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 index 435b3f57fbd2..eb71fb02f4f0 100644 --- 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 @@ -1,6 +1,5 @@ -diff -urN kBuild-0.1.9998-pre20110817-orig/src/sed/lib/regex_internal.c kBuild-0.1.9998-pre20110817/src/sed/lib/regex_internal.c ---- kBuild-0.1.9998-pre20110817-orig/src/sed/lib/regex_internal.c 2011-08-17 14:28:42.000000000 -0700 -+++ kBuild-0.1.9998-pre20110817/src/sed/lib/regex_internal.c 2012-06-16 13:55:05.341176965 -0700 +--- kBuild-0.1.9998-pre20110817/src/sed/lib/regex_internal.c ++++ kBuild-0.1.9998-pre20110817/src/sed/lib/regex_internal.c @@ -781,7 +781,7 @@ } diff --git a/dev-util/kbuild/files/kbuild-glibc-2.10.patch b/dev-util/kbuild/files/kbuild-glibc-2.10.patch index a1d17d7d6497..d24a8f7439dc 100644 --- a/dev-util/kbuild/files/kbuild-glibc-2.10.patch +++ b/dev-util/kbuild/files/kbuild-glibc-2.10.patch @@ -1,6 +1,5 @@ -diff -ruN kBuild-0.1.5-orig/src/ash/output.c kBuild-0.1.5/src/ash/output.c ---- kBuild-0.1.5-orig/src/ash/output.c 2009-04-08 18:21:26.000000000 -0400 -+++ kBuild-0.1.5/src/ash/output.c 2009-05-22 20:11:49.000000000 -0400 +--- kBuild-0.1.5/src/ash/output.c ++++ kBuild-0.1.5/src/ash/output.c @@ -230,6 +230,7 @@ va_end(ap); } @@ -17,9 +16,8 @@ diff -ruN kBuild-0.1.5-orig/src/ash/output.c kBuild-0.1.5/src/ash/output.c void fmtstr(char *outbuf, size_t length, const char *fmt, ...) -diff -ruN kBuild-0.1.5-orig/src/ash/output.h kBuild-0.1.5/src/ash/output.h ---- kBuild-0.1.5-orig/src/ash/output.h 2009-04-08 18:21:26.000000000 -0400 -+++ kBuild-0.1.5/src/ash/output.h 2009-05-22 20:12:28.000000000 -0400 +--- kBuild-0.1.5/src/ash/output.h ++++ kBuild-0.1.5/src/ash/output.h @@ -65,8 +65,10 @@ __attribute__((__format__(__printf__,2,3))); void out1fmt(const char *, ...) diff --git a/dev-util/kbuild/files/kbuild-unknown-configure-opt.patch b/dev-util/kbuild/files/kbuild-unknown-configure-opt.patch index c9a8994ea33c..36cabae2b138 100644 --- a/dev-util/kbuild/files/kbuild-unknown-configure-opt.patch +++ b/dev-util/kbuild/files/kbuild-unknown-configure-opt.patch @@ -1,6 +1,5 @@ -diff -urN ./kBuild-0.1.5.orig/bootstrap.gmk ./kBuild-0.1.5/bootstrap.gmk ---- ./bootstrap.gmk 2009-01-10 03:24:02.000000000 +0100 -+++ ./bootstrap.gmk 2009-03-11 10:39:25.679010950 +0100 +--- a/bootstrap.gmk ++++ b/bootstrap.gmk @@ -179,7 +179,7 @@ echo done > $@ diff --git a/dev-util/kbuild/kbuild-0.1.9998_pre20131130-r1.ebuild b/dev-util/kbuild/kbuild-0.1.9998_pre20131130-r1.ebuild new file mode 100644 index 000000000000..a51a00683971 --- /dev/null +++ b/dev-util/kbuild/kbuild-0.1.9998_pre20131130-r1.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit eutils autotools toolchain-funcs + +MY_P=kBuild-${PV/_/-}-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 + https://dev.gentoo.org/~polynomial-c/${P}-tools_and_units_updates.patch.xz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="sys-devel/flex + sys-devel/gettext + virtual/yacc" +RDEPEND="" + +S=${WORKDIR}/${MY_P/-src} + +PATCHES=( + "${FILESDIR}/${PN}-unknown-configure-opt.patch" + "${FILESDIR}/${PN}-glibc-2.10.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_pre20110817-gold.patch" + "${FILESDIR}/${PN}-0.1.9998_pre20110817-gcc-4.7.patch" + "${WORKDIR}/${P}-tools_and_units_updates.patch" +) + +src_prepare() { + rm -rf "${S}/kBuild/bin" + + default + + mv src/kmk/configure.{in,ac} || die + + cd "${S}/src/kmk" || die + eautoreconf + cd "${S}/src/sed" || die + # AM_CONFIG_HEADER is obsolete since automake-1.13 (bug #467104) + sed 's@AM_CONFIG_HEADER@AC_CONFIG_HEADERS@' -i configure.ac || die + eautoreconf + + sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \ + -i "${S}"/Config.kmk || die #332225 + tc-export CC RANLIB #AR does not work here +} + +src_compile() { + kBuild/env.sh --full make -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" +} |