| 1 |
commit: 0475287b1eb40bb052bb2c5e5ac5da1019e165e5 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jun 29 02:25:59 2016 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 29 02:25:59 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0475287b |
| 7 |
|
| 8 |
sys-boot/grub: refactor platform logic |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.0_p7 |
| 11 |
|
| 12 |
sys-boot/grub/grub-2.02_beta3-r1.ebuild | 29 +++++++++++++---------------- |
| 13 |
sys-boot/grub/grub-9999-r1.ebuild | 29 +++++++++++++---------------- |
| 14 |
2 files changed, 26 insertions(+), 32 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-boot/grub/grub-2.02_beta3-r1.ebuild b/sys-boot/grub/grub-2.02_beta3-r1.ebuild |
| 17 |
index fd6f5f2..51efcb7 100644 |
| 18 |
--- a/sys-boot/grub/grub-2.02_beta3-r1.ebuild |
| 19 |
+++ b/sys-boot/grub/grub-2.02_beta3-r1.ebuild |
| 20 |
@@ -168,26 +168,23 @@ grub_configure() { |
| 21 |
local platform |
| 22 |
|
| 23 |
case ${MULTIBUILD_VARIANT} in |
| 24 |
- efi-32) |
| 25 |
- platform=efi |
| 26 |
+ efi*) platform=efi ;; |
| 27 |
+ xen*) platform=xen ;; |
| 28 |
+ guessed) ;; |
| 29 |
+ *) platform=${MULTIBUILD_VARIANT} ;; |
| 30 |
+ esac |
| 31 |
+ |
| 32 |
+ case ${MULTIBUILD_VARIANT} in |
| 33 |
+ *-32) |
| 34 |
if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then |
| 35 |
- local CTARGET=${CTARGET:-i386} |
| 36 |
+ local CTARGET=i386 |
| 37 |
fi ;; |
| 38 |
- efi-64) |
| 39 |
- platform=efi |
| 40 |
+ *-64) |
| 41 |
if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then |
| 42 |
- local CTARGET=${CTARGET:-x86_64} |
| 43 |
- local TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}" |
| 44 |
- local TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}" |
| 45 |
- export TARGET_CFLAGS TARGET_CPPFLAGS |
| 46 |
- fi ;; |
| 47 |
- xen-32) |
| 48 |
- platform=xen |
| 49 |
- if [[ ${CHOST} == x86_64* ]]; then |
| 50 |
- local CTARGET=i386 |
| 51 |
+ local CTARGET=x86_64 |
| 52 |
+ local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}" |
| 53 |
+ local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}" |
| 54 |
fi ;; |
| 55 |
- guessed) ;; |
| 56 |
- *) platform=${MULTIBUILD_VARIANT} ;; |
| 57 |
esac |
| 58 |
|
| 59 |
local myeconfargs=( |
| 60 |
|
| 61 |
diff --git a/sys-boot/grub/grub-9999-r1.ebuild b/sys-boot/grub/grub-9999-r1.ebuild |
| 62 |
index b0c7084..ad57624 100644 |
| 63 |
--- a/sys-boot/grub/grub-9999-r1.ebuild |
| 64 |
+++ b/sys-boot/grub/grub-9999-r1.ebuild |
| 65 |
@@ -169,26 +169,23 @@ grub_configure() { |
| 66 |
local platform |
| 67 |
|
| 68 |
case ${MULTIBUILD_VARIANT} in |
| 69 |
- efi-32) |
| 70 |
- platform=efi |
| 71 |
+ efi*) platform=efi ;; |
| 72 |
+ xen*) platform=xen ;; |
| 73 |
+ guessed) ;; |
| 74 |
+ *) platform=${MULTIBUILD_VARIANT} ;; |
| 75 |
+ esac |
| 76 |
+ |
| 77 |
+ case ${MULTIBUILD_VARIANT} in |
| 78 |
+ *-32) |
| 79 |
if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then |
| 80 |
- local CTARGET=${CTARGET:-i386} |
| 81 |
+ local CTARGET=i386 |
| 82 |
fi ;; |
| 83 |
- efi-64) |
| 84 |
- platform=efi |
| 85 |
+ *-64) |
| 86 |
if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then |
| 87 |
- local CTARGET=${CTARGET:-x86_64} |
| 88 |
- local TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}" |
| 89 |
- local TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}" |
| 90 |
- export TARGET_CFLAGS TARGET_CPPFLAGS |
| 91 |
- fi ;; |
| 92 |
- xen-32) |
| 93 |
- platform=xen |
| 94 |
- if [[ ${CHOST} == x86_64* ]]; then |
| 95 |
- local CTARGET=i386 |
| 96 |
+ local CTARGET=x86_64 |
| 97 |
+ local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}" |
| 98 |
+ local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}" |
| 99 |
fi ;; |
| 100 |
- guessed) ;; |
| 101 |
- *) platform=${MULTIBUILD_VARIANT} ;; |
| 102 |
esac |
| 103 |
|
| 104 |
local myeconfargs=( |
Archives