| 1 |
commit: aa36894b8102eaa0ec5c7ae219cb614176bc5c58 |
| 2 |
Author: Aaron Bauman <bman <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 26 19:35:03 2018 +0000 |
| 4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 26 20:31:28 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa36894b |
| 7 |
|
| 8 |
sys-freebsd/boot0: drop EAPI=2 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
| 11 |
|
| 12 |
sys-freebsd/boot0/Manifest | 3 -- |
| 13 |
sys-freebsd/boot0/boot0-9.1.ebuild | 63 ------------------------- |
| 14 |
sys-freebsd/boot0/files/boot0-9.2-gcc46.patch | 66 --------------------------- |
| 15 |
3 files changed, 132 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-freebsd/boot0/Manifest b/sys-freebsd/boot0/Manifest |
| 18 |
index d3666577ec1..f3dcd89d595 100644 |
| 19 |
--- a/sys-freebsd/boot0/Manifest |
| 20 |
+++ b/sys-freebsd/boot0/Manifest |
| 21 |
@@ -1,4 +1 @@ |
| 22 |
-DIST freebsd-contrib-9.1.tar.bz2 54751432 BLAKE2B 8a30e78021e6388d679637d2dbe0ed3f4896d3902064baaafa79de9c328171cbcb895b0ffd3d0d0cd3ca25c93a73584ed4900b45bd672a73b15b75721de59de5 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438 |
| 23 |
-DIST freebsd-lib-9.1.tar.bz2 3206685 BLAKE2B 67f93b7951fc03e877ee525d53b81ba49c8c1a70041c30aac97665d5dab7b3f2817fdb3bbb1475be66c33a7f996309e9020f1a3d1154fab8e2f6789f5ae0bb18 SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e |
| 24 |
DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca |
| 25 |
-DIST freebsd-sys-9.1.tar.bz2 32588103 BLAKE2B 7f94a4735c6a17b39a86fa0fda0682924b18e4b466dc6319a5df889522aaeaffaa87e1b76582c48ae034df8c20169c8cea93bbd3d6e7abd0526716686f88dfe8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d |
| 26 |
|
| 27 |
diff --git a/sys-freebsd/boot0/boot0-9.1.ebuild b/sys-freebsd/boot0/boot0-9.1.ebuild |
| 28 |
deleted file mode 100644 |
| 29 |
index 54793cef68a..00000000000 |
| 30 |
--- a/sys-freebsd/boot0/boot0-9.1.ebuild |
| 31 |
+++ /dev/null |
| 32 |
@@ -1,63 +0,0 @@ |
| 33 |
-# Copyright 1999-2018 Gentoo Foundation |
| 34 |
-# Distributed under the terms of the GNU General Public License v2 |
| 35 |
- |
| 36 |
-EAPI=2 |
| 37 |
- |
| 38 |
-inherit bsdmk freebsd flag-o-matic |
| 39 |
- |
| 40 |
-DESCRIPTION="FreeBSD's bootloader" |
| 41 |
-SLOT="0" |
| 42 |
-KEYWORDS="~amd64-fbsd ~x86-fbsd" |
| 43 |
- |
| 44 |
-IUSE="bzip2 ieee1394 tftp zfs" |
| 45 |
- |
| 46 |
-SRC_URI="mirror://gentoo/${SYS}.tar.bz2 |
| 47 |
- mirror://gentoo/${LIB}.tar.bz2 |
| 48 |
- mirror://gentoo/${CONTRIB}.tar.bz2" |
| 49 |
- |
| 50 |
-RDEPEND="" |
| 51 |
-DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}* |
| 52 |
- =sys-freebsd/freebsd-lib-${RV}*" |
| 53 |
- |
| 54 |
-S="${WORKDIR}/sys/boot" |
| 55 |
- |
| 56 |
-PATCHES=( "${FILESDIR}/${PN}-9.2-gcc46.patch" |
| 57 |
- "${FILESDIR}/${PN}-add-nossp-cflags.patch" ) |
| 58 |
- |
| 59 |
-boot0_use_enable() { |
| 60 |
- use ${1} && mymakeopts="${mymakeopts} LOADER_${2}_SUPPORT=\"yes\"" |
| 61 |
-} |
| 62 |
- |
| 63 |
-pkg_setup() { |
| 64 |
- boot0_use_enable ieee1394 FIREWIRE |
| 65 |
- boot0_use_enable zfs ZFS |
| 66 |
- boot0_use_enable tftp TFTP |
| 67 |
- boot0_use_enable bzip2 BZIP2 |
| 68 |
-} |
| 69 |
- |
| 70 |
-src_prepare() { |
| 71 |
- sed -e '/-fomit-frame-pointer/d' -e '/-mno-align-long-strings/d' \ |
| 72 |
- -i "${S}"/i386/boot2/Makefile \ |
| 73 |
- -i "${S}"/i386/gptboot/Makefile \ |
| 74 |
- -i "${S}"/i386/gptzfsboot/Makefile \ |
| 75 |
- -i "${S}"/i386/zfsboot/Makefile || die |
| 76 |
-} |
| 77 |
- |
| 78 |
-src_compile() { |
| 79 |
- strip-flags |
| 80 |
- append-flags "-fno-strict-aliasing" |
| 81 |
- |
| 82 |
- cd "${WORKDIR}/lib/libstand" || die |
| 83 |
- freebsd_src_compile |
| 84 |
- |
| 85 |
- cd "${S}" |
| 86 |
- CFLAGS="${CFLAGS} -I${WORKDIR}/lib/libstand" |
| 87 |
- LDFLAGS="${LDFLAGS} -L${WORKDIR}/lib/libstand" |
| 88 |
- export LIBSTAND="${WORKDIR}/lib/libstand/libstand.a" |
| 89 |
- NOFLAGSTRIP="yes" freebsd_src_compile |
| 90 |
-} |
| 91 |
- |
| 92 |
-src_install() { |
| 93 |
- dodir /boot/defaults |
| 94 |
- mkinstall FILESDIR=/boot || die "mkinstall failed" |
| 95 |
-} |
| 96 |
|
| 97 |
diff --git a/sys-freebsd/boot0/files/boot0-9.2-gcc46.patch b/sys-freebsd/boot0/files/boot0-9.2-gcc46.patch |
| 98 |
deleted file mode 100644 |
| 99 |
index ffd9f4351d1..00000000000 |
| 100 |
--- a/sys-freebsd/boot0/files/boot0-9.2-gcc46.patch |
| 101 |
+++ /dev/null |
| 102 |
@@ -1,66 +0,0 @@ |
| 103 |
-diff --git a/sys/boot/i386/Makefile.inc b/sys/boot/i386/Makefile.inc |
| 104 |
-index f5faec7..a9cf593 100644 |
| 105 |
---- a/sys/boot/i386/Makefile.inc |
| 106 |
-+++ b/sys/boot/i386/Makefile.inc |
| 107 |
-@@ -12,7 +12,6 @@ LDFLAGS+= -nostdlib |
| 108 |
- .if ${MACHINE_CPUARCH} == "amd64" |
| 109 |
- CFLAGS+= -m32 |
| 110 |
- ACFLAGS+= -m32 |
| 111 |
--LDFLAGS+= -m elf_i386_fbsd |
| 112 |
- AFLAGS+= --32 |
| 113 |
- .endif |
| 114 |
- |
| 115 |
-diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile |
| 116 |
-index 65815a5..61840dd 100644 |
| 117 |
---- a/sys/boot/i386/boot2/Makefile |
| 118 |
-+++ b/sys/boot/i386/boot2/Makefile |
| 119 |
-@@ -109,3 +109,10 @@ machine: |
| 120 |
- # XXX: clang integrated-as doesn't grok .codeNN directives yet |
| 121 |
- CFLAGS.boot1.S= ${CLANG_NO_IAS} |
| 122 |
- CFLAGS+= ${CFLAGS.${.IMPSRC:T}} |
| 123 |
-+ |
| 124 |
-+# gcc 4.6 or later version, -fno-asynchronous-unwind-tables is required to build. |
| 125 |
-+CFLAGS+= -fno-asynchronous-unwind-tables |
| 126 |
-+ |
| 127 |
-+.if ${MACHINE_CPUARCH} == "amd64" |
| 128 |
-+LDFLAGS+= -m elf_i386_fbsd |
| 129 |
-+.endif |
| 130 |
-diff --git a/sys/boot/i386/gptboot/Makefile b/sys/boot/i386/gptboot/Makefile |
| 131 |
-index e1a640a..29886cc 100644 |
| 132 |
---- a/sys/boot/i386/gptboot/Makefile |
| 133 |
-+++ b/sys/boot/i386/gptboot/Makefile |
| 134 |
-@@ -78,3 +78,8 @@ machine: |
| 135 |
- # XXX: clang integrated-as doesn't grok .codeNN directives yet |
| 136 |
- CFLAGS.gptldr.S= ${CLANG_NO_IAS} |
| 137 |
- CFLAGS+= ${CFLAGS.${.IMPSRC:T}} |
| 138 |
-+ |
| 139 |
-+.if ${MACHINE_CPUARCH} == "amd64" |
| 140 |
-+LDFLAGS+= -m elf_i386_fbsd |
| 141 |
-+.endif |
| 142 |
-+ |
| 143 |
-diff --git a/sys/boot/i386/gptzfsboot/Makefile b/sys/boot/i386/gptzfsboot/Makefile |
| 144 |
-index a2b8fcc..107f531 100644 |
| 145 |
---- a/sys/boot/i386/gptzfsboot/Makefile |
| 146 |
-+++ b/sys/boot/i386/gptzfsboot/Makefile |
| 147 |
-@@ -76,3 +76,8 @@ machine: |
| 148 |
- # XXX: clang integrated-as doesn't grok .codeNN directives yet |
| 149 |
- CFLAGS.gptldr.S= ${CLANG_NO_IAS} |
| 150 |
- CFLAGS+= ${CFLAGS.${.IMPSRC:T}} |
| 151 |
-+ |
| 152 |
-+.if ${MACHINE_CPUARCH} == "amd64" |
| 153 |
-+LDFLAGS+= -m elf_i386_fbsd |
| 154 |
-+.endif |
| 155 |
-+ |
| 156 |
-diff --git a/sys/boot/i386/zfsboot/Makefile b/sys/boot/i386/zfsboot/Makefile |
| 157 |
-index b2db778..252dc62 100644 |
| 158 |
---- a/sys/boot/i386/zfsboot/Makefile |
| 159 |
-+++ b/sys/boot/i386/zfsboot/Makefile |
| 160 |
-@@ -89,3 +89,8 @@ machine: |
| 161 |
- # XXX: clang integrated-as doesn't grok .codeNN directives yet |
| 162 |
- CFLAGS.zfsldr.S= ${CLANG_NO_IAS} |
| 163 |
- CFLAGS+= ${CFLAGS.${.IMPSRC:T}} |
| 164 |
-+ |
| 165 |
-+.if ${MACHINE_CPUARCH} == "amd64" |
| 166 |
-+LDFLAGS+= -m elf_i386_fbsd |
| 167 |
-+.endif |
| 168 |
-+ |
Archives