Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] build grub-x86_64-efi for i686
@ 2020-12-03  0:37 sgn
  2020-12-03  0:48 ` ericonr
                   ` (25 more replies)
  0 siblings, 26 replies; 27+ messages in thread
From: sgn @ 2020-12-03  0:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 320 bytes --]

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages i686-grub-x86_64-efi
https://github.com/void-linux/void-packages/pull/26895

build grub-x86_64-efi for i686


A patch file from https://github.com/void-linux/void-packages/pull/26895.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-i686-grub-x86_64-efi-26895.patch --]
[-- Type: text/x-diff, Size: 3779 bytes --]

From 37186099856c99d4d37696dfcb3947e3f6e2ccec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 2 Dec 2020 19:44:14 +0700
Subject: [PATCH 1/2] cross-x86_64-linux-musl: build for i686*

---
 srcpkgs/cross-x86_64-linux-musl/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index 96e6c7feb71e..ac2f22b614c5 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -39,7 +39,9 @@ nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a libgmem.a"
 depends="${pkgname}-libc-${version}_${revision}"
 
-if [ "$XBPS_TARGET_WORDSIZE" != "64" ]; then
+if [ "${XBPS_TARGET_MACHINE%-musl}" = i686 ]; then
+	:
+elif [ "$XBPS_TARGET_WORDSIZE" != "64" ]; then
 	broken="64-bit crosstoolchain only available on 64-bit host"
 fi
 

From fbf3beb79855860225b38a8321399e4b3da9508d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 2 Dec 2020 19:47:39 +0700
Subject: [PATCH 2/2] grub: build grub-x86_64-efi for i686

---
 srcpkgs/grub/template | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/grub/template b/srcpkgs/grub/template
index 77c6cfbff2f7..2025286471ac 100644
--- a/srcpkgs/grub/template
+++ b/srcpkgs/grub/template
@@ -1,7 +1,7 @@
 # Template file for 'grub'
 pkgname=grub
 version=2.04
-revision=3
+revision=4
 hostmakedepends="python3 pkg-config flex freetype-devel font-unifont-bdf"
 makedepends="libusb-compat-devel ncurses-devel freetype-devel
  liblzma-devel device-mapper-devel fuse-devel"
@@ -29,8 +29,8 @@ case "$XBPS_TARGET_MACHINE" in
 		CFLAGS="-D_FILE_OFFSET_BITS=64"
 		configure_args+=" ac_cv_sizeof_off_t=8"
 		_NATIVE_PLATFORM=pc
-		_SUPPLEMENTARY_BUILDS="i386-efi i386-coreboot i386-xen"
-		subpackages+=" grub-i386-efi grub-i386-coreboot grub-xen"
+		_SUPPLEMENTARY_BUILDS="i386-efi x86_64-efi i386-coreboot i386-xen"
+		subpackages+=" grub-i386-efi grub-x86_64-efi grub-i386-coreboot grub-xen"
 		;;
 	aarch64*)
 		_NATIVE_PLATFORM=efi
@@ -78,6 +78,11 @@ do_configure() {
 		msg_normal "Configuring ${_TARGET} ${_PLATFORM} grub...\n"
 		mkdir $wrksrc/${_PLATFORM}_${_TARGET}_build
 		cd $wrksrc/${_PLATFORM}_${_TARGET}_build
+		if [ "$_TARGET" = x86_64 ] &&
+		   [ "${XBPS_TARGET_MACHINE%-musl}" = i686 ]; then
+			_TARGET=x86_64-linux-musl
+			CFLAGS="${CFLAGS/-mtune=i686/-mtune=generic}"
+		fi
 		../configure --host=${XBPS_TARGET_MACHINE} --target=${_TARGET} --with-platform=${_PLATFORM} ${configure_args} \
 			--disable-efiemu \
 			--libdir=/usr/lib
@@ -162,7 +167,6 @@ grub-utils_package() {
 	}
 }
 grub-x86_64-efi_package() {
-	archs=noarch
 	depends="grub>=$version dosfstools efibootmgr"
 	short_desc+=" - x86_64 EFI support"
 	pkg_install() {
@@ -170,7 +174,6 @@ grub-x86_64-efi_package() {
 	}
 }
 grub-i386-efi_package() {
-	archs=noarch
 	depends="grub>=$version dosfstools efibootmgr"
 	short_desc+=" - i386 EFI support"
 	pkg_install() {
@@ -178,7 +181,6 @@ grub-i386-efi_package() {
 	}
 }
 grub-i386-coreboot_package() {
-	archs=noarch
 	depends="grub>=$version"
 	short_desc+=" - i386 coreboot support"
 	pkg_install() {
@@ -200,7 +202,6 @@ grub-xen_package() {
 	}
 }
 grub-arm64-efi_package() {
-	archs=noarch
 	depends="grub>=$version dosfstools efibootmgr"
 	short_desc+=" - arm64 EFI support"
 	pkg_install() {
@@ -208,7 +209,6 @@ grub-arm64-efi_package() {
 	}
 }
 grub-powerpc-ieee1275_package() {
-	archs=noarch
 	depends="grub>=$version powerpc-utils"
 	short_desc+=" - powerpc Open Firmware support"
 	pkg_install() {

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: build grub-x86_64-efi for i686
  2020-12-03  0:37 [PR PATCH] build grub-x86_64-efi for i686 sgn
@ 2020-12-03  0:48 ` ericonr
  2020-12-03  0:48 ` [PR REVIEW] " ericonr
                   ` (24 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: ericonr @ 2020-12-03  0:48 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 210 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26895#issuecomment-737586444

Comment:
Pull in the `help2man` change as well to completely replace #25267 :)

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR REVIEW] build grub-x86_64-efi for i686
  2020-12-03  0:37 [PR PATCH] build grub-x86_64-efi for i686 sgn
  2020-12-03  0:48 ` ericonr
@ 2020-12-03  0:48 ` ericonr
  2020-12-03  0:55 ` [PR PATCH] [Updated] " sgn
                   ` (23 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: ericonr @ 2020-12-03  0:48 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 229 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26895#discussion_r534582651

Comment:
Is there anything special about `i686` here? We could just remove this limitation.

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] build grub-x86_64-efi for i686
  2020-12-03  0:37 [PR PATCH] build grub-x86_64-efi for i686 sgn
  2020-12-03  0:48 ` ericonr
  2020-12-03  0:48 ` [PR REVIEW] " ericonr
@ 2020-12-03  0:55 ` sgn
  2020-12-03 14:01 ` sgn
                   ` (22 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: sgn @ 2020-12-03  0:55 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 325 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages i686-grub-x86_64-efi
https://github.com/void-linux/void-packages/pull/26895

build grub-x86_64-efi for i686


A patch file from https://github.com/void-linux/void-packages/pull/26895.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-i686-grub-x86_64-efi-26895.patch --]
[-- Type: text/x-diff, Size: 3911 bytes --]

From 37186099856c99d4d37696dfcb3947e3f6e2ccec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 2 Dec 2020 19:44:14 +0700
Subject: [PATCH 1/2] cross-x86_64-linux-musl: build for i686*

---
 srcpkgs/cross-x86_64-linux-musl/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index 96e6c7feb71..ac2f22b614c 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -39,7 +39,9 @@ nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a libgmem.a"
 depends="${pkgname}-libc-${version}_${revision}"
 
-if [ "$XBPS_TARGET_WORDSIZE" != "64" ]; then
+if [ "${XBPS_TARGET_MACHINE%-musl}" = i686 ]; then
+	:
+elif [ "$XBPS_TARGET_WORDSIZE" != "64" ]; then
 	broken="64-bit crosstoolchain only available on 64-bit host"
 fi
 

From 010dfda9fa1036305082baaab1dc7f435cf3cc9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 2 Dec 2020 19:47:39 +0700
Subject: [PATCH 2/2] grub: build grub-x86_64-efi for i686, build manpages

Close #25267
---
 srcpkgs/grub/template | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/grub/template b/srcpkgs/grub/template
index 77c6cfbff2f..7f87bfb4d78 100644
--- a/srcpkgs/grub/template
+++ b/srcpkgs/grub/template
@@ -1,8 +1,8 @@
 # Template file for 'grub'
 pkgname=grub
 version=2.04
-revision=3
-hostmakedepends="python3 pkg-config flex freetype-devel font-unifont-bdf"
+revision=4
+hostmakedepends="python3 pkg-config flex freetype-devel font-unifont-bdf help2man"
 makedepends="libusb-compat-devel ncurses-devel freetype-devel
  liblzma-devel device-mapper-devel fuse-devel"
 depends="os-prober"
@@ -29,8 +29,8 @@ case "$XBPS_TARGET_MACHINE" in
 		CFLAGS="-D_FILE_OFFSET_BITS=64"
 		configure_args+=" ac_cv_sizeof_off_t=8"
 		_NATIVE_PLATFORM=pc
-		_SUPPLEMENTARY_BUILDS="i386-efi i386-coreboot i386-xen"
-		subpackages+=" grub-i386-efi grub-i386-coreboot grub-xen"
+		_SUPPLEMENTARY_BUILDS="i386-efi x86_64-efi i386-coreboot i386-xen"
+		subpackages+=" grub-i386-efi grub-x86_64-efi grub-i386-coreboot grub-xen"
 		;;
 	aarch64*)
 		_NATIVE_PLATFORM=efi
@@ -78,6 +78,11 @@ do_configure() {
 		msg_normal "Configuring ${_TARGET} ${_PLATFORM} grub...\n"
 		mkdir $wrksrc/${_PLATFORM}_${_TARGET}_build
 		cd $wrksrc/${_PLATFORM}_${_TARGET}_build
+		if [ "$_TARGET" = x86_64 ] &&
+		   [ "${XBPS_TARGET_MACHINE%-musl}" = i686 ]; then
+			_TARGET=x86_64-linux-musl
+			CFLAGS="${CFLAGS/-mtune=i686/-mtune=generic}"
+		fi
 		../configure --host=${XBPS_TARGET_MACHINE} --target=${_TARGET} --with-platform=${_PLATFORM} ${configure_args} \
 			--disable-efiemu \
 			--libdir=/usr/lib
@@ -162,7 +167,6 @@ grub-utils_package() {
 	}
 }
 grub-x86_64-efi_package() {
-	archs=noarch
 	depends="grub>=$version dosfstools efibootmgr"
 	short_desc+=" - x86_64 EFI support"
 	pkg_install() {
@@ -170,7 +174,6 @@ grub-x86_64-efi_package() {
 	}
 }
 grub-i386-efi_package() {
-	archs=noarch
 	depends="grub>=$version dosfstools efibootmgr"
 	short_desc+=" - i386 EFI support"
 	pkg_install() {
@@ -178,7 +181,6 @@ grub-i386-efi_package() {
 	}
 }
 grub-i386-coreboot_package() {
-	archs=noarch
 	depends="grub>=$version"
 	short_desc+=" - i386 coreboot support"
 	pkg_install() {
@@ -200,7 +202,6 @@ grub-xen_package() {
 	}
 }
 grub-arm64-efi_package() {
-	archs=noarch
 	depends="grub>=$version dosfstools efibootmgr"
 	short_desc+=" - arm64 EFI support"
 	pkg_install() {
@@ -208,7 +209,6 @@ grub-arm64-efi_package() {
 	}
 }
 grub-powerpc-ieee1275_package() {
-	archs=noarch
 	depends="grub>=$version powerpc-utils"
 	short_desc+=" - powerpc Open Firmware support"
 	pkg_install() {

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] build grub-x86_64-efi for i686
  2020-12-03  0:37 [PR PATCH] build grub-x86_64-efi for i686 sgn
                   ` (2 preceding siblings ...)
  2020-12-03  0:55 ` [PR PATCH] [Updated] " sgn
@ 2020-12-03 14:01 ` sgn
  2020-12-03 15:00 ` [PR REVIEW] " sgn
                   ` (21 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: sgn @ 2020-12-03 14:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 325 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages i686-grub-x86_64-efi
https://github.com/void-linux/void-packages/pull/26895

build grub-x86_64-efi for i686


A patch file from https://github.com/void-linux/void-packages/pull/26895.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-i686-grub-x86_64-efi-26895.patch --]
[-- Type: text/x-diff, Size: 7842 bytes --]

From e7fbf2893fe7d023b5a8e93204264a5fe53e06f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 2 Dec 2020 19:44:14 +0700
Subject: [PATCH 1/4] cross-x86_64-linux-musl: build for i686*

---
 srcpkgs/cross-x86_64-linux-musl/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index 96e6c7feb71..ac2f22b614c 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -39,7 +39,9 @@ nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a libgmem.a"
 depends="${pkgname}-libc-${version}_${revision}"
 
-if [ "$XBPS_TARGET_WORDSIZE" != "64" ]; then
+if [ "${XBPS_TARGET_MACHINE%-musl}" = i686 ]; then
+	:
+elif [ "$XBPS_TARGET_WORDSIZE" != "64" ]; then
 	broken="64-bit crosstoolchain only available on 64-bit host"
 fi
 

From fd9ce2e75cabe0b8e0ff3f169cdb5a6db48d3143 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 2 Dec 2020 19:47:39 +0700
Subject: [PATCH 2/4] grub: build grub-x86_64-efi for i686, build manpages

Close #25267
---
 srcpkgs/grub/template | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/srcpkgs/grub/template b/srcpkgs/grub/template
index 77c6cfbff2f..0b7f2edc412 100644
--- a/srcpkgs/grub/template
+++ b/srcpkgs/grub/template
@@ -1,8 +1,8 @@
 # Template file for 'grub'
 pkgname=grub
 version=2.04
-revision=3
-hostmakedepends="python3 pkg-config flex freetype-devel font-unifont-bdf"
+revision=4
+hostmakedepends="python3 pkg-config flex freetype-devel font-unifont-bdf help2man"
 makedepends="libusb-compat-devel ncurses-devel freetype-devel
  liblzma-devel device-mapper-devel fuse-devel"
 depends="os-prober"
@@ -27,10 +27,11 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 	i686*)
 		CFLAGS="-D_FILE_OFFSET_BITS=64"
+		hostmakedepends+=" cross-x86_64-linux-musl"
 		configure_args+=" ac_cv_sizeof_off_t=8"
 		_NATIVE_PLATFORM=pc
-		_SUPPLEMENTARY_BUILDS="i386-efi i386-coreboot i386-xen"
-		subpackages+=" grub-i386-efi grub-i386-coreboot grub-xen"
+		_SUPPLEMENTARY_BUILDS="i386-efi x86_64-efi i386-coreboot i386-xen"
+		subpackages+=" grub-i386-efi grub-x86_64-efi grub-i386-coreboot grub-xen"
 		;;
 	aarch64*)
 		_NATIVE_PLATFORM=efi
@@ -48,7 +49,7 @@ post_extract() {
 
 do_configure() {
 	unset CC AS LD RANLIB CPP
-	CFLAGS="$CFLAGS -fno-stack-protector"
+	BASE_CFLAGS="$CFLAGS -fno-stack-protector"
 
 	# building with altivec generates broken grub core
 	case "$XBPS_TARGET_MACHINE" in
@@ -63,14 +64,11 @@ do_configure() {
 	sed -i 's|/usr/share/fonts/unifont|/usr/share/fonts/misc|' configure
 
 	# build tools
-	_configure_args=${configure_args}
-	if [ -n "${_NATIVE_PLATFORM}" ]; then
-		_configure_args="--with-platform=${_NATIVE_PLATFORM} ${_configure_args}"
-	fi
 	msg_normal "Configuring grub tools...\n"
 	mkdir $wrksrc/build
 	cd $wrksrc/build
-	../configure --host=${XBPS_TARGET_MACHINE} ${_configure_args}
+	../configure --host=${XBPS_TARGET_MACHINE} ${configure_args} \
+		${_NATIVE_PLATFORM:+--with-platform=${_NATIVE_PLATFORM}}
 
 	for _SUPP_BUILD in ${_SUPPLEMENTARY_BUILDS}; do
 		_TARGET=${_SUPP_BUILD%%-*}
@@ -78,7 +76,15 @@ do_configure() {
 		msg_normal "Configuring ${_TARGET} ${_PLATFORM} grub...\n"
 		mkdir $wrksrc/${_PLATFORM}_${_TARGET}_build
 		cd $wrksrc/${_PLATFORM}_${_TARGET}_build
-		../configure --host=${XBPS_TARGET_MACHINE} --target=${_TARGET} --with-platform=${_PLATFORM} ${configure_args} \
+		if [ "$_TARGET" = x86_64 ] &&
+		   [ "${XBPS_TARGET_MACHINE%-musl}" = i686 ]; then
+			_TARGET=x86_64-linux-musl
+			CFLAGS="${BASE_CFLAGS/-mtune=i686/-mtune=generic}"
+		else
+			CFLAGS="$BASE_CFLAGS"
+		fi
+		../configure --host=${XBPS_TARGET_MACHINE} --target=${_TARGET} \
+			--with-platform=${_PLATFORM} ${configure_args} \
 			--disable-efiemu \
 			--libdir=/usr/lib
 	done
@@ -90,14 +96,14 @@ do_build() {
 
 	msg_normal "Building grub tools...\n"
 	cd $wrksrc/build
-	make ${makejobs} &> make.log || tail -n100 make.log
+	make ${makejobs}
 
 	for _SUPP_BUILD in ${_SUPPLEMENTARY_BUILDS}; do
 		_TARGET=${_SUPP_BUILD%%-*}
 		_PLATFORM=${_SUPP_BUILD##*-}
 		msg_normal "Building ${_TARGET} ${_PLATFORM} grub...\n"
 		cd $wrksrc/${_PLATFORM}_${_TARGET}_build
-		make ${makejobs} &> make.log || tail -n100 make.log
+		make ${makejobs}
 	done
 }
 
@@ -162,7 +168,6 @@ grub-utils_package() {
 	}
 }
 grub-x86_64-efi_package() {
-	archs=noarch
 	depends="grub>=$version dosfstools efibootmgr"
 	short_desc+=" - x86_64 EFI support"
 	pkg_install() {
@@ -170,7 +175,6 @@ grub-x86_64-efi_package() {
 	}
 }
 grub-i386-efi_package() {
-	archs=noarch
 	depends="grub>=$version dosfstools efibootmgr"
 	short_desc+=" - i386 EFI support"
 	pkg_install() {
@@ -178,7 +182,6 @@ grub-i386-efi_package() {
 	}
 }
 grub-i386-coreboot_package() {
-	archs=noarch
 	depends="grub>=$version"
 	short_desc+=" - i386 coreboot support"
 	pkg_install() {
@@ -200,7 +203,6 @@ grub-xen_package() {
 	}
 }
 grub-arm64-efi_package() {
-	archs=noarch
 	depends="grub>=$version dosfstools efibootmgr"
 	short_desc+=" - arm64 EFI support"
 	pkg_install() {
@@ -208,7 +210,6 @@ grub-arm64-efi_package() {
 	}
 }
 grub-powerpc-ieee1275_package() {
-	archs=noarch
 	depends="grub>=$version powerpc-utils"
 	short_desc+=" - powerpc Open Firmware support"
 	pkg_install() {

From cfefe7e815dcbd59638bddb19e31c067f7a18268 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 1 Dec 2020 19:40:16 +0700
Subject: [PATCH 3/4] buildbot-slave: remove noarch

---
 srcpkgs/buildbot-slave/template | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/buildbot-slave/template b/srcpkgs/buildbot-slave/template
index 976fd7e689f..8b6c19bd9e3 100644
--- a/srcpkgs/buildbot-slave/template
+++ b/srcpkgs/buildbot-slave/template
@@ -1,15 +1,13 @@
 # Template file for 'buildbot-slave'
 pkgname=buildbot-slave
 version=0.8.14
-revision=2
-archs=noarch
+revision=3
 build_style=python2-module
-pycompile_module="buildslave"
 hostmakedepends="python"
 depends="python-Twisted"
 short_desc="BuildBot Slave Daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-only"
 homepage="https://buildbot.net/"
-license="GPL-2"
 distfiles="${PYPI_SITE}/b/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=7db02738c02d34c4d32508ac200e5f089ba73549315b127a9d8c0808d1a6d7a9

From e292e1a520b9d22b15f65c071d0c93a10d4b074a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 1 Dec 2020 19:40:16 +0700
Subject: [PATCH 4/4] buildbot: remove noarch

---
 srcpkgs/buildbot/template | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/buildbot/template b/srcpkgs/buildbot/template
index 9bee50ec737..ae905fc67ab 100644
--- a/srcpkgs/buildbot/template
+++ b/srcpkgs/buildbot/template
@@ -2,17 +2,15 @@
 pkgname=buildbot
 reverts="2.4.1_1"
 version=0.8.14
-revision=4
-archs=noarch
+revision=5
 build_style=python2-module
-pycompile_module="buildbot"
 pycompile_dirs="usr/share/buildbot/contrib"
 hostmakedepends="python"
 depends="python-setuptools python-dateutil python-Jinja2 python-sqlalchemy-migrate python-Twisted"
-short_desc="A system to automate the compile/test cycle"
+short_desc="System to automate the compile/test cycle"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-only"
 homepage="https://buildbot.net/"
-license="GPL-2"
 distfiles="${PYPI_SITE}/b/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=331efd07bd7522c222a8fb258801e8d78332c88d778ee76416b9e1028676e964
 

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR REVIEW] build grub-x86_64-efi for i686
  2020-12-03  0:37 [PR PATCH] build grub-x86_64-efi for i686 sgn
                   ` (3 preceding siblings ...)
  2020-12-03 14:01 ` sgn
@ 2020-12-03 15:00 ` sgn
  2020-12-05  3:48 ` [PR PATCH] [Updated] " sgn
                   ` (20 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: sgn @ 2020-12-03 15:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 173 bytes --]

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/26895#discussion_r535307170

Comment:
I don't know, to be honest :-p

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] build grub-x86_64-efi for i686
  2020-12-03  0:37 [PR PATCH] build grub-x86_64-efi for i686 sgn
                   ` (4 preceding siblings ...)
  2020-12-03 15:00 ` [PR REVIEW] " sgn
@ 2020-12-05  3:48 ` sgn
  2020-12-05 11:30 ` sgn
                   ` (19 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: sgn @ 2020-12-05  3:48 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 325 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages i686-grub-x86_64-efi
https://github.com/void-linux/void-packages/pull/26895

build grub-x86_64-efi for i686


A patch file from https://github.com/void-linux/void-packages/pull/26895.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-i686-grub-x86_64-efi-26895.patch --]
[-- Type: text/x-diff, Size: 6099 bytes --]

From 7f327476099280ea21d687f9e3bec43dcaf3d74f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 2 Dec 2020 19:44:14 +0700
Subject: [PATCH 1/2] cross-x86_64-linux-musl: build for i686*

---
 srcpkgs/cross-x86_64-linux-musl/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index 96e6c7feb71..b352d3057c9 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -6,10 +6,10 @@ _musl_version=1.1.24
 _linux_version=4.19
 _libucontext_version=0.9.0
 
-_triplet=x86_64-linux-musl
+pkgname=cross-x86_64-linux-musl
+_triplet=${pkgname#cross-}
 _sysroot="/usr/${_triplet}"
 
-pkgname=cross-${_triplet}
 version=0.33
 revision=4
 short_desc="Cross toolchain for x86_64 with musl"
@@ -39,7 +39,9 @@ nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a libgmem.a"
 depends="${pkgname}-libc-${version}_${revision}"
 
-if [ "$XBPS_TARGET_WORDSIZE" != "64" ]; then
+if [ "${XBPS_TARGET_MACHINE%-musl}" = i686 ]; then
+	:
+elif [ "$XBPS_TARGET_WORDSIZE" != "64" ]; then
 	broken="64-bit crosstoolchain only available on 64-bit host"
 fi
 
@@ -321,5 +323,7 @@ cross-x86_64-linux-musl-libc_package() {
 	noshlibprovides=yes
 	pkg_install() {
 		vmove ${_sysroot}
+		vlicense ${wrksrc}/musl-${_musl_version}/COPYRIGHT
+		vlicense ${wrksrc}/libucontext-${_libucontext_version}/LICENSE
 	}
 }

From 7067f898b8b4c9395e550fc528f15a3596fad54b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 2 Dec 2020 19:47:39 +0700
Subject: [PATCH 2/2] grub: build grub-x86_64-efi for i686, build manpages

Close #25267
---
 srcpkgs/grub/template | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/srcpkgs/grub/template b/srcpkgs/grub/template
index 77c6cfbff2f..0b7f2edc412 100644
--- a/srcpkgs/grub/template
+++ b/srcpkgs/grub/template
@@ -1,8 +1,8 @@
 # Template file for 'grub'
 pkgname=grub
 version=2.04
-revision=3
-hostmakedepends="python3 pkg-config flex freetype-devel font-unifont-bdf"
+revision=4
+hostmakedepends="python3 pkg-config flex freetype-devel font-unifont-bdf help2man"
 makedepends="libusb-compat-devel ncurses-devel freetype-devel
  liblzma-devel device-mapper-devel fuse-devel"
 depends="os-prober"
@@ -27,10 +27,11 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 	i686*)
 		CFLAGS="-D_FILE_OFFSET_BITS=64"
+		hostmakedepends+=" cross-x86_64-linux-musl"
 		configure_args+=" ac_cv_sizeof_off_t=8"
 		_NATIVE_PLATFORM=pc
-		_SUPPLEMENTARY_BUILDS="i386-efi i386-coreboot i386-xen"
-		subpackages+=" grub-i386-efi grub-i386-coreboot grub-xen"
+		_SUPPLEMENTARY_BUILDS="i386-efi x86_64-efi i386-coreboot i386-xen"
+		subpackages+=" grub-i386-efi grub-x86_64-efi grub-i386-coreboot grub-xen"
 		;;
 	aarch64*)
 		_NATIVE_PLATFORM=efi
@@ -48,7 +49,7 @@ post_extract() {
 
 do_configure() {
 	unset CC AS LD RANLIB CPP
-	CFLAGS="$CFLAGS -fno-stack-protector"
+	BASE_CFLAGS="$CFLAGS -fno-stack-protector"
 
 	# building with altivec generates broken grub core
 	case "$XBPS_TARGET_MACHINE" in
@@ -63,14 +64,11 @@ do_configure() {
 	sed -i 's|/usr/share/fonts/unifont|/usr/share/fonts/misc|' configure
 
 	# build tools
-	_configure_args=${configure_args}
-	if [ -n "${_NATIVE_PLATFORM}" ]; then
-		_configure_args="--with-platform=${_NATIVE_PLATFORM} ${_configure_args}"
-	fi
 	msg_normal "Configuring grub tools...\n"
 	mkdir $wrksrc/build
 	cd $wrksrc/build
-	../configure --host=${XBPS_TARGET_MACHINE} ${_configure_args}
+	../configure --host=${XBPS_TARGET_MACHINE} ${configure_args} \
+		${_NATIVE_PLATFORM:+--with-platform=${_NATIVE_PLATFORM}}
 
 	for _SUPP_BUILD in ${_SUPPLEMENTARY_BUILDS}; do
 		_TARGET=${_SUPP_BUILD%%-*}
@@ -78,7 +76,15 @@ do_configure() {
 		msg_normal "Configuring ${_TARGET} ${_PLATFORM} grub...\n"
 		mkdir $wrksrc/${_PLATFORM}_${_TARGET}_build
 		cd $wrksrc/${_PLATFORM}_${_TARGET}_build
-		../configure --host=${XBPS_TARGET_MACHINE} --target=${_TARGET} --with-platform=${_PLATFORM} ${configure_args} \
+		if [ "$_TARGET" = x86_64 ] &&
+		   [ "${XBPS_TARGET_MACHINE%-musl}" = i686 ]; then
+			_TARGET=x86_64-linux-musl
+			CFLAGS="${BASE_CFLAGS/-mtune=i686/-mtune=generic}"
+		else
+			CFLAGS="$BASE_CFLAGS"
+		fi
+		../configure --host=${XBPS_TARGET_MACHINE} --target=${_TARGET} \
+			--with-platform=${_PLATFORM} ${configure_args} \
 			--disable-efiemu \
 			--libdir=/usr/lib
 	done
@@ -90,14 +96,14 @@ do_build() {
 
 	msg_normal "Building grub tools...\n"
 	cd $wrksrc/build
-	make ${makejobs} &> make.log || tail -n100 make.log
+	make ${makejobs}
 
 	for _SUPP_BUILD in ${_SUPPLEMENTARY_BUILDS}; do
 		_TARGET=${_SUPP_BUILD%%-*}
 		_PLATFORM=${_SUPP_BUILD##*-}
 		msg_normal "Building ${_TARGET} ${_PLATFORM} grub...\n"
 		cd $wrksrc/${_PLATFORM}_${_TARGET}_build
-		make ${makejobs} &> make.log || tail -n100 make.log
+		make ${makejobs}
 	done
 }
 
@@ -162,7 +168,6 @@ grub-utils_package() {
 	}
 }
 grub-x86_64-efi_package() {
-	archs=noarch
 	depends="grub>=$version dosfstools efibootmgr"
 	short_desc+=" - x86_64 EFI support"
 	pkg_install() {
@@ -170,7 +175,6 @@ grub-x86_64-efi_package() {
 	}
 }
 grub-i386-efi_package() {
-	archs=noarch
 	depends="grub>=$version dosfstools efibootmgr"
 	short_desc+=" - i386 EFI support"
 	pkg_install() {
@@ -178,7 +182,6 @@ grub-i386-efi_package() {
 	}
 }
 grub-i386-coreboot_package() {
-	archs=noarch
 	depends="grub>=$version"
 	short_desc+=" - i386 coreboot support"
 	pkg_install() {
@@ -200,7 +203,6 @@ grub-xen_package() {
 	}
 }
 grub-arm64-efi_package() {
-	archs=noarch
 	depends="grub>=$version dosfstools efibootmgr"
 	short_desc+=" - arm64 EFI support"
 	pkg_install() {
@@ -208,7 +210,6 @@ grub-arm64-efi_package() {
 	}
 }
 grub-powerpc-ieee1275_package() {
-	archs=noarch
 	depends="grub>=$version powerpc-utils"
 	short_desc+=" - powerpc Open Firmware support"
 	pkg_install() {

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: build grub-x86_64-efi for i686
  2020-12-03  0:37 [PR PATCH] build grub-x86_64-efi for i686 sgn
                   ` (5 preceding siblings ...)
  2020-12-05  3:48 ` [PR PATCH] [Updated] " sgn
@ 2020-12-05 11:30 ` sgn
  2020-12-05 11:30 ` sgn
                   ` (18 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: sgn @ 2020-12-05 11:30 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 228 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/26895#issuecomment-739238713

Comment:
I couldn't boot with live usb made from this template, yet. I'll look into this a bit more.

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: build grub-x86_64-efi for i686
  2020-12-03  0:37 [PR PATCH] build grub-x86_64-efi for i686 sgn
                   ` (6 preceding siblings ...)
  2020-12-05 11:30 ` sgn
@ 2020-12-05 11:30 ` sgn
  2020-12-06  4:31 ` sgn
                   ` (17 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: sgn @ 2020-12-05 11:30 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 228 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/26895#issuecomment-739238713

Comment:
I couldn't boot with live usb made from this template, yet. I'll look into this a bit more.

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: build grub-x86_64-efi for i686
  2020-12-03  0:37 [PR PATCH] build grub-x86_64-efi for i686 sgn
                   ` (7 preceding siblings ...)
  2020-12-05 11:30 ` sgn
@ 2020-12-06  4:31 ` sgn
  2020-12-07  0:03 ` [PR PATCH] [Closed]: " sgn
                   ` (16 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: sgn @ 2020-12-06  4:31 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 194 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/26895#issuecomment-739453234

Comment:
My desktop works with i686 Live CD made from this change.

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Closed]: build grub-x86_64-efi for i686
  2020-12-03  0:37 [PR PATCH] build grub-x86_64-efi for i686 sgn
                   ` (8 preceding siblings ...)
  2020-12-06  4:31 ` sgn
@ 2020-12-07  0:03 ` sgn
  2020-12-26  7:26 ` fosslinux
                   ` (15 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: sgn @ 2020-12-07  0:03 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 164 bytes --]

There's a closed pull request on the void-packages repository

build grub-x86_64-efi for i686
https://github.com/void-linux/void-packages/pull/26895

Description:


^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: build grub-x86_64-efi for i686
  2020-12-03  0:37 [PR PATCH] build grub-x86_64-efi for i686 sgn
                   ` (9 preceding siblings ...)
  2020-12-07  0:03 ` [PR PATCH] [Closed]: " sgn
@ 2020-12-26  7:26 ` fosslinux
  2021-01-04  2:09 ` ericonr
                   ` (14 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: fosslinux @ 2020-12-26  7:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 196 bytes --]

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/26895#issuecomment-751329947

Comment:
wait on @q66 's toolchain changes before merging this

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: build grub-x86_64-efi for i686
  2020-12-03  0:37 [PR PATCH] build grub-x86_64-efi for i686 sgn
                   ` (10 preceding siblings ...)
  2020-12-26  7:26 ` fosslinux
@ 2021-01-04  2:09 ` ericonr
  2021-01-04  9:33 ` fosslinux
                   ` (13 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: ericonr @ 2021-01-04  2:09 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 145 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26895#issuecomment-753721117

Comment:
Ping

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: build grub-x86_64-efi for i686
  2020-12-03  0:37 [PR PATCH] build grub-x86_64-efi for i686 sgn
                   ` (11 preceding siblings ...)
  2021-01-04  2:09 ` ericonr
@ 2021-01-04  9:33 ` fosslinux
  2021-01-09  3:19 ` [PR PATCH] [Updated] " sgn
                   ` (12 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: fosslinux @ 2021-01-04  9:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 238 bytes --]

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/26895#issuecomment-753866545

Comment:
Are any of the cross changes even needed anymore now that void-cross build-style is being used?

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] build grub-x86_64-efi for i686
  2020-12-03  0:37 [PR PATCH] build grub-x86_64-efi for i686 sgn
                   ` (12 preceding siblings ...)
  2021-01-04  9:33 ` fosslinux
@ 2021-01-09  3:19 ` sgn
  2021-01-09  3:47 ` [PR REVIEW] " q66
                   ` (11 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: sgn @ 2021-01-09  3:19 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 325 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages i686-grub-x86_64-efi
https://github.com/void-linux/void-packages/pull/26895

build grub-x86_64-efi for i686


A patch file from https://github.com/void-linux/void-packages/pull/26895.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-i686-grub-x86_64-efi-26895.patch --]
[-- Type: text/x-diff, Size: 4383 bytes --]

From f4c0a17de6e3a0ef40c01ba226266999b501485d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 2 Dec 2020 19:47:39 +0700
Subject: [PATCH] grub: build grub-x86_64-efi for i686, build manpages

Close #25267
---
 srcpkgs/grub/template | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/grub/template b/srcpkgs/grub/template
index 76f9ce3f368..3a274eefc34 100644
--- a/srcpkgs/grub/template
+++ b/srcpkgs/grub/template
@@ -1,8 +1,8 @@
 # Template file for 'grub'
 pkgname=grub
 version=2.04
-revision=3
-hostmakedepends="python3 pkg-config flex freetype-devel font-unifont-bdf"
+revision=4
+hostmakedepends="python3 pkg-config flex freetype-devel font-unifont-bdf help2man"
 makedepends="libusb-compat-devel ncurses-devel freetype-devel
  liblzma-devel device-mapper-devel fuse-devel"
 depends="os-prober"
@@ -27,10 +27,11 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 	i686*)
 		CFLAGS="-D_FILE_OFFSET_BITS=64"
+		hostmakedepends+=" cross-x86_64-linux-musl"
 		configure_args+=" ac_cv_sizeof_off_t=8"
 		_NATIVE_PLATFORM=pc
-		_SUPPLEMENTARY_BUILDS="i386-efi i386-coreboot i386-xen"
-		subpackages+=" grub-i386-efi grub-i386-coreboot grub-xen"
+		_SUPPLEMENTARY_BUILDS="i386-efi x86_64-efi i386-coreboot i386-xen"
+		subpackages+=" grub-i386-efi grub-x86_64-efi grub-i386-coreboot grub-xen"
 		;;
 	aarch64*)
 		_NATIVE_PLATFORM=efi
@@ -48,7 +49,7 @@ post_extract() {
 
 do_configure() {
 	unset CC AS LD RANLIB CPP
-	CFLAGS="$CFLAGS -fno-stack-protector"
+	BASE_CFLAGS="$CFLAGS -fno-stack-protector"
 
 	# building with altivec generates broken grub core
 	case "$XBPS_TARGET_MACHINE" in
@@ -63,14 +64,11 @@ do_configure() {
 	sed -i 's|/usr/share/fonts/unifont|/usr/share/fonts/misc|' configure
 
 	# build tools
-	_configure_args=${configure_args}
-	if [ -n "${_NATIVE_PLATFORM}" ]; then
-		_configure_args="--with-platform=${_NATIVE_PLATFORM} ${_configure_args}"
-	fi
 	msg_normal "Configuring grub tools...\n"
 	mkdir $wrksrc/build
 	cd $wrksrc/build
-	../configure --host=${XBPS_TARGET_MACHINE} ${_configure_args}
+	../configure --host=${XBPS_TARGET_MACHINE} ${configure_args} \
+		${_NATIVE_PLATFORM:+--with-platform=${_NATIVE_PLATFORM}}
 
 	for _SUPP_BUILD in ${_SUPPLEMENTARY_BUILDS}; do
 		_TARGET=${_SUPP_BUILD%%-*}
@@ -78,6 +76,13 @@ do_configure() {
 		msg_normal "Configuring ${_TARGET} ${_PLATFORM} grub...\n"
 		mkdir $wrksrc/${_PLATFORM}_${_TARGET}_build
 		cd $wrksrc/${_PLATFORM}_${_TARGET}_build
+		if [ "$_TARGET" = x86_64 ] &&
+		   [ "${XBPS_TARGET_MACHINE%-musl}" = i686 ]; then
+			_TARGET=x86_64-linux-musl
+			CFLAGS="${BASE_CFLAGS/-mtune=i686/-mtune=generic}"
+		else
+			CFLAGS="$BASE_CFLAGS"
+		fi
 		../configure --host=${XBPS_TARGET_MACHINE} --target=${_TARGET} --with-platform=${_PLATFORM} ${configure_args} \
 			--disable-efiemu \
 			--libdir=/usr/lib
@@ -90,14 +95,14 @@ do_build() {
 
 	msg_normal "Building grub tools...\n"
 	cd $wrksrc/build
-	make ${makejobs} &> make.log || tail -n100 make.log
+	make ${makejobs}
 
 	for _SUPP_BUILD in ${_SUPPLEMENTARY_BUILDS}; do
 		_TARGET=${_SUPP_BUILD%%-*}
 		_PLATFORM=${_SUPP_BUILD##*-}
 		msg_normal "Building ${_TARGET} ${_PLATFORM} grub...\n"
 		cd $wrksrc/${_PLATFORM}_${_TARGET}_build
-		make ${makejobs} &> make.log || tail -n100 make.log
+		make ${makejobs}
 	done
 }
 
@@ -162,7 +167,6 @@ grub-utils_package() {
 	}
 }
 grub-x86_64-efi_package() {
-	archs=noarch
 	depends="grub>=$version dosfstools efibootmgr"
 	short_desc+=" - x86_64 EFI support"
 	pkg_install() {
@@ -170,7 +174,6 @@ grub-x86_64-efi_package() {
 	}
 }
 grub-i386-efi_package() {
-	archs=noarch
 	depends="grub>=$version dosfstools efibootmgr"
 	short_desc+=" - i386 EFI support"
 	pkg_install() {
@@ -178,7 +181,6 @@ grub-i386-efi_package() {
 	}
 }
 grub-i386-coreboot_package() {
-	archs=noarch
 	depends="grub>=$version"
 	short_desc+=" - i386 coreboot support"
 	pkg_install() {
@@ -200,7 +202,6 @@ grub-xen_package() {
 	}
 }
 grub-arm64-efi_package() {
-	archs=noarch
 	depends="grub>=$version dosfstools efibootmgr"
 	short_desc+=" - arm64 EFI support"
 	pkg_install() {
@@ -208,7 +209,6 @@ grub-arm64-efi_package() {
 	}
 }
 grub-powerpc-ieee1275_package() {
-	archs=noarch
 	depends="grub>=$version powerpc-utils"
 	short_desc+=" - powerpc Open Firmware support"
 	pkg_install() {

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR REVIEW] build grub-x86_64-efi for i686
  2020-12-03  0:37 [PR PATCH] build grub-x86_64-efi for i686 sgn
                   ` (13 preceding siblings ...)
  2021-01-09  3:19 ` [PR PATCH] [Updated] " sgn
@ 2021-01-09  3:47 ` q66
  2021-01-09  3:50 ` q66
                   ` (10 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: q66 @ 2021-01-09  3:47 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 330 bytes --]

New review comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/26895#discussion_r554285633

Comment:
i don't like this weird block/substitution, considering the extra platform files are basically arch-independent, there should be no harm in simply configuring them all with empty `CFLAGS`

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR REVIEW] build grub-x86_64-efi for i686
  2020-12-03  0:37 [PR PATCH] build grub-x86_64-efi for i686 sgn
                   ` (14 preceding siblings ...)
  2021-01-09  3:47 ` [PR REVIEW] " q66
@ 2021-01-09  3:50 ` q66
  2021-01-09  3:51 ` q66
                   ` (9 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: q66 @ 2021-01-09  3:50 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 482 bytes --]

New review comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/26895#discussion_r554285633

Comment:
i don't like this weird block/substitution, considering the extra platform files are basically arch-independent, there should be no harm in simply configuring them all with empty `CFLAGS`

remove all your changes regarding switch to `BASE_CFLAGS`, and then simply pass `CFLAGS=""` as an argument to configure for each supplementary build

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR REVIEW] build grub-x86_64-efi for i686
  2020-12-03  0:37 [PR PATCH] build grub-x86_64-efi for i686 sgn
                   ` (15 preceding siblings ...)
  2021-01-09  3:50 ` q66
@ 2021-01-09  3:51 ` q66
  2021-01-09  6:02 ` [PR PATCH] [Updated] " sgn
                   ` (8 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: q66 @ 2021-01-09  3:51 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 485 bytes --]

New review comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/26895#discussion_r554285633

Comment:
i don't like this weird block/substitution, considering the extra platform files are basically arch-independent, there should be no harm in simply configuring them all with empty `CFLAGS`

remove all your changes regarding switch to `BASE_CFLAGS`, and then simply run configure like `CFLAGS="" ../configure ...` for each supplementary build

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] build grub-x86_64-efi for i686
  2020-12-03  0:37 [PR PATCH] build grub-x86_64-efi for i686 sgn
                   ` (16 preceding siblings ...)
  2021-01-09  3:51 ` q66
@ 2021-01-09  6:02 ` sgn
  2021-01-09  6:21 ` sgn
                   ` (7 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: sgn @ 2021-01-09  6:02 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 325 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages i686-grub-x86_64-efi
https://github.com/void-linux/void-packages/pull/26895

build grub-x86_64-efi for i686


A patch file from https://github.com/void-linux/void-packages/pull/26895.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-i686-grub-x86_64-efi-26895.patch --]
[-- Type: text/x-diff, Size: 4543 bytes --]

From 23fc929b9f67fdc2ee13a236455562f63fd4ac29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 2 Dec 2020 19:47:39 +0700
Subject: [PATCH] grub: build grub-x86_64-efi for i686, build manpages

Close #25267
---
 srcpkgs/grub/template | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/srcpkgs/grub/template b/srcpkgs/grub/template
index 76f9ce3f368..4128765ba43 100644
--- a/srcpkgs/grub/template
+++ b/srcpkgs/grub/template
@@ -1,8 +1,8 @@
 # Template file for 'grub'
 pkgname=grub
 version=2.04
-revision=3
-hostmakedepends="python3 pkg-config flex freetype-devel font-unifont-bdf"
+revision=4
+hostmakedepends="python3 pkg-config flex freetype-devel font-unifont-bdf help2man"
 makedepends="libusb-compat-devel ncurses-devel freetype-devel
  liblzma-devel device-mapper-devel fuse-devel"
 depends="os-prober"
@@ -27,10 +27,11 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 	i686*)
 		CFLAGS="-D_FILE_OFFSET_BITS=64"
+		hostmakedepends+=" cross-x86_64-linux-musl"
 		configure_args+=" ac_cv_sizeof_off_t=8"
 		_NATIVE_PLATFORM=pc
-		_SUPPLEMENTARY_BUILDS="i386-efi i386-coreboot i386-xen"
-		subpackages+=" grub-i386-efi grub-i386-coreboot grub-xen"
+		_SUPPLEMENTARY_BUILDS="i386-efi x86_64-efi i386-coreboot i386-xen"
+		subpackages+=" grub-i386-efi grub-x86_64-efi grub-i386-coreboot grub-xen"
 		;;
 	aarch64*)
 		_NATIVE_PLATFORM=efi
@@ -48,12 +49,13 @@ post_extract() {
 
 do_configure() {
 	unset CC AS LD RANLIB CPP
-	CFLAGS="$CFLAGS -fno-stack-protector"
+	local NO_ALTIVEC
 
 	# building with altivec generates broken grub core
 	case "$XBPS_TARGET_MACHINE" in
-		ppc*) CFLAGS="$CFLAGS -mno-altivec" ;;
+		ppc*) NO_ALTIVEC="-mno-altivec" ;;
 	esac
+	CFLAGS="$CFLAGS -fno-stack-protector $NO_ALTIVEC"
 
 	configure_args+=" --enable-device-mapper --enable-cache-stats --enable-nls
 		--enable-grub-mkfont --enable-grub-mount --disable-werror
@@ -63,19 +65,21 @@ do_configure() {
 	sed -i 's|/usr/share/fonts/unifont|/usr/share/fonts/misc|' configure
 
 	# build tools
-	_configure_args=${configure_args}
-	if [ -n "${_NATIVE_PLATFORM}" ]; then
-		_configure_args="--with-platform=${_NATIVE_PLATFORM} ${_configure_args}"
-	fi
 	msg_normal "Configuring grub tools...\n"
 	mkdir $wrksrc/build
 	cd $wrksrc/build
-	../configure --host=${XBPS_TARGET_MACHINE} ${_configure_args}
+	../configure --host=${XBPS_TARGET_MACHINE} ${configure_args} \
+		${_NATIVE_PLATFORM:+--with-platform=${_NATIVE_PLATFORM}}
 
+	CFLAGS="-fno-stack-protector $NO_ALTIVEC"
 	for _SUPP_BUILD in ${_SUPPLEMENTARY_BUILDS}; do
 		_TARGET=${_SUPP_BUILD%%-*}
 		_PLATFORM=${_SUPP_BUILD##*-}
 		msg_normal "Configuring ${_TARGET} ${_PLATFORM} grub...\n"
+		if [ "$_TARGET" = x86_64 ] &&
+			[ "${XBPS_TARGET_MACHINE%-musl}" = i686 ]; then
+			_TARGET=x86_64-linux-musl
+		fi
 		mkdir $wrksrc/${_PLATFORM}_${_TARGET}_build
 		cd $wrksrc/${_PLATFORM}_${_TARGET}_build
 		../configure --host=${XBPS_TARGET_MACHINE} --target=${_TARGET} --with-platform=${_PLATFORM} ${configure_args} \
@@ -90,14 +94,14 @@ do_build() {
 
 	msg_normal "Building grub tools...\n"
 	cd $wrksrc/build
-	make ${makejobs} &> make.log || tail -n100 make.log
+	make ${makejobs}
 
 	for _SUPP_BUILD in ${_SUPPLEMENTARY_BUILDS}; do
 		_TARGET=${_SUPP_BUILD%%-*}
 		_PLATFORM=${_SUPP_BUILD##*-}
 		msg_normal "Building ${_TARGET} ${_PLATFORM} grub...\n"
 		cd $wrksrc/${_PLATFORM}_${_TARGET}_build
-		make ${makejobs} &> make.log || tail -n100 make.log
+		make ${makejobs}
 	done
 }
 
@@ -162,7 +166,6 @@ grub-utils_package() {
 	}
 }
 grub-x86_64-efi_package() {
-	archs=noarch
 	depends="grub>=$version dosfstools efibootmgr"
 	short_desc+=" - x86_64 EFI support"
 	pkg_install() {
@@ -170,7 +173,6 @@ grub-x86_64-efi_package() {
 	}
 }
 grub-i386-efi_package() {
-	archs=noarch
 	depends="grub>=$version dosfstools efibootmgr"
 	short_desc+=" - i386 EFI support"
 	pkg_install() {
@@ -178,7 +180,6 @@ grub-i386-efi_package() {
 	}
 }
 grub-i386-coreboot_package() {
-	archs=noarch
 	depends="grub>=$version"
 	short_desc+=" - i386 coreboot support"
 	pkg_install() {
@@ -200,7 +201,6 @@ grub-xen_package() {
 	}
 }
 grub-arm64-efi_package() {
-	archs=noarch
 	depends="grub>=$version dosfstools efibootmgr"
 	short_desc+=" - arm64 EFI support"
 	pkg_install() {
@@ -208,7 +208,6 @@ grub-arm64-efi_package() {
 	}
 }
 grub-powerpc-ieee1275_package() {
-	archs=noarch
 	depends="grub>=$version powerpc-utils"
 	short_desc+=" - powerpc Open Firmware support"
 	pkg_install() {

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] build grub-x86_64-efi for i686
  2020-12-03  0:37 [PR PATCH] build grub-x86_64-efi for i686 sgn
                   ` (17 preceding siblings ...)
  2021-01-09  6:02 ` [PR PATCH] [Updated] " sgn
@ 2021-01-09  6:21 ` sgn
  2021-01-09 13:56 ` [PR REVIEW] " q66
                   ` (6 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: sgn @ 2021-01-09  6:21 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 325 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages i686-grub-x86_64-efi
https://github.com/void-linux/void-packages/pull/26895

build grub-x86_64-efi for i686


A patch file from https://github.com/void-linux/void-packages/pull/26895.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-i686-grub-x86_64-efi-26895.patch --]
[-- Type: text/x-diff, Size: 4588 bytes --]

From ad82ad6b068a1d84e945fa022ee97f8fda3e3712 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 2 Dec 2020 19:47:39 +0700
Subject: [PATCH] grub: build grub-x86_64-efi for i686, build manpages

Close #25267
---
 srcpkgs/grub/template | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/srcpkgs/grub/template b/srcpkgs/grub/template
index 76f9ce3f368..710ca53c37e 100644
--- a/srcpkgs/grub/template
+++ b/srcpkgs/grub/template
@@ -1,8 +1,8 @@
 # Template file for 'grub'
 pkgname=grub
 version=2.04
-revision=3
-hostmakedepends="python3 pkg-config flex freetype-devel font-unifont-bdf"
+revision=4
+hostmakedepends="python3 pkg-config flex freetype-devel font-unifont-bdf help2man"
 makedepends="libusb-compat-devel ncurses-devel freetype-devel
  liblzma-devel device-mapper-devel fuse-devel"
 depends="os-prober"
@@ -27,10 +27,11 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 	i686*)
 		CFLAGS="-D_FILE_OFFSET_BITS=64"
+		hostmakedepends+=" cross-x86_64-linux-musl"
 		configure_args+=" ac_cv_sizeof_off_t=8"
 		_NATIVE_PLATFORM=pc
-		_SUPPLEMENTARY_BUILDS="i386-efi i386-coreboot i386-xen"
-		subpackages+=" grub-i386-efi grub-i386-coreboot grub-xen"
+		_SUPPLEMENTARY_BUILDS="i386-efi x86_64-efi i386-coreboot i386-xen"
+		subpackages+=" grub-i386-efi grub-x86_64-efi grub-i386-coreboot grub-xen"
 		;;
 	aarch64*)
 		_NATIVE_PLATFORM=efi
@@ -48,12 +49,13 @@ post_extract() {
 
 do_configure() {
 	unset CC AS LD RANLIB CPP
-	CFLAGS="$CFLAGS -fno-stack-protector"
+	local NO_ALTIVEC
 
 	# building with altivec generates broken grub core
 	case "$XBPS_TARGET_MACHINE" in
-		ppc*) CFLAGS="$CFLAGS -mno-altivec" ;;
+		ppc*) NO_ALTIVEC="-mno-altivec" ;;
 	esac
+	CFLAGS="$CFLAGS -fno-stack-protector $NO_ALTIVEC"
 
 	configure_args+=" --enable-device-mapper --enable-cache-stats --enable-nls
 		--enable-grub-mkfont --enable-grub-mount --disable-werror
@@ -63,21 +65,23 @@ do_configure() {
 	sed -i 's|/usr/share/fonts/unifont|/usr/share/fonts/misc|' configure
 
 	# build tools
-	_configure_args=${configure_args}
-	if [ -n "${_NATIVE_PLATFORM}" ]; then
-		_configure_args="--with-platform=${_NATIVE_PLATFORM} ${_configure_args}"
-	fi
 	msg_normal "Configuring grub tools...\n"
 	mkdir $wrksrc/build
 	cd $wrksrc/build
-	../configure --host=${XBPS_TARGET_MACHINE} ${_configure_args}
+	../configure --host=${XBPS_TARGET_MACHINE} ${configure_args} \
+		${_NATIVE_PLATFORM:+--with-platform=${_NATIVE_PLATFORM}}
 
+	CFLAGS="-fno-stack-protector $NO_ALTIVEC"
 	for _SUPP_BUILD in ${_SUPPLEMENTARY_BUILDS}; do
 		_TARGET=${_SUPP_BUILD%%-*}
 		_PLATFORM=${_SUPP_BUILD##*-}
 		msg_normal "Configuring ${_TARGET} ${_PLATFORM} grub...\n"
 		mkdir $wrksrc/${_PLATFORM}_${_TARGET}_build
 		cd $wrksrc/${_PLATFORM}_${_TARGET}_build
+		if [ "$_TARGET" = x86_64 ] &&
+			[ "${XBPS_TARGET_MACHINE%-musl}" = i686 ]; then
+			_TARGET=x86_64-linux-musl
+		fi
 		../configure --host=${XBPS_TARGET_MACHINE} --target=${_TARGET} --with-platform=${_PLATFORM} ${configure_args} \
 			--disable-efiemu \
 			--libdir=/usr/lib
@@ -90,14 +94,14 @@ do_build() {
 
 	msg_normal "Building grub tools...\n"
 	cd $wrksrc/build
-	make ${makejobs} &> make.log || tail -n100 make.log
+	make ${makejobs}
 
 	for _SUPP_BUILD in ${_SUPPLEMENTARY_BUILDS}; do
 		_TARGET=${_SUPP_BUILD%%-*}
 		_PLATFORM=${_SUPP_BUILD##*-}
 		msg_normal "Building ${_TARGET} ${_PLATFORM} grub...\n"
 		cd $wrksrc/${_PLATFORM}_${_TARGET}_build
-		make ${makejobs} &> make.log || tail -n100 make.log
+		make ${makejobs}
 	done
 }
 
@@ -162,7 +166,6 @@ grub-utils_package() {
 	}
 }
 grub-x86_64-efi_package() {
-	archs=noarch
 	depends="grub>=$version dosfstools efibootmgr"
 	short_desc+=" - x86_64 EFI support"
 	pkg_install() {
@@ -170,7 +173,6 @@ grub-x86_64-efi_package() {
 	}
 }
 grub-i386-efi_package() {
-	archs=noarch
 	depends="grub>=$version dosfstools efibootmgr"
 	short_desc+=" - i386 EFI support"
 	pkg_install() {
@@ -178,7 +180,6 @@ grub-i386-efi_package() {
 	}
 }
 grub-i386-coreboot_package() {
-	archs=noarch
 	depends="grub>=$version"
 	short_desc+=" - i386 coreboot support"
 	pkg_install() {
@@ -200,7 +201,6 @@ grub-xen_package() {
 	}
 }
 grub-arm64-efi_package() {
-	archs=noarch
 	depends="grub>=$version dosfstools efibootmgr"
 	short_desc+=" - arm64 EFI support"
 	pkg_install() {
@@ -208,7 +208,6 @@ grub-arm64-efi_package() {
 	}
 }
 grub-powerpc-ieee1275_package() {
-	archs=noarch
 	depends="grub>=$version powerpc-utils"
 	short_desc+=" - powerpc Open Firmware support"
 	pkg_install() {

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR REVIEW] build grub-x86_64-efi for i686
  2020-12-03  0:37 [PR PATCH] build grub-x86_64-efi for i686 sgn
                   ` (18 preceding siblings ...)
  2021-01-09  6:21 ` sgn
@ 2021-01-09 13:56 ` q66
  2021-01-09 15:55 ` sgn
                   ` (5 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: q66 @ 2021-01-09 13:56 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 176 bytes --]

New review comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/26895#discussion_r554430119

Comment:
that is not what you did there...

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR REVIEW] build grub-x86_64-efi for i686
  2020-12-03  0:37 [PR PATCH] build grub-x86_64-efi for i686 sgn
                   ` (19 preceding siblings ...)
  2021-01-09 13:56 ` [PR REVIEW] " q66
@ 2021-01-09 15:55 ` sgn
  2021-01-18 11:33 ` [PR PATCH] [Updated] " sgn
                   ` (4 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: sgn @ 2021-01-09 15:55 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 181 bytes --]

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/26895#discussion_r554441554

Comment:
Sorry, but I can't get what you meant!

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] build grub-x86_64-efi for i686
  2020-12-03  0:37 [PR PATCH] build grub-x86_64-efi for i686 sgn
                   ` (20 preceding siblings ...)
  2021-01-09 15:55 ` sgn
@ 2021-01-18 11:33 ` sgn
  2021-01-18 12:36 ` [PR REVIEW] " q66
                   ` (3 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: sgn @ 2021-01-18 11:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 325 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages i686-grub-x86_64-efi
https://github.com/void-linux/void-packages/pull/26895

build grub-x86_64-efi for i686


A patch file from https://github.com/void-linux/void-packages/pull/26895.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-i686-grub-x86_64-efi-26895.patch --]
[-- Type: text/x-diff, Size: 4733 bytes --]

From d76974aad450b3d6ea6a3afd13ff2207e2ae46e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 2 Dec 2020 19:47:39 +0700
Subject: [PATCH] grub: build grub-x86_64-efi for i686, build manpages

Close #25267
---
 srcpkgs/grub/template | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/srcpkgs/grub/template b/srcpkgs/grub/template
index 76f9ce3f368..33c565bca50 100644
--- a/srcpkgs/grub/template
+++ b/srcpkgs/grub/template
@@ -1,8 +1,8 @@
 # Template file for 'grub'
 pkgname=grub
 version=2.04
-revision=3
-hostmakedepends="python3 pkg-config flex freetype-devel font-unifont-bdf"
+revision=4
+hostmakedepends="python3 pkg-config flex freetype-devel font-unifont-bdf help2man"
 makedepends="libusb-compat-devel ncurses-devel freetype-devel
  liblzma-devel device-mapper-devel fuse-devel"
 depends="os-prober"
@@ -27,10 +27,11 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 	i686*)
 		CFLAGS="-D_FILE_OFFSET_BITS=64"
+		hostmakedepends+=" cross-x86_64-linux-musl"
 		configure_args+=" ac_cv_sizeof_off_t=8"
 		_NATIVE_PLATFORM=pc
-		_SUPPLEMENTARY_BUILDS="i386-efi i386-coreboot i386-xen"
-		subpackages+=" grub-i386-efi grub-i386-coreboot grub-xen"
+		_SUPPLEMENTARY_BUILDS="i386-efi x86_64-efi i386-coreboot i386-xen"
+		subpackages+=" grub-i386-efi grub-x86_64-efi grub-i386-coreboot grub-xen"
 		;;
 	aarch64*)
 		_NATIVE_PLATFORM=efi
@@ -48,12 +49,13 @@ post_extract() {
 
 do_configure() {
 	unset CC AS LD RANLIB CPP
-	CFLAGS="$CFLAGS -fno-stack-protector"
+	local NO_ALTIVEC
 
 	# building with altivec generates broken grub core
 	case "$XBPS_TARGET_MACHINE" in
-		ppc*) CFLAGS="$CFLAGS -mno-altivec" ;;
+		ppc*) NO_ALTIVEC="-mno-altivec" ;;
 	esac
+	CFLAGS="$CFLAGS -fno-stack-protector $NO_ALTIVEC"
 
 	configure_args+=" --enable-device-mapper --enable-cache-stats --enable-nls
 		--enable-grub-mkfont --enable-grub-mount --disable-werror
@@ -63,14 +65,11 @@ do_configure() {
 	sed -i 's|/usr/share/fonts/unifont|/usr/share/fonts/misc|' configure
 
 	# build tools
-	_configure_args=${configure_args}
-	if [ -n "${_NATIVE_PLATFORM}" ]; then
-		_configure_args="--with-platform=${_NATIVE_PLATFORM} ${_configure_args}"
-	fi
 	msg_normal "Configuring grub tools...\n"
 	mkdir $wrksrc/build
 	cd $wrksrc/build
-	../configure --host=${XBPS_TARGET_MACHINE} ${_configure_args}
+	../configure --host=${XBPS_TARGET_MACHINE} ${configure_args} \
+		${_NATIVE_PLATFORM:+--with-platform=${_NATIVE_PLATFORM}}
 
 	for _SUPP_BUILD in ${_SUPPLEMENTARY_BUILDS}; do
 		_TARGET=${_SUPP_BUILD%%-*}
@@ -78,7 +77,14 @@ do_configure() {
 		msg_normal "Configuring ${_TARGET} ${_PLATFORM} grub...\n"
 		mkdir $wrksrc/${_PLATFORM}_${_TARGET}_build
 		cd $wrksrc/${_PLATFORM}_${_TARGET}_build
-		../configure --host=${XBPS_TARGET_MACHINE} --target=${_TARGET} --with-platform=${_PLATFORM} ${configure_args} \
+		if [ "$_TARGET" = x86_64 ] &&
+			[ "${XBPS_TARGET_MACHINE%-musl}" = i686 ]; then
+			_TARGET=x86_64-linux-musl
+		fi
+		CFLAGS="-fno-stack-protector $NO_ALTIVEC" \
+		../configure --host=${XBPS_TARGET_MACHINE} \
+			--target=${_TARGET} \
+			--with-platform=${_PLATFORM} ${configure_args} \
 			--disable-efiemu \
 			--libdir=/usr/lib
 	done
@@ -90,14 +96,14 @@ do_build() {
 
 	msg_normal "Building grub tools...\n"
 	cd $wrksrc/build
-	make ${makejobs} &> make.log || tail -n100 make.log
+	make ${makejobs}
 
 	for _SUPP_BUILD in ${_SUPPLEMENTARY_BUILDS}; do
 		_TARGET=${_SUPP_BUILD%%-*}
 		_PLATFORM=${_SUPP_BUILD##*-}
 		msg_normal "Building ${_TARGET} ${_PLATFORM} grub...\n"
 		cd $wrksrc/${_PLATFORM}_${_TARGET}_build
-		make ${makejobs} &> make.log || tail -n100 make.log
+		make ${makejobs}
 	done
 }
 
@@ -162,7 +168,6 @@ grub-utils_package() {
 	}
 }
 grub-x86_64-efi_package() {
-	archs=noarch
 	depends="grub>=$version dosfstools efibootmgr"
 	short_desc+=" - x86_64 EFI support"
 	pkg_install() {
@@ -170,7 +175,6 @@ grub-x86_64-efi_package() {
 	}
 }
 grub-i386-efi_package() {
-	archs=noarch
 	depends="grub>=$version dosfstools efibootmgr"
 	short_desc+=" - i386 EFI support"
 	pkg_install() {
@@ -178,7 +182,6 @@ grub-i386-efi_package() {
 	}
 }
 grub-i386-coreboot_package() {
-	archs=noarch
 	depends="grub>=$version"
 	short_desc+=" - i386 coreboot support"
 	pkg_install() {
@@ -200,7 +203,6 @@ grub-xen_package() {
 	}
 }
 grub-arm64-efi_package() {
-	archs=noarch
 	depends="grub>=$version dosfstools efibootmgr"
 	short_desc+=" - arm64 EFI support"
 	pkg_install() {
@@ -208,7 +210,6 @@ grub-arm64-efi_package() {
 	}
 }
 grub-powerpc-ieee1275_package() {
-	archs=noarch
 	depends="grub>=$version powerpc-utils"
 	short_desc+=" - powerpc Open Firmware support"
 	pkg_install() {

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR REVIEW] build grub-x86_64-efi for i686
  2020-12-03  0:37 [PR PATCH] build grub-x86_64-efi for i686 sgn
                   ` (21 preceding siblings ...)
  2021-01-18 11:33 ` [PR PATCH] [Updated] " sgn
@ 2021-01-18 12:36 ` q66
  2021-01-18 12:39 ` q66
                   ` (2 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: q66 @ 2021-01-18 12:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 160 bytes --]

New review comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/26895#discussion_r559536852

Comment:
now it looks fine

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: build grub-x86_64-efi for i686
  2020-12-03  0:37 [PR PATCH] build grub-x86_64-efi for i686 sgn
                   ` (22 preceding siblings ...)
  2021-01-18 12:36 ` [PR REVIEW] " q66
@ 2021-01-18 12:39 ` q66
  2021-01-18 13:25 ` [PR PATCH] [Updated] " sgn
  2021-01-20  0:41 ` [PR PATCH] [Merged]: " q66
  25 siblings, 0 replies; 27+ messages in thread
From: q66 @ 2021-01-18 12:39 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 581 bytes --]

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/26895#issuecomment-762225589

Comment:
hm, what i would do is instead of declaring like a variable `NO_ALTIVEC` or whatever, I would do like:

```
local extra_cflags="-fno-stack-protector"
case "$XBPS_TARGET_MACHINE" in
	ppc*) extra_cflags+=" -mno-altivec";;
esac
....
export CFLAGS+=" ${extra_cflags}"
... configure main platform here ....
...
for supplementary platforms:
    CFLAGS="${extra_cflags}" configure ...
```

which is the same logic as now but imo cleaner

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] build grub-x86_64-efi for i686
  2020-12-03  0:37 [PR PATCH] build grub-x86_64-efi for i686 sgn
                   ` (23 preceding siblings ...)
  2021-01-18 12:39 ` q66
@ 2021-01-18 13:25 ` sgn
  2021-01-20  0:41 ` [PR PATCH] [Merged]: " q66
  25 siblings, 0 replies; 27+ messages in thread
From: sgn @ 2021-01-18 13:25 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 325 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages i686-grub-x86_64-efi
https://github.com/void-linux/void-packages/pull/26895

build grub-x86_64-efi for i686


A patch file from https://github.com/void-linux/void-packages/pull/26895.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-i686-grub-x86_64-efi-26895.patch --]
[-- Type: text/x-diff, Size: 4746 bytes --]

From 334ea9e495e4742f775a41aa57afecc23c43c22a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 2 Dec 2020 19:47:39 +0700
Subject: [PATCH] grub: build grub-x86_64-efi for i686, build manpages

Close #25267
---
 srcpkgs/grub/template | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/srcpkgs/grub/template b/srcpkgs/grub/template
index 76f9ce3f368..21321d001c9 100644
--- a/srcpkgs/grub/template
+++ b/srcpkgs/grub/template
@@ -1,8 +1,8 @@
 # Template file for 'grub'
 pkgname=grub
 version=2.04
-revision=3
-hostmakedepends="python3 pkg-config flex freetype-devel font-unifont-bdf"
+revision=4
+hostmakedepends="python3 pkg-config flex freetype-devel font-unifont-bdf help2man"
 makedepends="libusb-compat-devel ncurses-devel freetype-devel
  liblzma-devel device-mapper-devel fuse-devel"
 depends="os-prober"
@@ -27,10 +27,11 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 	i686*)
 		CFLAGS="-D_FILE_OFFSET_BITS=64"
+		hostmakedepends+=" cross-x86_64-linux-musl"
 		configure_args+=" ac_cv_sizeof_off_t=8"
 		_NATIVE_PLATFORM=pc
-		_SUPPLEMENTARY_BUILDS="i386-efi i386-coreboot i386-xen"
-		subpackages+=" grub-i386-efi grub-i386-coreboot grub-xen"
+		_SUPPLEMENTARY_BUILDS="i386-efi x86_64-efi i386-coreboot i386-xen"
+		subpackages+=" grub-i386-efi grub-x86_64-efi grub-i386-coreboot grub-xen"
 		;;
 	aarch64*)
 		_NATIVE_PLATFORM=efi
@@ -48,12 +49,13 @@ post_extract() {
 
 do_configure() {
 	unset CC AS LD RANLIB CPP
-	CFLAGS="$CFLAGS -fno-stack-protector"
+	local freestanding_cflags="-fno-stack-protector"
 
 	# building with altivec generates broken grub core
 	case "$XBPS_TARGET_MACHINE" in
-		ppc*) CFLAGS="$CFLAGS -mno-altivec" ;;
+		ppc*) freestanding_cflags+=" -mno-altivec" ;;
 	esac
+	CFLAGS+=" $freestanding_cflags"
 
 	configure_args+=" --enable-device-mapper --enable-cache-stats --enable-nls
 		--enable-grub-mkfont --enable-grub-mount --disable-werror
@@ -63,14 +65,11 @@ do_configure() {
 	sed -i 's|/usr/share/fonts/unifont|/usr/share/fonts/misc|' configure
 
 	# build tools
-	_configure_args=${configure_args}
-	if [ -n "${_NATIVE_PLATFORM}" ]; then
-		_configure_args="--with-platform=${_NATIVE_PLATFORM} ${_configure_args}"
-	fi
 	msg_normal "Configuring grub tools...\n"
 	mkdir $wrksrc/build
 	cd $wrksrc/build
-	../configure --host=${XBPS_TARGET_MACHINE} ${_configure_args}
+	../configure --host=${XBPS_TARGET_MACHINE} ${configure_args} \
+		${_NATIVE_PLATFORM:+--with-platform=${_NATIVE_PLATFORM}}
 
 	for _SUPP_BUILD in ${_SUPPLEMENTARY_BUILDS}; do
 		_TARGET=${_SUPP_BUILD%%-*}
@@ -78,7 +77,14 @@ do_configure() {
 		msg_normal "Configuring ${_TARGET} ${_PLATFORM} grub...\n"
 		mkdir $wrksrc/${_PLATFORM}_${_TARGET}_build
 		cd $wrksrc/${_PLATFORM}_${_TARGET}_build
-		../configure --host=${XBPS_TARGET_MACHINE} --target=${_TARGET} --with-platform=${_PLATFORM} ${configure_args} \
+		if [ "$_TARGET" = x86_64 ] &&
+			[ "${XBPS_TARGET_MACHINE%-musl}" = i686 ]; then
+			_TARGET=x86_64-linux-musl
+		fi
+		CFLAGS="$freestanding_cflags" \
+		../configure --host=${XBPS_TARGET_MACHINE} \
+			--target=${_TARGET} \
+			--with-platform=${_PLATFORM} ${configure_args} \
 			--disable-efiemu \
 			--libdir=/usr/lib
 	done
@@ -90,14 +96,14 @@ do_build() {
 
 	msg_normal "Building grub tools...\n"
 	cd $wrksrc/build
-	make ${makejobs} &> make.log || tail -n100 make.log
+	make ${makejobs}
 
 	for _SUPP_BUILD in ${_SUPPLEMENTARY_BUILDS}; do
 		_TARGET=${_SUPP_BUILD%%-*}
 		_PLATFORM=${_SUPP_BUILD##*-}
 		msg_normal "Building ${_TARGET} ${_PLATFORM} grub...\n"
 		cd $wrksrc/${_PLATFORM}_${_TARGET}_build
-		make ${makejobs} &> make.log || tail -n100 make.log
+		make ${makejobs}
 	done
 }
 
@@ -162,7 +168,6 @@ grub-utils_package() {
 	}
 }
 grub-x86_64-efi_package() {
-	archs=noarch
 	depends="grub>=$version dosfstools efibootmgr"
 	short_desc+=" - x86_64 EFI support"
 	pkg_install() {
@@ -170,7 +175,6 @@ grub-x86_64-efi_package() {
 	}
 }
 grub-i386-efi_package() {
-	archs=noarch
 	depends="grub>=$version dosfstools efibootmgr"
 	short_desc+=" - i386 EFI support"
 	pkg_install() {
@@ -178,7 +182,6 @@ grub-i386-efi_package() {
 	}
 }
 grub-i386-coreboot_package() {
-	archs=noarch
 	depends="grub>=$version"
 	short_desc+=" - i386 coreboot support"
 	pkg_install() {
@@ -200,7 +203,6 @@ grub-xen_package() {
 	}
 }
 grub-arm64-efi_package() {
-	archs=noarch
 	depends="grub>=$version dosfstools efibootmgr"
 	short_desc+=" - arm64 EFI support"
 	pkg_install() {
@@ -208,7 +210,6 @@ grub-arm64-efi_package() {
 	}
 }
 grub-powerpc-ieee1275_package() {
-	archs=noarch
 	depends="grub>=$version powerpc-utils"
 	short_desc+=" - powerpc Open Firmware support"
 	pkg_install() {

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Merged]: build grub-x86_64-efi for i686
  2020-12-03  0:37 [PR PATCH] build grub-x86_64-efi for i686 sgn
                   ` (24 preceding siblings ...)
  2021-01-18 13:25 ` [PR PATCH] [Updated] " sgn
@ 2021-01-20  0:41 ` q66
  25 siblings, 0 replies; 27+ messages in thread
From: q66 @ 2021-01-20  0:41 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 164 bytes --]

There's a merged pull request on the void-packages repository

build grub-x86_64-efi for i686
https://github.com/void-linux/void-packages/pull/26895

Description:


^ permalink raw reply	[flat|nested] 27+ messages in thread

end of thread, other threads:[~2021-01-20  0:41 UTC | newest]

Thread overview: 27+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-03  0:37 [PR PATCH] build grub-x86_64-efi for i686 sgn
2020-12-03  0:48 ` ericonr
2020-12-03  0:48 ` [PR REVIEW] " ericonr
2020-12-03  0:55 ` [PR PATCH] [Updated] " sgn
2020-12-03 14:01 ` sgn
2020-12-03 15:00 ` [PR REVIEW] " sgn
2020-12-05  3:48 ` [PR PATCH] [Updated] " sgn
2020-12-05 11:30 ` sgn
2020-12-05 11:30 ` sgn
2020-12-06  4:31 ` sgn
2020-12-07  0:03 ` [PR PATCH] [Closed]: " sgn
2020-12-26  7:26 ` fosslinux
2021-01-04  2:09 ` ericonr
2021-01-04  9:33 ` fosslinux
2021-01-09  3:19 ` [PR PATCH] [Updated] " sgn
2021-01-09  3:47 ` [PR REVIEW] " q66
2021-01-09  3:50 ` q66
2021-01-09  3:51 ` q66
2021-01-09  6:02 ` [PR PATCH] [Updated] " sgn
2021-01-09  6:21 ` sgn
2021-01-09 13:56 ` [PR REVIEW] " q66
2021-01-09 15:55 ` sgn
2021-01-18 11:33 ` [PR PATCH] [Updated] " sgn
2021-01-18 12:36 ` [PR REVIEW] " q66
2021-01-18 12:39 ` q66
2021-01-18 13:25 ` [PR PATCH] [Updated] " sgn
2021-01-20  0:41 ` [PR PATCH] [Merged]: " q66

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).