commit: 857a2931673e012a941accc2668cc38b89940cc3 Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> AuthorDate: Fri Nov 29 14:03:18 2024 +0000 Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> CommitDate: Fri Nov 29 14:05:24 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=857a2931
dev-build/kbuild: fix live ebuild Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org> dev-build/kbuild/kbuild-9999.ebuild | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/dev-build/kbuild/kbuild-9999.ebuild b/dev-build/kbuild/kbuild-9999.ebuild index bef735b7059a..308b44b81180 100644 --- a/dev-build/kbuild/kbuild-9999.ebuild +++ b/dev-build/kbuild/kbuild-9999.ebuild @@ -3,19 +3,12 @@ EAPI=8 -inherit autotools toolchain-funcs +inherit autotools subversion toolchain-funcs DESCRIPTION="A makefile framework for writing simple makefiles for complex tasks" HOMEPAGE="https://trac.netlabs.org/kbuild/wiki"; -if [[ "${PV}" == *9999 ]] ; then - inherit subversion - ESVN_REPO_URI="http://svn.netlabs.org/repos/kbuild/trunk"; -else - MY_P="${P}-src" - #SRC_URI="ftp://ftp.netlabs.org/pub/${PN}/${MY_P}.tar.gz"; - SRC_URI="https://dev.gentoo.org/~polynomial-c/${MY_P}.tar.xz"; - KEYWORDS="~amd64 ~x86" -fi +ESVN_REPO_URI="http://svn.netlabs.org/repos/kbuild/trunk"; + LICENSE="GPL-3+" SLOT="0" @@ -30,14 +23,12 @@ BDEPEND=" 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.3499-gold.patch" "${FILESDIR}/${PN}-0.1.9998.3572-fix-bison.patch" "${FILESDIR}/${PN}-0.1.9998.3572-fix-lto.patch" - "${FILESDIR}/${PN}-0.1.9998.3499-implicit-function-declaration.patch" - "${FILESDIR}/${PN}-0.1.9998.3499-int-conversion.patch" + "${FILESDIR}/${PN}-0.1.9998.3660-int-conversion.patch" "${FILESDIR}/${PN}-0.1.9998.3499-fix-CC.patch" + "${FILESDIR}/${PN}-0.1.9998.3660-gcc-15.patch" ) pkg_setup() { @@ -63,7 +54,7 @@ src_prepare() { -e "s@_CFLAGS\.$(tc-arch)*.*=@& ${CFLAGS}@g" \ -e "s@_CXXFLAGS\.$(tc-arch)*.*=@& ${CXXFLAGS}@g" \ -i "${S}"/Config.kmk || die #332225 - tc-export CC PKG_CONFIG RANLIB #AR does not work here + tc-export CC PKG_CONFIG RANLIB AR # bug #923130: AR must be both here and below } src_compile() {
