From ebc282ef4dfa408accac685565b8ee5f6faec119 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Feb 2023 09:56:54 +0000 Subject: gentoo auto-resync : 12:02:2023 - 09:56:54 --- sys-boot/Manifest.gz | Bin 6050 -> 6052 bytes sys-boot/netboot/Manifest | 3 +- .../files/netboot-0.10.2-configure-clang16.patch | 37 +++++++++ sys-boot/netboot/netboot-0.10.2-r3.ebuild | 78 ------------------- sys-boot/netboot/netboot-0.10.2-r4.ebuild | 85 +++++++++++++++++++++ 5 files changed, 124 insertions(+), 79 deletions(-) create mode 100644 sys-boot/netboot/files/netboot-0.10.2-configure-clang16.patch delete mode 100644 sys-boot/netboot/netboot-0.10.2-r3.ebuild create mode 100644 sys-boot/netboot/netboot-0.10.2-r4.ebuild (limited to 'sys-boot') diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz index 102a73d000cd..eba82563d69b 100644 Binary files a/sys-boot/Manifest.gz and b/sys-boot/Manifest.gz differ diff --git a/sys-boot/netboot/Manifest b/sys-boot/netboot/Manifest index fd9939ead61c..c475353027e3 100644 --- a/sys-boot/netboot/Manifest +++ b/sys-boot/netboot/Manifest @@ -1,5 +1,6 @@ +AUX netboot-0.10.2-configure-clang16.patch 806 BLAKE2B ed56df4ee4c475fe4538143a86cd50ea7fa7c73a06dc323652afc91d51c19b650f672ad63937a73cf85552ce4936d5c454e812f75916542c6e55c7150be20325 SHA512 b4c0e6ba3cfe998cb501f8eba7506e7e4a80156c2ff3f24f3dca964b5a52703c829045fc510a461f3c460319cf82a9803b3e6abe1b90278bd6fd26275ed7928c AUX netboot-0.10.2-ldflags.patch 1208 BLAKE2B e9b6bbfafbb05341d807bde22c0b54a99e17b8f8370065bd8ba8bb20ebfb3cf3495205fd70397303c8e1abdb485b336710f1d1d7ab8aeef4feb6befba91bfcfe SHA512 ab96af0ddd9956c293cf1088597b543e312bb10f535b26e379692dd94b14a34f56d9ee71c1c82e6946702d69f1665a92acff42afe4d0036d56f28c533f8f1bd3 AUX netboot-0.10.2-slibtool.patch 224 BLAKE2B 46193988b7ab72273aa596ef8d90f5cd403d961e6b8bef3bd1b53f5c11e785f080095e562032d96717117c8fb4e8b634483377c9c16c227017c05371fad5ad54 SHA512 d6dfa3c4c33e4b516b72344dc4e3f15b262c589648ab3a5134536f57467868042839a7ce5f3327ea92c609a1159b23d51ad55ff82a739f6003064eafafca697e DIST netboot-0.10.2.tar.gz 1457791 BLAKE2B bd7fbaa1c87990ebac3dfb22f947146b19c199ceb579d32ded9a58bed6bcae34b02a1bf9cf5c079ba389ba24ca6f89fb6b4faf0b3ed028f9fe56b8dc083d8507 SHA512 422e78833c36e9975a77226523e14ebf8b5af5c02e98628ee030459ebf9f26d020551265899e84ea27bf6ab43c4d9bf8edc6722f942f49103bac897c7cc4fa3e -EBUILD netboot-0.10.2-r3.ebuild 1743 BLAKE2B 690892a3dc7db8af9e10987ef9efdfa064661c7f04ee1fd54dbcba9f2ca0efa51a170ac57d1c48d578e2477379fedb79cf9c4ddb2a8705f0dd0c7956e5a55662 SHA512 3372fc623d4d763567dcdef2cf11e5701123137388ec25481197fd466ce6b5b1663fe2bf79d98e91a03fd2f65bc150f758222b7125fc0699d78dc187f7e89459 +EBUILD netboot-0.10.2-r4.ebuild 1874 BLAKE2B 8b2ea3dcf2a1ccfe3e3f42106dcdfd9fc311048710cb81ade610c3ec74ca7407c1a612dc5d4697f368be757bd1d6e0b1c88ba7c97773521ec12412fed2d45b2c SHA512 c82b95eba56dcef42a434e499ef19a25578961816d1ff9b46449ef70cb3325d04dfc0f69d7e4fdd6b2aa73d14eafb01443008783e0ee4b58670c2f2f36aae9d8 MISC metadata.xml 842 BLAKE2B 382eb0aa401517a1784d0142bad0ff2efd7f8228f399acfacf346036f94a992bbf59030b93e80772badffba559d76a32b3cb04b57c7599ddd34f91117ab4b8ce SHA512 fd24e2d84fcfa165537a50a10d21560e3ae3534140b1c1531eab2dbcda422f118a8fde42d07711ceb9fd8834c6d913df6fb1fff1cf7e107789789dd0dd4960e3 diff --git a/sys-boot/netboot/files/netboot-0.10.2-configure-clang16.patch b/sys-boot/netboot/files/netboot-0.10.2-configure-clang16.patch new file mode 100644 index 000000000000..41c13bb634e2 --- /dev/null +++ b/sys-boot/netboot/files/netboot-0.10.2-configure-clang16.patch @@ -0,0 +1,37 @@ +https://bugs.gentoo.org/875116 +--- a/configure ++++ b/configure +@@ -10772,6 +10772,7 @@ else + #endif + + #include ++#include + + #ifdef RTLD_GLOBAL + # define LT_DLGLOBAL RTLD_GLOBAL +@@ -25362,7 +25363,7 @@ _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +- ++#include + #pragma pack(1) + struct { + char c[3]; +@@ -25441,7 +25442,7 @@ _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +- ++#include + #pragma options align=packed + struct { + char c[3]; +@@ -27724,6 +27725,7 @@ _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++#include + + #ifdef USE_PACKED + # define PACKED __attribute__((packed)) diff --git a/sys-boot/netboot/netboot-0.10.2-r3.ebuild b/sys-boot/netboot/netboot-0.10.2-r3.ebuild deleted file mode 100644 index bdaaf75e7d25..000000000000 --- a/sys-boot/netboot/netboot-0.10.2-r3.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="Allows to remote boot a computer over an IP network" -HOMEPAGE="http://netboot.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="berkdb +bootrom +lzo odbc static-libs" - -DEPEND=" - berkdb? ( sys-libs/db:= ) - lzo? ( dev-libs/lzo:2= ) - odbc? ( dev-db/unixODBC:= ) -" - -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${P}-ldflags.patch" - "${FILESDIR}/${P}-slibtool.patch" -) - -src_prepare() { - default - - # Don't install support binaries into libdir - sed -e "152s:nblibdir:bindir:" -e "153s:nblibdir:bindir:" -i misc/Makefile || die - - # Don't install perl script into libdir - sed -e 's/nblibdir/nbmiscdir/g' -i mknbi-dos/utils/Makefile || die - - # Don't install vim syntax file, as it will be installed manually - sed -e '/mgl.vim/d' -i mknbi-mgl/Makefile || die -} - -src_configure() { - local myeconfargs=( - --datadir="/usr/share/netboot" - $(use_with berkdb berkeley-db) - $(use_enable bootrom) - $(use_with lzo) - $(use_with odbc) - $(use_enable static-libs static) - # Disable compilation of 16-bit assembler files, - # since it's broken on x86 and not supported on x86_64. - --with-gnu-as86="no" - --with-gnu-cc86="no" - --with-gnu-ld86="no" - ) - - econf "${myeconfargs[@]}" -} - -src_compile() { - # mknbi fails with parallel build - emake -j1 -} - -src_install() { - emake DESTDIR="${ED}" install - - insinto /usr/share/vim/vimfiles/syntax - doins "${S}"/mknbi-mgl/misc/mgl.vim - - dodoc README doc/{HISTORY,PROBLEMS,README.*,Spec.doc} - - docinto flashcard - dodoc FlashCard/README FlashCard/*.ps - - find "${D}" -name '*.la' -type f -delete || die -} diff --git a/sys-boot/netboot/netboot-0.10.2-r4.ebuild b/sys-boot/netboot/netboot-0.10.2-r4.ebuild new file mode 100644 index 000000000000..1f2eca9cc44b --- /dev/null +++ b/sys-boot/netboot/netboot-0.10.2-r4.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Allows to remote boot a computer over an IP network" +HOMEPAGE="http://netboot.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="berkdb +bootrom +lzo odbc static-libs" + +DEPEND=" + berkdb? ( sys-libs/db:= ) + lzo? ( dev-libs/lzo:2= ) + odbc? ( dev-db/unixODBC:= ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + sys-devel/bison + sys-devel/flex +" + +PATCHES=( + "${FILESDIR}/${P}-ldflags.patch" + "${FILESDIR}/${P}-slibtool.patch" + "${FILESDIR}/${P}-configure-clang16.patch" +) + +src_prepare() { + default + + # Don't install support binaries into libdir + sed -e "152s:nblibdir:bindir:" -e "153s:nblibdir:bindir:" -i misc/Makefile || die + + # Don't install perl script into libdir + sed -e 's/nblibdir/nbmiscdir/g' -i mknbi-dos/utils/Makefile || die + + # Don't install vim syntax file, as it will be installed manually + sed -e '/mgl.vim/d' -i mknbi-mgl/Makefile || die +} + +src_configure() { + # Force Bison + unset YACC + # Uses yy_fatal_error + export LEX=flex + + local myeconfargs=( + --datadir="/usr/share/netboot" + $(use_with berkdb berkeley-db) + $(use_enable bootrom) + $(use_with lzo) + $(use_with odbc) + $(use_enable static-libs static) + # Disable compilation of 16-bit assembler files, + # since it's broken on x86 and not supported on x86_64. + --with-gnu-as86="no" + --with-gnu-cc86="no" + --with-gnu-ld86="no" + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + # mknbi fails with parallel build + emake -j1 +} + +src_install() { + emake DESTDIR="${ED}" install + + insinto /usr/share/vim/vimfiles/syntax + doins "${S}"/mknbi-mgl/misc/mgl.vim + + dodoc README doc/{HISTORY,PROBLEMS,README.*,Spec.doc} + + docinto flashcard + dodoc FlashCard/README FlashCard/*.ps + + find "${D}" -name '*.la' -type f -delete || die +} -- cgit v1.2.3