sys-boot/grub: refactor platform logic

Package-Manager: portage-2.3.0_p7

diff --git a/sys-boot/grub/grub-2.02_beta3-r1.ebuild b/sys-boot/grub/grub-2.02_beta3-r1.ebuild
index fd6f5f2d802fcf1532b78294974c31946530c013..51efcb7db16d89ed72348b0a50bed64a1a322707 100644 (file)
--- a/sys-boot/grub/grub-2.02_beta3-r1.ebuild
+++ b/sys-boot/grub/grub-2.02_beta3-r1.ebuild
@@ -168,26 +168,23 @@ grub_configure() {
        local platform
 
        case ${MULTIBUILD_VARIANT} in
-               efi-32)
-                       platform=efi
+               efi*) platform=efi ;;
+               xen*) platform=xen ;;
+               guessed) ;;
+               *) platform=${MULTIBUILD_VARIANT} ;;
+       esac
+
+       case ${MULTIBUILD_VARIANT} in
+               *-32)
                        if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
-                               local CTARGET=${CTARGET:-i386}
+                               local CTARGET=i386
                        fi ;;
-               efi-64)
-                       platform=efi
+               *-64)
                        if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
-                               local CTARGET=${CTARGET:-x86_64}
-                               local TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
-                               local TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
-                               export TARGET_CFLAGS TARGET_CPPFLAGS
-                       fi ;;
-               xen-32)
-                       platform=xen
-                       if [[ ${CHOST} == x86_64* ]]; then
-                               local CTARGET=i386
+                               local CTARGET=x86_64
+                               local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
+                               local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
                        fi ;;
-               guessed) ;;
-               *)      platform=${MULTIBUILD_VARIANT} ;;
        esac
 
        local myeconfargs=(

diff --git a/sys-boot/grub/grub-9999-r1.ebuild b/sys-boot/grub/grub-9999-r1.ebuild
index b0c7084c38c537f35db8acf145352378221c2f00..ad5762439cbbc9779309def8c766ec9486eb93a9 100644 (file)
--- a/sys-boot/grub/grub-9999-r1.ebuild
+++ b/sys-boot/grub/grub-9999-r1.ebuild
@@ -169,26 +169,23 @@ grub_configure() {
        local platform
 
        case ${MULTIBUILD_VARIANT} in
-               efi-32)
-                       platform=efi
+               efi*) platform=efi ;;
+               xen*) platform=xen ;;
+               guessed) ;;
+               *) platform=${MULTIBUILD_VARIANT} ;;
+       esac
+
+       case ${MULTIBUILD_VARIANT} in
+               *-32)
                        if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
-                               local CTARGET=${CTARGET:-i386}
+                               local CTARGET=i386
                        fi ;;
-               efi-64)
-                       platform=efi
+               *-64)
                        if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
-                               local CTARGET=${CTARGET:-x86_64}
-                               local TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
-                               local TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
-                               export TARGET_CFLAGS TARGET_CPPFLAGS
-                       fi ;;
-               xen-32)
-                       platform=xen
-                       if [[ ${CHOST} == x86_64* ]]; then
-                               local CTARGET=i386
+                               local CTARGET=x86_64
+                               local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
+                               local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
                        fi ;;
-               guessed) ;;
-               *)      platform=${MULTIBUILD_VARIANT} ;;
        esac
 
        local myeconfargs=(