From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 20CFA139694 for ; Wed, 5 Apr 2017 03:00:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 32CC5E0CFF; Wed, 5 Apr 2017 03:00:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id ED9E3E0CFF for ; Wed, 5 Apr 2017 03:00:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3A1F53406B7 for ; Wed, 5 Apr 2017 03:00:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9D37B70B7 for ; Wed, 5 Apr 2017 03:00:16 +0000 (UTC) From: "Aric Belsito" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aric Belsito" Message-ID: <1491361185.ef24c59ff9d1646c71a88e70533f73ec623a9a35.lluixhi@gentoo> Subject: [gentoo-commits] proj/musl:master commit in: dev-util/kbuild/ X-VCS-Repository: proj/musl X-VCS-Files: dev-util/kbuild/Manifest dev-util/kbuild/kbuild-0.1.9998_pre20131130-r1.ebuild dev-util/kbuild/kbuild-0.1.9998_pre20131130.ebuild X-VCS-Directories: dev-util/kbuild/ X-VCS-Committer: lluixhi X-VCS-Committer-Name: Aric Belsito X-VCS-Revision: ef24c59ff9d1646c71a88e70533f73ec623a9a35 X-VCS-Branch: master Date: Wed, 5 Apr 2017 03:00:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c21f9197-3260-4381-844e-e134f0a85495 X-Archives-Hash: 39fe23959dd4b5ab1d0a34127d959119 commit: ef24c59ff9d1646c71a88e70533f73ec623a9a35 Author: Aric Belsito gmail com> AuthorDate: Wed Apr 5 02:59:45 2017 +0000 Commit: Aric Belsito gmail com> CommitDate: Wed Apr 5 02:59:45 2017 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=ef24c59f dev-util/kbuild: add stable version dev-util/kbuild/Manifest | 3 +- .../kbuild/kbuild-0.1.9998_pre20131130-r1.ebuild | 1 - ...1.ebuild => kbuild-0.1.9998_pre20131130.ebuild} | 43 ++++++++-------------- 3 files changed, 18 insertions(+), 29 deletions(-) diff --git a/dev-util/kbuild/Manifest b/dev-util/kbuild/Manifest index 07e838f..7d7bb1d 100644 --- a/dev-util/kbuild/Manifest +++ b/dev-util/kbuild/Manifest @@ -10,5 +10,6 @@ AUX kbuild-non-glibc.patch 3659 SHA256 72f65f93d3dc18e97a61d4356743c45e4e35ff7df AUX kbuild-unknown-configure-opt.patch 355 SHA256 078c95e432c9774e81a2894096855b422a42f53650462cbdca16b72c78a05ef2 SHA512 26ae63facf7133be4fba606ad0b9488ea4c2ad2290a1e33a0f0c3283e0c8267eaae41bde6efaa52895b444178ec101a800ad580d2d85d0e69c56dc7db32b1105 WHIRLPOOL 700ffe9298bfd5c7f0259851214eb60cd9ce9152d64dbff4838fc9f1c1adbe14f66f4662d602cf6c0aba504a443af61562f0c118b066e00546762caa86ef6e87 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 -EBUILD kbuild-0.1.9998_pre20131130-r1.ebuild 1941 SHA256 e0600fa7fd678066745808d7d8ba5ff1f7966a24ef5e91c07d00787b576448da SHA512 3d287e1ed92e556927eef6b8c43856cac77243e3363623559b0e975b716a7e51a7d6050e02dada5fef1c592d9f1dba13f88e820768eea9eb31a5593a4aa75e32 WHIRLPOOL f7de66f697aeeba8ce56e9bbe591bca31f0922246b5bd97e315ace01bf7a97f2f9f9adaf508762c6a0db787f92dcf4b99e211e37d3c7475cf4903cabdd9719da +EBUILD kbuild-0.1.9998_pre20131130-r1.ebuild 1934 SHA256 05cdfe866b5b0c2535318767ece18a9fb7f650a639454d0525c79ad35dde5e69 SHA512 e65a4d0d0ade96162af9e1a41265caede0a4e778210c777070a58599153d0cfc6daf171fb814ceaddcfc408b418259458d818c289acec855bda6324707e57ca2 WHIRLPOOL 8c66c5ccb1e571eb4f6888192c4a7ec5f2e88efe732dcd9f8831bd4ff2486d47310edc187f29212c6b728db1409a905823aad8fb2e0931c7e6bbd0ac5917e934 +EBUILD kbuild-0.1.9998_pre20131130.ebuild 1737 SHA256 22820965b62792a9f4f563b64c4a6814632a2c57b915013a52858c492d90f3f8 SHA512 77cc5b10237032ba7fd31ae8e2ef93415dad8687a1d096f1381c37071208b814e82a0c366c5d1cfbf40c3fdb61605503816d10ce07c19c52fbff12fea5ca7dea WHIRLPOOL 074047644ec86e2075ecc6f40842b9f06d57237d9dc08b7909a6d2d90a68bdf168bf4fb441aeff3ed2a34134bed61f3fd984909f5caa6edba1da9c7f44a3e4d9 MISC metadata.xml 476 SHA256 ac904817412770747ac1f759096e51a96fa7a292901dc7677976befeb7f1cd92 SHA512 d5d93ccb4b367dca56516b8c12e476ed9831e5d67e09fd5bfc555be647130d8ed11ca6ad61d092a552f4c284a1c391ccfc21e4b903355855e93eadd0f3eb784f WHIRLPOOL df7b099b99851b7b9b0b5d6c4eee196a4d27b6f6816ae89bebde99a25289e90453132c6ba4ea0df91418d9e22442589492df24c08affda33cc10e3b855c5f4f0 diff --git a/dev-util/kbuild/kbuild-0.1.9998_pre20131130-r1.ebuild b/dev-util/kbuild/kbuild-0.1.9998_pre20131130-r1.ebuild index 0456c7e..d948fe2 100644 --- a/dev-util/kbuild/kbuild-0.1.9998_pre20131130-r1.ebuild +++ b/dev-util/kbuild/kbuild-0.1.9998_pre20131130-r1.ebuild @@ -1,6 +1,5 @@ # Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ EAPI=6 diff --git a/dev-util/kbuild/kbuild-0.1.9998_pre20131130-r1.ebuild b/dev-util/kbuild/kbuild-0.1.9998_pre20131130.ebuild similarity index 50% copy from dev-util/kbuild/kbuild-0.1.9998_pre20131130-r1.ebuild copy to dev-util/kbuild/kbuild-0.1.9998_pre20131130.ebuild index 0456c7e..18b1578 100644 --- a/dev-util/kbuild/kbuild-0.1.9998_pre20131130-r1.ebuild +++ b/dev-util/kbuild/kbuild-0.1.9998_pre20131130.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI=6 +EAPI=4 inherit eutils autotools toolchain-funcs @@ -10,12 +9,11 @@ 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" +SRC_URI="https://dev.gentoo.org/~polynomial-c/${MY_P}.tar.xz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="amd64 x86" IUSE="" DEPEND="sys-apps/texinfo @@ -26,28 +24,19 @@ 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" - - # Musl patching - "${FILESDIR}/${PN}-musl.patch" - "${FILESDIR}/${PN}-missing-headers.patch" - "${FILESDIR}/${PN}-non-glibc.patch" -) - src_prepare() { rm -rf "${S}/kBuild/bin" - default - - mv src/kmk/configure.{in,ac} || die + epatch "${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" \ + "${FILESDIR}/${PN}-musl.patch" \ + "${FILESDIR}/${PN}-missing-headers.patch" \ + "${FILESDIR}/${PN}-non-glibc.patch" cd "${S}/src/kmk" || die eautoreconf @@ -56,13 +45,13 @@ src_prepare() { sed 's@AM_CONFIG_HEADER@AC_CONFIG_HEADERS@' -i configure.ac || die eautoreconf - sed -e "s@_LDFLAGS\.$(tc-arch)*.*=@& ${LDFLAGS}@g" \ + 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 emake -f bootstrap.gmk AUTORECONF=true AR="$(tc-getAR)" \ + kBuild/env.sh --full make -f bootstrap.gmk AUTORECONF=true AR="$(tc-getAR)" \ || die "bootstrap failed" }