* [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/boot0/files/, sys-freebsd/boot0/
@ 2012-09-11 17:10 Alexis Ballier
0 siblings, 0 replies; 3+ messages in thread
From: Alexis Ballier @ 2012-09-11 17:10 UTC (permalink / raw
To: gentoo-commits
commit: 5801e468034c872ead9f6d7f29a5691b6e024964
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 11 16:56:22 2012 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Sep 11 16:56:22 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=5801e468
remove boot0, merged to the main tree
---
sys-freebsd/boot0/Manifest | 6 -
sys-freebsd/boot0/boot0-9.1_rc1.ebuild | 53 --------
sys-freebsd/boot0/files/boot0-7.0-gentoo.patch | 131 --------------------
.../boot0/files/boot0-8.2-zfsboot-makefile.patch | 13 --
4 files changed, 0 insertions(+), 203 deletions(-)
diff --git a/sys-freebsd/boot0/Manifest b/sys-freebsd/boot0/Manifest
deleted file mode 100644
index b1058eb..0000000
--- a/sys-freebsd/boot0/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX boot0-7.0-gentoo.patch 5523 RMD160 d6805e228c05acfd47deb42a8363a8aac2091aec SHA1 c77f9526f0eee1ec82b4e4f851b6cc9a9da0d0a0 SHA256 deb18a75bb96314fb34da515f12af3706df711b53d6ebf0c7c2d10c3ba8a6ace
-AUX boot0-8.2-zfsboot-makefile.patch 436 RMD160 2e0615b7d16389e0f659893fe1b99411fb5c9e63 SHA1 d30e0dd3cf71beec22ff8b01568f43eee435e75e SHA256 74a494fce8011f018542a54d6d188c1aa9977b982a3b0c333ea64445dbfab994
-DIST freebsd-contrib-9.1_rc1.tar.bz2 54330060 RMD160 9b455ff06a8a4ec62e8d5e4a3ae14243a41de7ec SHA1 b2f93389475bf368cac731f0f855a609c413d291 SHA256 b9be1e2328cd3cf5b7b010f033a1a4233e4df19bf305c6125f2442f56a895c9d
-DIST freebsd-lib-9.1_rc1.tar.bz2 3210622 RMD160 be2d13a21d9938eaa832c8ee3894e098979bd528 SHA1 d89ecc023712d91203f5c583400c2e76f313ab56 SHA256 afa4631d86c0e6bc1811199e1408bc8302a72808d6a0bffcf078e6d81d9a7a12
-DIST freebsd-sys-9.1_rc1.tar.bz2 32435903 RMD160 14a7d3cec29ae5fb76e090563f15eb73e86d95a5 SHA1 c78a688b3156a136a6f9c9bf1035da878251d9ed SHA256 7c5e705cc9ca5efb60f9959a71315c118cb8cfe910c923c59a7f6180cfa86a0f
-EBUILD boot0-9.1_rc1.ebuild 1178 RMD160 da55d0223bf78f52db6294cc9b8798efbe0a6d68 SHA1 af63f066eac61e71e45d8ff9b5574b89493f9b05 SHA256 88c7c10275df54bc20d131923b7a2eb764732a8af500bb721cabf64759634459
diff --git a/sys-freebsd/boot0/boot0-9.1_rc1.ebuild b/sys-freebsd/boot0/boot0-9.1_rc1.ebuild
deleted file mode 100644
index c8e681e..0000000
--- a/sys-freebsd/boot0/boot0-9.1_rc1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit bsdmk freebsd flag-o-matic
-
-DESCRIPTION="FreeBSD's bootloader"
-SLOT="0"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-
-IUSE="bzip2 ieee1394 tftp zfs"
-
-SRC_URI="mirror://gentoo/${SYS}.tar.bz2
- mirror://gentoo/${LIB}.tar.bz2
- mirror://gentoo/${CONTRIB}.tar.bz2"
-
-RDEPEND=""
-DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
- =sys-freebsd/freebsd-lib-${RV}*"
-
-S="${WORKDIR}/sys/boot"
-
-boot0_use_enable() {
- use ${1} && mymakeopts="${mymakeopts} LOADER_${2}_SUPPORT=\"yes\""
-}
-
-pkg_setup() {
- boot0_use_enable ieee1394 FIREWIRE
- boot0_use_enable zfs ZFS
- boot0_use_enable tftp TFTP
- boot0_use_enable bzip2 BZIP2
-}
-
-src_prepare() {
- sed -e '/-fomit-frame-pointer/d' -e '/-mno-align-long-strings/d' \
- -i "${S}"/i386/boot2/Makefile \
- -i "${S}"/i386/gptboot/Makefile \
- -i "${S}"/i386/gptzfsboot/Makefile \
- -i "${S}"/i386/zfsboot/Makefile || die
-}
-
-src_compile() {
- strip-flags
- append-flags "-fno-strict-aliasing"
- NOFLAGSTRIP="yes" freebsd_src_compile
-}
-
-src_install() {
- dodir /boot/defaults
- mkinstall FILESDIR=/boot || die "mkinstall failed"
-}
diff --git a/sys-freebsd/boot0/files/boot0-7.0-gentoo.patch b/sys-freebsd/boot0/files/boot0-7.0-gentoo.patch
deleted file mode 100644
index a5830c1..0000000
--- a/sys-freebsd/boot0/files/boot0-7.0-gentoo.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-diff -ur ../src.orig/sys/boot/efi/libefi/Makefile sys/boot/efi/libefi/Makefile
---- ../src.orig/sys/boot/efi/libefi/Makefile 2006-11-05 23:03:03.000000000 +0100
-+++ sys/boot/efi/libefi/Makefile 2008-03-14 11:15:48.482695423 +0100
-@@ -8,7 +8,7 @@
-
- CFLAGS+= -I${.CURDIR}/../include
- CFLAGS+= -I${.CURDIR}/../include/${MACHINE_ARCH:S/amd64/i386/}
--CFLAGS+= -I${.CURDIR}/../../../../lib/libstand
-+CFLAGS+= -I/usr/include/libstand
-
- # Pick up the bootstrap header for some interface items
- CFLAGS+= -I${.CURDIR}/../../common
-diff -ur ../src.orig/sys/boot/i386/boot2/Makefile sys/boot/i386/boot2/Makefile
---- ../src.orig/sys/boot/i386/boot2/Makefile 2007-05-19 07:07:47.000000000 +0200
-+++ sys/boot/i386/boot2/Makefile 2008-03-14 11:21:16.247014910 +0100
-@@ -24,7 +24,7 @@
- -fno-guess-branch-probability \
- -fomit-frame-pointer \
- -fno-unit-at-a-time \
-- -mno-align-long-strings \
-+ -march=i586 \
- -mrtd \
- -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 \
- -D${BOOT2_UFS} \
-diff -ur ../src.orig/sys/boot/i386/libfirewire/Makefile sys/boot/i386/libfirewire/Makefile
---- ../src.orig/sys/boot/i386/libfirewire/Makefile 2007-05-29 16:35:57.000000000 +0200
-+++ sys/boot/i386/libfirewire/Makefile 2008-03-14 11:15:48.502696288 +0100
-@@ -10,7 +10,7 @@
- CFLAGS+= -D_BOOT
-
- CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../../.. -I.
--CFLAGS+= -I${.CURDIR}/../../../../lib/libstand
-+CFLAGS+= -I/usr/include/libstand
- CFLAGS+= -I${.CURDIR}/../btx/lib
- CFLAGS+= -I${.CURDIR}/../libi386
-
-diff -ur ../src.orig/sys/boot/i386/libi386/Makefile sys/boot/i386/libi386/Makefile
---- ../src.orig/sys/boot/i386/libi386/Makefile 2006-04-11 22:11:30.000000000 +0200
-+++ sys/boot/i386/libi386/Makefile 2008-03-14 11:15:48.506695959 +0100
-@@ -36,7 +36,7 @@
- -I${.CURDIR}/../../../contrib/dev/acpica \
- -I${.CURDIR}/../../.. -I.
- # the location of libstand
--CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/
-+CFLAGS+= -I/usr/include/libstand/
-
- .if ${MACHINE_ARCH} == "amd64"
- CLEANFILES+= machine
-diff -ur ../src.orig/sys/boot/ia64/common/Makefile sys/boot/ia64/common/Makefile
---- ../src.orig/sys/boot/ia64/common/Makefile 2006-11-05 23:03:03.000000000 +0100
-+++ sys/boot/ia64/common/Makefile 2008-03-14 11:15:48.486695372 +0100
-@@ -10,7 +10,7 @@
- CFLAGS+= -I${.CURDIR}/../../efi/include
- CFLAGS+= -I${.CURDIR}/../../efi/include/${MACHINE_ARCH}
- CFLAGS+= -I${.CURDIR}/../../..
--CFLAGS+= -I${.CURDIR}/../../../../lib/libstand
-+CFLAGS+= -I/usr/include/libstand
-
- .if ${MK_FORTH} != "no"
- BOOT_FORTH= yes
-diff -ur ../src.orig/sys/boot/ia64/efi/Makefile sys/boot/ia64/efi/Makefile
---- ../src.orig/sys/boot/ia64/efi/Makefile 2006-11-05 23:03:03.000000000 +0100
-+++ sys/boot/ia64/efi/Makefile 2008-03-14 11:15:48.490695322 +0100
-@@ -15,7 +15,7 @@
- CFLAGS+= -I${.CURDIR}/../../efi/include
- CFLAGS+= -I${.CURDIR}/../../efi/include/${MACHINE_ARCH}
- CFLAGS+= -I${.CURDIR}/../../..
--CFLAGS+= -I${.CURDIR}/../../../../lib/libstand
-+CFLAGS+= -I/usr/include/libstand
-
- LDSCRIPT= ${.CURDIR}/ldscript.${MACHINE_ARCH}
- LDFLAGS= -Wl,-T${LDSCRIPT} -shared -symbolic
-diff -ur ../src.orig/sys/boot/ia64/ski/Makefile sys/boot/ia64/ski/Makefile
---- ../src.orig/sys/boot/ia64/ski/Makefile 2006-11-05 23:03:04.000000000 +0100
-+++ sys/boot/ia64/ski/Makefile 2008-03-14 11:15:48.494695551 +0100
-@@ -14,7 +14,7 @@
- CFLAGS+= -I${.CURDIR}/../common
- CFLAGS+= -I${.CURDIR}/../../common
- CFLAGS+= -I${.CURDIR}/../../..
--CFLAGS+= -I${.CURDIR}/../../../../lib/libstand
-+CFLAGS+= -I/usr/include/libstand
-
- LDSCRIPT= ${.CURDIR}/ldscript.${MACHINE_ARCH}
- LDFLAGS= -Wl,-T${LDSCRIPT}
-diff -ur ../src.orig/sys/boot/ofw/libofw/Makefile sys/boot/ofw/libofw/Makefile
---- ../src.orig/sys/boot/ofw/libofw/Makefile 2007-06-17 02:17:15.000000000 +0200
-+++ sys/boot/ofw/libofw/Makefile 2008-03-14 11:15:48.478695194 +0100
-@@ -7,7 +7,7 @@
- ofw_memory.c ofw_module.c ofw_net.c ofw_reboot.c \
- ofw_time.c openfirm.c
-
--CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/
-+CFLAGS+= -I/usr/include/libstand/
-
- # Pick up the bootstrap header for some interface items
- CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../../.. -I.
-diff -ur ../src.orig/sys/boot/pc98/libpc98/Makefile sys/boot/pc98/libpc98/Makefile
---- ../src.orig/sys/boot/pc98/libpc98/Makefile 2006-04-11 22:11:30.000000000 +0200
-+++ sys/boot/pc98/libpc98/Makefile 2008-03-14 11:15:48.510696188 +0100
-@@ -31,6 +31,6 @@
- -I${.CURDIR}/../../i386/libi386 \
- -I${.CURDIR}/../../.. -I.
- # the location of libstand
--CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/
-+CFLAGS+= -I/usr/include/libstand/
-
- .include <bsd.lib.mk>
-diff -ur ../src.orig/sys/boot/powerpc/loader/Makefile sys/boot/powerpc/loader/Makefile
---- ../src.orig/sys/boot/powerpc/loader/Makefile 2006-03-17 19:54:36.000000000 +0100
-+++ sys/boot/powerpc/loader/Makefile 2008-03-14 11:15:48.515695706 +0100
-@@ -82,7 +82,7 @@
- CFLAGS+= -I${.CURDIR}/../../ofw/libofw
-
- # where to get libstand from
--CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/
-+CFLAGS+= -I/usr/include/libstand/
-
- DPADD= ${LIBFICL} ${LIBOFW} ${LIBSTAND}
- LDADD= ${LIBFICL} ${LIBOFW} -lstand
-diff -ur ../src.orig/sys/boot/sparc64/loader/Makefile sys/boot/sparc64/loader/Makefile
---- ../src.orig/sys/boot/sparc64/loader/Makefile 2006-03-17 19:54:36.000000000 +0100
-+++ sys/boot/sparc64/loader/Makefile 2008-03-14 11:15:48.498695501 +0100
-@@ -65,7 +65,7 @@
- CFLAGS+= -I${.CURDIR}/../../ofw/libofw/
-
- # where to get libstand from
--CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/
-+CFLAGS+= -I/usr/include/libstand/
-
- DPADD= ${LIBFICL} ${LIBOFW} ${LIBSTAND}
- LDADD= ${LIBFICL} ${LIBOFW} -lstand
diff --git a/sys-freebsd/boot0/files/boot0-8.2-zfsboot-makefile.patch b/sys-freebsd/boot0/files/boot0-8.2-zfsboot-makefile.patch
deleted file mode 100644
index a3a33d5..0000000
--- a/sys-freebsd/boot0/files/boot0-8.2-zfsboot-makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/sys/boot/i386/zfsboot/Makefile b/sys/boot/i386/zfsboot/Makefile
-index bb16ea3..7dedb49 100644
---- a/sys/boot/i386/zfsboot/Makefile
-+++ b/sys/boot/i386/zfsboot/Makefile
-@@ -83,6 +83,8 @@ zfsboot.bin: zfsboot.out
- zfsboot.out: ${BTXCRT} zfsboot.o sio.o drv.o cons.o util.o
- ${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND}
-
-+drv.o: drv.c xreadorg.h
-+
- zfsboot.o: zfsboot.s
-
- SRCS= zfsboot.c xreadorg.h
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/boot0/files/, sys-freebsd/boot0/
@ 2012-11-29 14:07 Yuta SATOH
0 siblings, 0 replies; 3+ messages in thread
From: Yuta SATOH @ 2012-11-29 14:07 UTC (permalink / raw
To: gentoo-commits
commit: 82a45b55660bee177954a4f91d58ec45af52b0fd
Author: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Thu Nov 29 13:46:59 2012 +0000
Commit: Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Thu Nov 29 13:46:59 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=82a45b55
add sys-freebsd/boot0 -- fix fails to build using clang or >=gcc-4.6, bug 409815
---
sys-freebsd/boot0/Manifest | 6 +
sys-freebsd/boot0/boot0-9.1_rc3.ebuild | 62 +++++++++
sys-freebsd/boot0/files/boot0-7.0-gentoo.patch | 131 ++++++++++++++++++++
.../boot0/files/boot0-8.2-zfsboot-makefile.patch | 13 ++
4 files changed, 212 insertions(+), 0 deletions(-)
diff --git a/sys-freebsd/boot0/Manifest b/sys-freebsd/boot0/Manifest
new file mode 100644
index 0000000..c3500b9
--- /dev/null
+++ b/sys-freebsd/boot0/Manifest
@@ -0,0 +1,6 @@
+AUX boot0-7.0-gentoo.patch 5523 SHA256 deb18a75bb96314fb34da515f12af3706df711b53d6ebf0c7c2d10c3ba8a6ace SHA512 0601b498a610ddd2880288ff83ebedfbbdc96a3811d457e6cbf10394d7a385b18cee51559b3f24896fc6047f55f84e85cb01ad50c81e42da098c42fdc9bcdbab WHIRLPOOL 8f88bbec2e010a0a2a39f4b152ca54bb8438f1cd62f21f900f9667fd40ed6ef2c84a38a1392ab438443deafac39a88d8a792d5711b877231539db3b9736f3e0a
+AUX boot0-8.2-zfsboot-makefile.patch 436 SHA256 74a494fce8011f018542a54d6d188c1aa9977b982a3b0c333ea64445dbfab994 SHA512 2d2c1572415362eed73580b681a6e6cd95b1f4abb415221e8904097ac078c620223ca652282404c4f1881dcb605f25f126b53ec0b8409ad4fbbd9bed603ba7c2 WHIRLPOOL ddf074f25ebf256f543cd5ceb8e64934cc045e6dc81f49ef14aad009de69c84309d0b7927c87ff36c75c008fae975e25708b9ec8f21cb083bba77daf3e5107d4
+DIST freebsd-contrib-9.1_rc3.tar.bz2 54754779 SHA256 90613296d804b3632902fb6fe180e6c2525ef29ba02a11efc3d73657b0476a8b SHA512 6564c77b02f472e063c439d2cbfd3bbdbd7d6507d9591eb020d0748fafa9eaaab1927f06c379f2b059f515cb2f77e13c5337f856866f0210be34d9a803885f20 WHIRLPOOL a2db66d867c4c65c7f95d627e38ea3615b650bd0eadda722e2f5e38cb34167c7c822dbe5a87b02d16bb11f37605e306764aef50368b54a8beb8cd39537702ea0
+DIST freebsd-lib-9.1_rc3.tar.bz2 3205238 SHA256 da7001a8c23fcc614b230414cb830c12d7b238c38a15c905c695c5a1621c10f8 SHA512 761219c55b0ac067685057b519e506869fba6c472179f9d151b0e12eeacad11004ec2ec504953ace7139694c934785555e98bc16b41a248470241464599e6914 WHIRLPOOL 653258d8752cfc401a632ca59a05cce02821cf1ca279696463c6c0f71e761853617b9b0f51b1849e89b4067dc1799b1b4c528644bcd42b260af0f851caccc63e
+DIST freebsd-sys-9.1_rc3.tar.bz2 32605500 SHA256 5194ac93850aff4f10978b739573ab8ee54a95a0b2d4e46f754314ae381b442b SHA512 17cd41ea66bf1d2e10b56001e6e1c80db78e1572aff4ad1ac945bc24d38dfef612e1a4b7eead8bc50b94df798b0bde3dcc13a0596860322569272b3239a30b9b WHIRLPOOL 8628c5a97675b3fe4ebfcb92c4fb6d5aebaa3a11551e4f16004a6ffb23b3d10334b623c70f255762038bf1fc80a7a27abd587f10ac9706ac1bb0b22adda266b8
+EBUILD boot0-9.1_rc3.ebuild 1684 SHA256 fbbc75d601f244e7dda562e80a5abbf328fdcac57eb2b688b46a348980139c6d SHA512 e2f02b804e5fcea503f736cc15bdcd1be4963fbd5f78dd40757d2bd8c9e3620f45a3abc5aa2c9d2c6c99c71a0eacd919a4c7fab34de03713edfd8be4153851cf WHIRLPOOL 0f3015ab9626d1a9c789224f3e51ac91455955c5d49374161e2a42f001ff6a39d6a670b9b4ff2d836712feb70c19d00670818dd779c8d68d069109985450cd52
diff --git a/sys-freebsd/boot0/boot0-9.1_rc3.ebuild b/sys-freebsd/boot0/boot0-9.1_rc3.ebuild
new file mode 100644
index 0000000..a369539
--- /dev/null
+++ b/sys-freebsd/boot0/boot0-9.1_rc3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/boot0-9.1_rc3.ebuild,v 1.1 2012/11/06 12:52:54 aballier Exp $
+
+EAPI=2
+
+inherit bsdmk freebsd flag-o-matic toolchain-funcs
+
+DESCRIPTION="FreeBSD's bootloader"
+SLOT="0"
+KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+
+IUSE="bzip2 ieee1394 tftp zfs"
+
+SRC_URI="mirror://gentoo/${SYS}.tar.bz2
+ mirror://gentoo/${LIB}.tar.bz2
+ mirror://gentoo/${CONTRIB}.tar.bz2"
+
+RDEPEND=""
+DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
+ =sys-freebsd/freebsd-lib-${RV}*"
+
+S="${WORKDIR}/sys/boot"
+
+boot0_use_enable() {
+ use ${1} && mymakeopts="${mymakeopts} LOADER_${2}_SUPPORT=\"yes\""
+}
+
+pkg_setup() {
+ boot0_use_enable ieee1394 FIREWIRE
+ boot0_use_enable zfs ZFS
+ boot0_use_enable tftp TFTP
+ boot0_use_enable bzip2 BZIP2
+}
+
+src_prepare() {
+ sed -e '/-mno-align-long-strings/d' \
+ -i "${S}"/i386/boot2/Makefile \
+ -i "${S}"/i386/gptboot/Makefile \
+ -i "${S}"/i386/gptzfsboot/Makefile \
+ -i "${S}"/i386/zfsboot/Makefile || die
+
+ # gcc-4.6 or later version support, bug #409815
+ if ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -ge 6 ]] ) ; then
+ sed -i -e '/-m elf_i386_fbsd/d' "${S}"/i386/Makefile.inc || die
+ for dir in boot2 gptboot gptzfsboot zfsboot; do
+ echo "LDFLAGS+= -m elf_i386_fbsd" >> "${S}"/i386/${dir}/Makefile || die
+ done
+ echo "CFLAGS+= -fno-asynchronous-unwind-tables" >> "${S}"/i386/boot2/Makefile || die
+ fi
+}
+
+src_compile() {
+ strip-flags
+ append-flags "-fno-strict-aliasing"
+ NOFLAGSTRIP="yes" freebsd_src_compile
+}
+
+src_install() {
+ dodir /boot/defaults
+ mkinstall FILESDIR=/boot || die "mkinstall failed"
+}
diff --git a/sys-freebsd/boot0/files/boot0-7.0-gentoo.patch b/sys-freebsd/boot0/files/boot0-7.0-gentoo.patch
new file mode 100644
index 0000000..a5830c1
--- /dev/null
+++ b/sys-freebsd/boot0/files/boot0-7.0-gentoo.patch
@@ -0,0 +1,131 @@
+diff -ur ../src.orig/sys/boot/efi/libefi/Makefile sys/boot/efi/libefi/Makefile
+--- ../src.orig/sys/boot/efi/libefi/Makefile 2006-11-05 23:03:03.000000000 +0100
++++ sys/boot/efi/libefi/Makefile 2008-03-14 11:15:48.482695423 +0100
+@@ -8,7 +8,7 @@
+
+ CFLAGS+= -I${.CURDIR}/../include
+ CFLAGS+= -I${.CURDIR}/../include/${MACHINE_ARCH:S/amd64/i386/}
+-CFLAGS+= -I${.CURDIR}/../../../../lib/libstand
++CFLAGS+= -I/usr/include/libstand
+
+ # Pick up the bootstrap header for some interface items
+ CFLAGS+= -I${.CURDIR}/../../common
+diff -ur ../src.orig/sys/boot/i386/boot2/Makefile sys/boot/i386/boot2/Makefile
+--- ../src.orig/sys/boot/i386/boot2/Makefile 2007-05-19 07:07:47.000000000 +0200
++++ sys/boot/i386/boot2/Makefile 2008-03-14 11:21:16.247014910 +0100
+@@ -24,7 +24,7 @@
+ -fno-guess-branch-probability \
+ -fomit-frame-pointer \
+ -fno-unit-at-a-time \
+- -mno-align-long-strings \
++ -march=i586 \
+ -mrtd \
+ -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 \
+ -D${BOOT2_UFS} \
+diff -ur ../src.orig/sys/boot/i386/libfirewire/Makefile sys/boot/i386/libfirewire/Makefile
+--- ../src.orig/sys/boot/i386/libfirewire/Makefile 2007-05-29 16:35:57.000000000 +0200
++++ sys/boot/i386/libfirewire/Makefile 2008-03-14 11:15:48.502696288 +0100
+@@ -10,7 +10,7 @@
+ CFLAGS+= -D_BOOT
+
+ CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../../.. -I.
+-CFLAGS+= -I${.CURDIR}/../../../../lib/libstand
++CFLAGS+= -I/usr/include/libstand
+ CFLAGS+= -I${.CURDIR}/../btx/lib
+ CFLAGS+= -I${.CURDIR}/../libi386
+
+diff -ur ../src.orig/sys/boot/i386/libi386/Makefile sys/boot/i386/libi386/Makefile
+--- ../src.orig/sys/boot/i386/libi386/Makefile 2006-04-11 22:11:30.000000000 +0200
++++ sys/boot/i386/libi386/Makefile 2008-03-14 11:15:48.506695959 +0100
+@@ -36,7 +36,7 @@
+ -I${.CURDIR}/../../../contrib/dev/acpica \
+ -I${.CURDIR}/../../.. -I.
+ # the location of libstand
+-CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/
++CFLAGS+= -I/usr/include/libstand/
+
+ .if ${MACHINE_ARCH} == "amd64"
+ CLEANFILES+= machine
+diff -ur ../src.orig/sys/boot/ia64/common/Makefile sys/boot/ia64/common/Makefile
+--- ../src.orig/sys/boot/ia64/common/Makefile 2006-11-05 23:03:03.000000000 +0100
++++ sys/boot/ia64/common/Makefile 2008-03-14 11:15:48.486695372 +0100
+@@ -10,7 +10,7 @@
+ CFLAGS+= -I${.CURDIR}/../../efi/include
+ CFLAGS+= -I${.CURDIR}/../../efi/include/${MACHINE_ARCH}
+ CFLAGS+= -I${.CURDIR}/../../..
+-CFLAGS+= -I${.CURDIR}/../../../../lib/libstand
++CFLAGS+= -I/usr/include/libstand
+
+ .if ${MK_FORTH} != "no"
+ BOOT_FORTH= yes
+diff -ur ../src.orig/sys/boot/ia64/efi/Makefile sys/boot/ia64/efi/Makefile
+--- ../src.orig/sys/boot/ia64/efi/Makefile 2006-11-05 23:03:03.000000000 +0100
++++ sys/boot/ia64/efi/Makefile 2008-03-14 11:15:48.490695322 +0100
+@@ -15,7 +15,7 @@
+ CFLAGS+= -I${.CURDIR}/../../efi/include
+ CFLAGS+= -I${.CURDIR}/../../efi/include/${MACHINE_ARCH}
+ CFLAGS+= -I${.CURDIR}/../../..
+-CFLAGS+= -I${.CURDIR}/../../../../lib/libstand
++CFLAGS+= -I/usr/include/libstand
+
+ LDSCRIPT= ${.CURDIR}/ldscript.${MACHINE_ARCH}
+ LDFLAGS= -Wl,-T${LDSCRIPT} -shared -symbolic
+diff -ur ../src.orig/sys/boot/ia64/ski/Makefile sys/boot/ia64/ski/Makefile
+--- ../src.orig/sys/boot/ia64/ski/Makefile 2006-11-05 23:03:04.000000000 +0100
++++ sys/boot/ia64/ski/Makefile 2008-03-14 11:15:48.494695551 +0100
+@@ -14,7 +14,7 @@
+ CFLAGS+= -I${.CURDIR}/../common
+ CFLAGS+= -I${.CURDIR}/../../common
+ CFLAGS+= -I${.CURDIR}/../../..
+-CFLAGS+= -I${.CURDIR}/../../../../lib/libstand
++CFLAGS+= -I/usr/include/libstand
+
+ LDSCRIPT= ${.CURDIR}/ldscript.${MACHINE_ARCH}
+ LDFLAGS= -Wl,-T${LDSCRIPT}
+diff -ur ../src.orig/sys/boot/ofw/libofw/Makefile sys/boot/ofw/libofw/Makefile
+--- ../src.orig/sys/boot/ofw/libofw/Makefile 2007-06-17 02:17:15.000000000 +0200
++++ sys/boot/ofw/libofw/Makefile 2008-03-14 11:15:48.478695194 +0100
+@@ -7,7 +7,7 @@
+ ofw_memory.c ofw_module.c ofw_net.c ofw_reboot.c \
+ ofw_time.c openfirm.c
+
+-CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/
++CFLAGS+= -I/usr/include/libstand/
+
+ # Pick up the bootstrap header for some interface items
+ CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../../.. -I.
+diff -ur ../src.orig/sys/boot/pc98/libpc98/Makefile sys/boot/pc98/libpc98/Makefile
+--- ../src.orig/sys/boot/pc98/libpc98/Makefile 2006-04-11 22:11:30.000000000 +0200
++++ sys/boot/pc98/libpc98/Makefile 2008-03-14 11:15:48.510696188 +0100
+@@ -31,6 +31,6 @@
+ -I${.CURDIR}/../../i386/libi386 \
+ -I${.CURDIR}/../../.. -I.
+ # the location of libstand
+-CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/
++CFLAGS+= -I/usr/include/libstand/
+
+ .include <bsd.lib.mk>
+diff -ur ../src.orig/sys/boot/powerpc/loader/Makefile sys/boot/powerpc/loader/Makefile
+--- ../src.orig/sys/boot/powerpc/loader/Makefile 2006-03-17 19:54:36.000000000 +0100
++++ sys/boot/powerpc/loader/Makefile 2008-03-14 11:15:48.515695706 +0100
+@@ -82,7 +82,7 @@
+ CFLAGS+= -I${.CURDIR}/../../ofw/libofw
+
+ # where to get libstand from
+-CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/
++CFLAGS+= -I/usr/include/libstand/
+
+ DPADD= ${LIBFICL} ${LIBOFW} ${LIBSTAND}
+ LDADD= ${LIBFICL} ${LIBOFW} -lstand
+diff -ur ../src.orig/sys/boot/sparc64/loader/Makefile sys/boot/sparc64/loader/Makefile
+--- ../src.orig/sys/boot/sparc64/loader/Makefile 2006-03-17 19:54:36.000000000 +0100
++++ sys/boot/sparc64/loader/Makefile 2008-03-14 11:15:48.498695501 +0100
+@@ -65,7 +65,7 @@
+ CFLAGS+= -I${.CURDIR}/../../ofw/libofw/
+
+ # where to get libstand from
+-CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/
++CFLAGS+= -I/usr/include/libstand/
+
+ DPADD= ${LIBFICL} ${LIBOFW} ${LIBSTAND}
+ LDADD= ${LIBFICL} ${LIBOFW} -lstand
diff --git a/sys-freebsd/boot0/files/boot0-8.2-zfsboot-makefile.patch b/sys-freebsd/boot0/files/boot0-8.2-zfsboot-makefile.patch
new file mode 100644
index 0000000..a3a33d5
--- /dev/null
+++ b/sys-freebsd/boot0/files/boot0-8.2-zfsboot-makefile.patch
@@ -0,0 +1,13 @@
+diff --git a/sys/boot/i386/zfsboot/Makefile b/sys/boot/i386/zfsboot/Makefile
+index bb16ea3..7dedb49 100644
+--- a/sys/boot/i386/zfsboot/Makefile
++++ b/sys/boot/i386/zfsboot/Makefile
+@@ -83,6 +83,8 @@ zfsboot.bin: zfsboot.out
+ zfsboot.out: ${BTXCRT} zfsboot.o sio.o drv.o cons.o util.o
+ ${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND}
+
++drv.o: drv.c xreadorg.h
++
+ zfsboot.o: zfsboot.s
+
+ SRCS= zfsboot.c xreadorg.h
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/boot0/files/, sys-freebsd/boot0/
@ 2013-07-12 12:26 Yuta SATOH
0 siblings, 0 replies; 3+ messages in thread
From: Yuta SATOH @ 2013-07-12 12:26 UTC (permalink / raw
To: gentoo-commits
commit: e2441d4a61c604ac81de4a74abea3cb3692278c7
Author: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Fri Jul 12 12:25:41 2013 +0000
Commit: Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Fri Jul 12 12:25:41 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=e2441d4a
added boot0-9.9999-gcc46.patch
---
sys-freebsd/boot0/Manifest | 3 +-
sys-freebsd/boot0/boot0-9.9999_p253216.ebuild | 13 ++---
sys-freebsd/boot0/files/boot0-9.9999-gcc46.patch | 66 ++++++++++++++++++++++++
3 files changed, 71 insertions(+), 11 deletions(-)
diff --git a/sys-freebsd/boot0/Manifest b/sys-freebsd/boot0/Manifest
index d39afce..d08741e 100644
--- a/sys-freebsd/boot0/Manifest
+++ b/sys-freebsd/boot0/Manifest
@@ -1 +1,2 @@
-EBUILD boot0-9.9999_p253216.ebuild 1839 SHA256 a496c50d4c322487c2e10e5f97eb6f07fe7ce729b8da85c5557c23036077a897 SHA512 702f0bdc362d6a589df36189b3a1df9e059779f20b599fef46d3d8518c862789f481889ed31fdc69b514372981e8cea2b6a14e3af1a37f3172401f901e8f7a4b WHIRLPOOL 7cb2c95c47456a35c4404bd9254b66d103a3cbd3b155a7fe7f972acd600eebdd740c9e3d2b57d41a7a5bb984fb75f53cd9842fbc6c5ba70265aab66c2f9b8d61
+AUX boot0-9.9999-gcc46.patch 2119 SHA256 745245270e8ac2e8a1084f1785bb31ce7a5d2c7242f762260ad9a97fa02970f5 SHA512 ee834269bdc4a79da6854f59fe896b8e13efd1f60d97aefc8829cd1137f8f84810bba4344aac79424a4f31503a1a8579caf468e83a60d127d81f5d10fcbc4ae9 WHIRLPOOL 0c057ffe2baa7cb1b74912cebed5ec5f31adee7780a77993b40bad256e89baf3ed4dc18567c263bfed9a76e63e274072945e37dd729ac62c8538ab7678e4dfe1
+EBUILD boot0-9.9999_p253216.ebuild 1503 SHA256 d93d5da142d3fd38218101f9ebec728e4673dc5f63da8313cf7b0ad9deea712b SHA512 0c8f1c2739054812cafb7fa2cf21a6c955555e3bd486f5d348b9288469d14d6d2ccee6f600230dae975411cf20078d8ec95fee6235b2898e31c31198d7589ddc WHIRLPOOL a6c4cc6f1d58e3d89e0b80b815ffe8dfff1508886108e0b8f42eb5534b89b47ea2987847486b8f685dffd07dbb2833d0ec380201fc39634123491141c3f2c489
diff --git a/sys-freebsd/boot0/boot0-9.9999_p253216.ebuild b/sys-freebsd/boot0/boot0-9.9999_p253216.ebuild
index 7aba0cb..f0fdd5b 100644
--- a/sys-freebsd/boot0/boot0-9.9999_p253216.ebuild
+++ b/sys-freebsd/boot0/boot0-9.9999_p253216.ebuild
@@ -24,6 +24,8 @@ DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
S="${WORKDIR}/sys/boot"
+PATCHES=( "${FILESDIR}/${PN}-9.9999-gcc46.patch" )
+
boot0_use_enable() {
use ${1} && mymakeopts="${mymakeopts} LOADER_${2}_SUPPORT=\"yes\""
}
@@ -36,20 +38,11 @@ pkg_setup() {
}
src_prepare() {
- sed -e '/-mno-align-long-strings/d' \
+ sed -e '/-fomit-frame-pointer/d' -e '/-mno-align-long-strings/d' \
-i "${S}"/i386/boot2/Makefile \
-i "${S}"/i386/gptboot/Makefile \
-i "${S}"/i386/gptzfsboot/Makefile \
-i "${S}"/i386/zfsboot/Makefile || die
-
- # gcc-4.6 or later version support, bug #409815
- if ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -ge 6 ]] ) ; then
- sed -i -e '/-m elf_i386_fbsd/d' "${S}"/i386/Makefile.inc || die
- for dir in boot2 gptboot gptzfsboot zfsboot; do
- echo "LDFLAGS+= -m elf_i386_fbsd" >> "${S}"/i386/${dir}/Makefile || die
- done
- echo "CFLAGS+= -fno-asynchronous-unwind-tables" >> "${S}"/i386/boot2/Makefile || die
- fi
}
src_compile() {
diff --git a/sys-freebsd/boot0/files/boot0-9.9999-gcc46.patch b/sys-freebsd/boot0/files/boot0-9.9999-gcc46.patch
new file mode 100644
index 0000000..ffd9f43
--- /dev/null
+++ b/sys-freebsd/boot0/files/boot0-9.9999-gcc46.patch
@@ -0,0 +1,66 @@
+diff --git a/sys/boot/i386/Makefile.inc b/sys/boot/i386/Makefile.inc
+index f5faec7..a9cf593 100644
+--- a/sys/boot/i386/Makefile.inc
++++ b/sys/boot/i386/Makefile.inc
+@@ -12,7 +12,6 @@ LDFLAGS+= -nostdlib
+ .if ${MACHINE_CPUARCH} == "amd64"
+ CFLAGS+= -m32
+ ACFLAGS+= -m32
+-LDFLAGS+= -m elf_i386_fbsd
+ AFLAGS+= --32
+ .endif
+
+diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile
+index 65815a5..61840dd 100644
+--- a/sys/boot/i386/boot2/Makefile
++++ b/sys/boot/i386/boot2/Makefile
+@@ -109,3 +109,10 @@ machine:
+ # XXX: clang integrated-as doesn't grok .codeNN directives yet
+ CFLAGS.boot1.S= ${CLANG_NO_IAS}
+ CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
++
++# gcc 4.6 or later version, -fno-asynchronous-unwind-tables is required to build.
++CFLAGS+= -fno-asynchronous-unwind-tables
++
++.if ${MACHINE_CPUARCH} == "amd64"
++LDFLAGS+= -m elf_i386_fbsd
++.endif
+diff --git a/sys/boot/i386/gptboot/Makefile b/sys/boot/i386/gptboot/Makefile
+index e1a640a..29886cc 100644
+--- a/sys/boot/i386/gptboot/Makefile
++++ b/sys/boot/i386/gptboot/Makefile
+@@ -78,3 +78,8 @@ machine:
+ # XXX: clang integrated-as doesn't grok .codeNN directives yet
+ CFLAGS.gptldr.S= ${CLANG_NO_IAS}
+ CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
++
++.if ${MACHINE_CPUARCH} == "amd64"
++LDFLAGS+= -m elf_i386_fbsd
++.endif
++
+diff --git a/sys/boot/i386/gptzfsboot/Makefile b/sys/boot/i386/gptzfsboot/Makefile
+index a2b8fcc..107f531 100644
+--- a/sys/boot/i386/gptzfsboot/Makefile
++++ b/sys/boot/i386/gptzfsboot/Makefile
+@@ -76,3 +76,8 @@ machine:
+ # XXX: clang integrated-as doesn't grok .codeNN directives yet
+ CFLAGS.gptldr.S= ${CLANG_NO_IAS}
+ CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
++
++.if ${MACHINE_CPUARCH} == "amd64"
++LDFLAGS+= -m elf_i386_fbsd
++.endif
++
+diff --git a/sys/boot/i386/zfsboot/Makefile b/sys/boot/i386/zfsboot/Makefile
+index b2db778..252dc62 100644
+--- a/sys/boot/i386/zfsboot/Makefile
++++ b/sys/boot/i386/zfsboot/Makefile
+@@ -89,3 +89,8 @@ machine:
+ # XXX: clang integrated-as doesn't grok .codeNN directives yet
+ CFLAGS.zfsldr.S= ${CLANG_NO_IAS}
+ CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
++
++.if ${MACHINE_CPUARCH} == "amd64"
++LDFLAGS+= -m elf_i386_fbsd
++.endif
++
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-07-12 12:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-11 17:10 [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/boot0/files/, sys-freebsd/boot0/ Alexis Ballier
-- strict thread matches above, loose matches on Subject: below --
2012-11-29 14:07 Yuta SATOH
2013-07-12 12:26 Yuta SATOH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox