diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
commit | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch) | |
tree | 758c221bad35c9288d0bd6df9c7dfc226728e52c /dev-util/kbuild | |
parent | 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff) |
gentoo resync : 28.04.2021
Diffstat (limited to 'dev-util/kbuild')
-rw-r--r-- | dev-util/kbuild/Manifest | 2 | ||||
-rw-r--r-- | dev-util/kbuild/kbuild-9999.ebuild | 61 |
2 files changed, 43 insertions, 20 deletions
diff --git a/dev-util/kbuild/Manifest b/dev-util/kbuild/Manifest index f61589024d81..2d726adc5462 100644 --- a/dev-util/kbuild/Manifest +++ b/dev-util/kbuild/Manifest @@ -6,5 +6,5 @@ AUX kbuild-0.1.9998_pre20110817-kash-link-pthread.patch 296 BLAKE2B ffa7b0167e4a AUX kbuild-0.1.9998_pre20120806-qa.patch 292 BLAKE2B 628ee52d1c147864dba48e37ae25a2ff9e82e38bc907f2771ee3599e9401b26e5b5d4e53a3958a4f8edb2a7c35794677bae141561cf515fd3587b9ac095a7bdd SHA512 2a311e2e79c1e85c3c2c26b3d187355167c237c334687494a8e532b84232340df44b0d896fe6638bf1a9d4ba1c5f1efb29978de3bac0490fe04f2e57f7fb1874 DIST kbuild-0.1.9998.3407-src.tar.xz 2351596 BLAKE2B ed562a739831c465ba66b2c357b1ab52cb072e61fa597d96d9e66e1b57a7f790c7e37fc82ef7ff49114b0cb4cb623e558d96864e98ca36bd42fe16e58e863dc7 SHA512 0a1fddff595f7ccfdb65a1a660c82860f132796b42149b8b40808d0df489312dcd96402236150c8ec5ec32c1cc142ce7af1150e10fdb83bf798e4d690dd64314 EBUILD kbuild-0.1.9998.3407.ebuild 1733 BLAKE2B dc5061e34ec9a0029cf9e3ef2b5dfb5febeec4b0aa7dccf0ccfe3f23453f518cf8f8d38755b100428eee7904e7eb2ab5d335d63ed40e3483c9752cf65fa1be80 SHA512 2a9068af1f65acf8e92977f9610db700a9dfc42475a83d8a9dc1234d260eb80464cc83f7452886b3012a99cde773893660dfc80f85fa701975e54bd92f6ddbda -EBUILD kbuild-9999.ebuild 1062 BLAKE2B 458a2dfe2a3b753783c49aeb819672e5c0d59858f5b67817b0544c56805d03cb3c75178c582981456e82909792f2fbf8e1873817cb94101076145c7388b2cbae SHA512 492ad0ab9e132b6379ce58eae3670114e1009cc32cf191869e153f4e72d52be17cf58347eaf4e39520909c463632d90d879860b6b361d0dd56568496e369f304 +EBUILD kbuild-9999.ebuild 1851 BLAKE2B e8e7dd1cc2d338ffbd2e22f71c2c5051eef9c048cc31b851a74e5aa90986f8e65a98b630696a40f120b908a209172005cb42c12bca38874fcc8284bd999ea4da SHA512 350b64213b85a970113609087f6ee93468c74ca9eb9b0543afe23c0c784656d273d05c959a8102214b2776f19bf34d97367cac7d60867ad88c2856d41be6c1c8 MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e diff --git a/dev-util/kbuild/kbuild-9999.ebuild b/dev-util/kbuild/kbuild-9999.ebuild index ac794242d86c..eeb654f1bb8a 100644 --- a/dev-util/kbuild/kbuild-9999.ebuild +++ b/dev-util/kbuild/kbuild-9999.ebuild @@ -1,24 +1,45 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit autotools subversion +inherit autotools toolchain-funcs DESCRIPTION="A makefile framework for writing simple makefiles for complex tasks" HOMEPAGE="http://svn.netlabs.org/kbuild/wiki" -ESVN_REPO_URI="http://svn.netlabs.org/repos/kbuild/trunk" - -LICENSE="GPL-3" +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 +LICENSE="GPL-3+" SLOT="0" -KEYWORDS="" IUSE="" -DEPEND="sys-devel/gettext - virtual/yacc" +# We cannot depend on virtual/yacc until bug #734354 has been fixed +DEPEND=" + sys-apps/texinfo + sys-devel/flex + sys-devel/gettext + || ( + dev-util/byacc + dev-util/yacc + <sys-devel/bison-3.7 + ) +" RDEPEND="" -S="${WORKDIR}/${MY_P/-src}" +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.3407-gold.patch" +) pkg_setup() { # Package fails with distcc (bug #255371) @@ -27,28 +48,30 @@ pkg_setup() { src_prepare() { default - rm -rf "${S}/kBuild/bin" || die - # bootstrapping breaks because of missing po/Makefile.in.in - sed '/^AC_CONFIG_FILES/s@ po/Makefile\.in@@' \ - -i src/kmk/configure.ac || die + if [[ "${PV}" != *9999 ]] ; then + # Add a file with the svn revision this package was pulled from + printf '%s\n' "KBUILD_SVN_REV := $(ver_cut 4)" \ + > SvnInfo.kmk || die + fi cd "${S}/src/kmk" || die eautoreconf cd "${S}/src/sed" || die eautoreconf + + sed -e "s@_LDFLAGS\.$(tc-arch)*.*=@& ${LDFLAGS}@g" \ + -i "${S}"/Config.kmk || die #332225 + tc-export CC PKG_CONFIG RANLIB #AR does not work here } src_compile() { kBuild/env.sh --full \ - emake -f bootstrap.gmk AUTORECONF=true \ + emake -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 \ + kBuild/env.sh kmk NIX_INSTALL_DIR=/usr PATH_INS="${D}" install \ || die "install failed" } |