From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 7B0B21381F3 for ; Fri, 12 Jul 2013 12:26:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EE2F1E08FC; Fri, 12 Jul 2013 12:26:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6BA83E08FC for ; Fri, 12 Jul 2013 12:26:06 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 01A1D33E9E5 for ; Fri, 12 Jul 2013 12:26:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E8E24E468F for ; Fri, 12 Jul 2013 12:26:01 +0000 (UTC) From: "Yuta SATOH" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Yuta SATOH" Message-ID: <1373631941.e2441d4a61c604ac81de4a74abea3cb3692278c7.yuta_satoh@gentoo> Subject: [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/boot0/files/, sys-freebsd/boot0/ X-VCS-Repository: proj/gentoo-bsd X-VCS-Files: sys-freebsd/boot0/Manifest sys-freebsd/boot0/boot0-9.9999_p253216.ebuild sys-freebsd/boot0/files/boot0-9.9999-gcc46.patch X-VCS-Directories: sys-freebsd/boot0/files/ sys-freebsd/boot0/ X-VCS-Committer: yuta_satoh X-VCS-Committer-Name: Yuta SATOH X-VCS-Revision: e2441d4a61c604ac81de4a74abea3cb3692278c7 X-VCS-Branch: master Date: Fri, 12 Jul 2013 12:26:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0dc819b5-4ab9-4aa4-bf88-e8642409350c X-Archives-Hash: 4bc4998dc1715f37be40da75911b09a9 commit: e2441d4a61c604ac81de4a74abea3cb3692278c7 Author: Yuta SATOH gentoo gr jp> AuthorDate: Fri Jul 12 12:25:41 2013 +0000 Commit: Yuta SATOH 0x100 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 ++