summaryrefslogtreecommitdiff
path: root/sys-boot
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-09-02 14:09:07 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-09-02 14:09:07 +0100
commitb17a3ef12038de50228bade1f05502c74e135321 (patch)
tree9026dffec53f92cba48ca9a500a4f778e6304380 /sys-boot
parent3cf7c3ef441822c889356fd1812ebf2944a59851 (diff)
gentoo resync : 02.09.2020
Diffstat (limited to 'sys-boot')
-rw-r--r--sys-boot/Manifest.gzbin6388 -> 6387 bytes
-rw-r--r--sys-boot/netboot/Manifest2
-rw-r--r--sys-boot/netboot/netboot-0.10.2-r2.ebuild (renamed from sys-boot/netboot/netboot-0.10.2-r1.ebuild)17
3 files changed, 10 insertions, 9 deletions
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index cf8ea1ebc454..77a04be78df9 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
Binary files differ
diff --git a/sys-boot/netboot/Manifest b/sys-boot/netboot/Manifest
index a2cf79372c63..2ce8f53c0d0d 100644
--- a/sys-boot/netboot/Manifest
+++ b/sys-boot/netboot/Manifest
@@ -1,4 +1,4 @@
AUX netboot-0.10.2-ldflags.patch 1208 BLAKE2B e9b6bbfafbb05341d807bde22c0b54a99e17b8f8370065bd8ba8bb20ebfb3cf3495205fd70397303c8e1abdb485b336710f1d1d7ab8aeef4feb6befba91bfcfe SHA512 ab96af0ddd9956c293cf1088597b543e312bb10f535b26e379692dd94b14a34f56d9ee71c1c82e6946702d69f1665a92acff42afe4d0036d56f28c533f8f1bd3
DIST netboot-0.10.2.tar.gz 1457791 BLAKE2B bd7fbaa1c87990ebac3dfb22f947146b19c199ceb579d32ded9a58bed6bcae34b02a1bf9cf5c079ba389ba24ca6f89fb6b4faf0b3ed028f9fe56b8dc083d8507 SHA512 422e78833c36e9975a77226523e14ebf8b5af5c02e98628ee030459ebf9f26d020551265899e84ea27bf6ab43c4d9bf8edc6722f942f49103bac897c7cc4fa3e
-EBUILD netboot-0.10.2-r1.ebuild 1650 BLAKE2B 47566aef05d0679ab869aefec982c9f1e1f60c8f61170561ed0d9dc2a946869e01ea855aa79fc88a72a94df776b07296a2550ebd49bae92233f058fc34c72c34 SHA512 e0ec5ff39d7ad2fde3216657e2f10a5c178570c1f1b899ab1cac8dea0db5560b4bc96a2d95f23fd196c776d9eddf599b3523d2cd64a793ea4d020bc17009af77
+EBUILD netboot-0.10.2-r2.ebuild 1707 BLAKE2B fcf26468af18dc6d4515e7e2105093ae29a1ad3607026e00b915fcbb8bea540a5ac9246785ce76cf045adffac13573c7dfbfcfa79636e19446797a6d945993cc SHA512 50f9ee0bea2575fa71517ea3093c1f5c6d8e76d960355c724e2aeac41bee0970ee1c107fd64d1ad2c3a737016be40a9fbbf26b345af6352ae298975d0971fe10
MISC metadata.xml 841 BLAKE2B fc75d8c8d5c47f7225ccd9a634b2347ea1a0059102beb3e55b3dc27e2a7447972627a3b56e234b0f82c7cc0c18f5aee7f7d08bbc3030c5ba8aec33641ce46615 SHA512 51b0a8eeb3dda78ff71188563755685e8d894fecd6c347f5b1927b4caecfcde4e2081a20b89e91ead1ea173662b18400174206af8b18759c455d44f2f91e6a69
diff --git a/sys-boot/netboot/netboot-0.10.2-r1.ebuild b/sys-boot/netboot/netboot-0.10.2-r2.ebuild
index 64a626b55466..0fda56f3ee06 100644
--- a/sys-boot/netboot/netboot-0.10.2-r1.ebuild
+++ b/sys-boot/netboot/netboot-0.10.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="berkdb +bootrom +lzo odbc static-libs"
DEPEND="
@@ -22,12 +22,11 @@ DEPEND="
RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${P}-ldflags.patch" )
+
src_prepare() {
default
- # Respect users LDFLAGS
- eapply "${FILESDIR}"/"${P}"-ldflags.patch
-
# Don't install support binaries into libdir
sed -e "152s:nblibdir:bindir:" -e "153s:nblibdir:bindir:" -i misc/Makefile || die
@@ -46,9 +45,11 @@ src_configure() {
$(use_with lzo)
$(use_with odbc)
$(use_enable static-libs static)
- --with-gnu-as86="$(tc-getAS)"
- --with-gnu-cc86="$(tc-getCC)"
- --with-gnu-ld86="$(tc-getLD)"
+ # 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[@]}"