From 67441aad683823edf98bbd0a60432af831c51d3a Mon Sep 17 00:00:00 2001 From: fosslinux Date: Fri, 5 Mar 2021 17:44:23 +1100 Subject: [PATCH 1/2] Revert "common/gnu-configure-args: set exec_prefix to ${prefix}" This reverts commit c96738a6e92d4916a0c513a15202315699fb2a12. This breaks grub-install currently; a temporary rollback until it is properly fixed. --- common/environment/configure/gnu-configure-args.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/common/environment/configure/gnu-configure-args.sh b/common/environment/configure/gnu-configure-args.sh index c3ab67a7855..dafbf5dc110 100644 --- a/common/environment/configure/gnu-configure-args.sh +++ b/common/environment/configure/gnu-configure-args.sh @@ -18,7 +18,6 @@ export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET" # This is to make sure 32-bit and 64-bit libs can coexist when looking # up things (the opposite-libdir is always symlinked as libNN) export configure_args+=" --libdir=\${exec_prefix}/lib${XBPS_TARGET_WORDSIZE}" -export configure_args+=" --exec-prefix=\${prefix}" _AUTOCONFCACHEDIR=${XBPS_COMMONDIR}/environment/configure/autoconf_cache From f2466446d77d538d28ecdd4c01354e33cd51a9af Mon Sep 17 00:00:00 2001 From: fosslinux Date: Fri, 5 Mar 2021 17:46:53 +1100 Subject: [PATCH 2/2] grub: rebuild without problematic exec_prefix to ${prefix} commit. --- srcpkgs/grub/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/grub/template b/srcpkgs/grub/template index 009b1e48822..69cea9ae19a 100644 --- a/srcpkgs/grub/template +++ b/srcpkgs/grub/template @@ -1,7 +1,7 @@ # Template file for 'grub' pkgname=grub version=2.04 -revision=5 +revision=6 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"