github/AROS-v0
1
0
Fork 0
mirror of https://github.com/deadw00d/AROS.git synced 2026-03-16 22:08:37 +00:00
Code Issues Releases Wiki Activity

update grub2 to 2.12. work around issues -: # grubs configure doesn't detect our inline ctype macros, and tries to build its own which conflict with the inline versions, # pthreads is used but not explicitly linked to the binaries. # $(top_srcdir)/grub-core/extra_deps.lst doesnt exist in the project - remove erroneous dependency that breaks the build.

Browse Source
This commit is contained in:
Kalamatee
2025-06-18 21:16:50 +01:00
committed by deadwood
parent d8c7fae96e
commit f39004c9e2
5 changed files with 335 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
arch/all-pc/boot/grub2-aros/grub-2.04-aros.diff
View File

@ -1,111 +0,0 @@
diff -ruN grub-2.04/grub-core/fs/affs.c grub-2.04.aros/grub-core/fs/affs.c
--- grub-2.04/grub-core/fs/affs.c 2019-04-23 09:54:47.000000000 +0100
+++ grub-2.04.aros/grub-core/fs/affs.c 2020-01-16 19:13:41.085635000 +0000
@@ -202,7 +202,9 @@
goto fail;
/* Make sure this is an affs filesystem. */
- if (grub_strncmp ((char *) (data->bblock.type), "DOS", 3) != 0
+ if (((grub_strncmp ((char *) (data->bblock.type), "DOS", 3) != 0)
+ /* Test if the filesystem is a muFS filesystem. */
+ && (grub_strncmp ((char *) (data->bblock.type), "muF", 3) != 0))
/* Test if the filesystem is a OFS filesystem. */
|| !(data->bblock.flags & GRUB_AFFS_FLAG_FFS))
continue;
diff -ruN grub-2.04/grub-core/lib/gnulib/getprogname.c grub-2.04.aros/grub-core/lib/gnulib/getprogname.c
--- grub-2.04/grub-core/lib/gnulib/getprogname.c 2019-07-04 15:06:07.000000000 +0100
+++ grub-2.04.aros/grub-core/lib/gnulib/getprogname.c 2020-01-16 19:13:41.085635000 +0000
@@ -28,6 +28,10 @@
# include <string.h>
#endif
+#ifdef _AMIGA
+# include <proto/exec.h>
+#endif
+
#ifdef __MVS__
# ifndef _OPEN_SYS
# define _OPEN_SYS
@@ -240,6 +244,10 @@
}
}
return NULL;
+
+# elif defined _AMIGA /* AmigaOS-like */
+ struct Task *thisTask = FindTask(NULL);
+ return (thisTask->tc_Node.ln_Name);
# else
# error "getprogname module not ported to this OS"
# endif
diff -ruN grub-2.04/grub-core/osdep/aros/getroot.c grub-2.04.aros/grub-core/osdep/aros/getroot.c
--- grub-2.04/grub-core/osdep/aros/getroot.c 2018-11-24 17:13:02.000000000 +0000
+++ grub-2.04.aros/grub-core/osdep/aros/getroot.c 2020-01-16 19:13:41.085635000 +0000
@@ -29,7 +29,6 @@
#include <string.h>
#include <dos/dos.h>
-#include <dos/filesystem.h>
#include <dos/exall.h>
#include <proto/dos.h>
#include <proto/exec.h>
diff -ruN grub-2.04/grub-core/osdep/aros/hostdisk.c grub-2.04.aros/grub-core/osdep/aros/hostdisk.c
--- grub-2.04/grub-core/osdep/aros/hostdisk.c 2019-04-23 09:54:47.000000000 +0100
+++ grub-2.04.aros/grub-core/osdep/aros/hostdisk.c 2020-01-16 19:13:41.085635000 +0000
@@ -45,7 +45,6 @@
#include <string.h>
#include <dos/dos.h>
-#include <dos/filesystem.h>
#include <dos/exall.h>
#include <proto/dos.h>
#include <devices/hardblocks.h>
diff -ruN grub-2.04/grub-core/osdep/aros/relpath.c grub-2.04.aros/grub-core/osdep/aros/relpath.c
--- grub-2.04/grub-core/osdep/aros/relpath.c 2018-11-24 17:13:02.000000000 +0000
+++ grub-2.04.aros/grub-core/osdep/aros/relpath.c 2020-01-16 19:13:41.085635000 +0000
@@ -29,7 +29,6 @@
#include <string.h>
#include <dos/dos.h>
-#include <dos/filesystem.h>
#include <dos/exall.h>
#include <proto/dos.h>
#include <proto/exec.h>
diff -ruN grub-2.04/grub-core/osdep/basic/no_platform.c grub-2.04.aros/grub-core/osdep/basic/no_platform.c
--- grub-2.04/grub-core/osdep/basic/no_platform.c 2018-11-24 17:13:02.000000000 +0000
+++ grub-2.04.aros/grub-core/osdep/basic/no_platform.c 2020-01-16 19:13:41.085635000 +0000
@@ -30,12 +30,13 @@
grub_util_error ("%s", _("no IEEE1275 routines are available for your platform"));
}
-void
+int
grub_install_register_efi (grub_device_t efidir_grub_dev,
const char *efifile_path,
const char *efi_distributor)
{
grub_util_error ("%s", _("no EFI routines are available for your platform"));
+ return 0;
}
void
diff -ruN grub-2.04/grub-core/osdep/generic/blocklist.c grub-2.04.aros/grub-core/osdep/generic/blocklist.c
--- grub-2.04/grub-core/osdep/generic/blocklist.c 2018-11-24 17:13:02.000000000 +0000
+++ grub-2.04.aros/grub-core/osdep/generic/blocklist.c 2020-01-16 19:22:42.985635000 +0000
@@ -59,7 +59,7 @@
grub_disk_cache_invalidate_all ();
- file = grub_file_open (core_path_dev, GRUB_FILE_TYPE_NONE | FILE_TYPE_NO_DECOMPRESS);
+ file = grub_file_open (core_path_dev, GRUB_FILE_TYPE_NONE | GRUB_FILE_TYPE_NO_DECOMPRESS);
if (file)
{
if (grub_file_size (file) != core_size)
@@ -116,7 +116,7 @@
grub_file_t file;
/* Now read the core image to determine where the sectors are. */
- file = grub_file_open (core_path_dev, GRUB_FILE_TYPE_NONE | FILE_TYPE_NO_DECOMPRESS);
+ file = grub_file_open (core_path_dev, GRUB_FILE_TYPE_NONE | GRUB_FILE_TYPE_NO_DECOMPRESS);
if (! file)
grub_util_error ("%s", grub_errmsg);

90
arch/all-pc/boot/grub2-aros/grub-2.06-aros.diff
View File

@ -1,90 +0,0 @@
diff -ruN grub-2.06/grub-core/fs/affs.c grub-2.06.aros/grub-core/fs/affs.c
--- grub-2.06/grub-core/fs/affs.c 2021-06-01 15:16:48.000000000 +0000
+++ grub-2.06.aros/grub-core/fs/affs.c 2020-01-16 19:13:41.085635000 +0000
@@ -202,7 +202,9 @@
goto fail;
/* Make sure this is an affs filesystem. */
- if (grub_strncmp ((char *) (data->bblock.type), "DOS", 3) != 0
+ if (((grub_strncmp ((char *) (data->bblock.type), "DOS", 3) != 0)
+ /* Test if the filesystem is a muFS filesystem. */
+ && (grub_strncmp ((char *) (data->bblock.type), "muF", 3) != 0))
/* Test if the filesystem is a OFS filesystem. */
|| !(data->bblock.flags & GRUB_AFFS_FLAG_FFS))
continue;
diff -ruN grub-2.06/grub-core/lib/gnulib/getprogname.c grub-2.06.aros/grub-core/lib/gnulib/getprogname.c
--- grub-2.06/grub-core/lib/gnulib/getprogname.c 2021-06-08 14:41:00.000000000 +0000
+++ grub-2.06.aros/grub-core/lib/gnulib/getprogname.c 2020-01-16 19:13:41.085635000 +0000
@@ -28,6 +28,10 @@
# include <string.h>
#endif
+#ifdef _AMIGA
+# include <proto/exec.h>
+#endif
+
#ifdef __MVS__
# ifndef _OPEN_SYS
# define _OPEN_SYS
@@ -240,6 +244,10 @@
}
}
return NULL;
+
+# elif defined _AMIGA /* AmigaOS-like */
+ struct Task *thisTask = FindTask(NULL);
+ return (thisTask->tc_Node.ln_Name);
# else
# error "getprogname module not ported to this OS"
# endif
diff -ruN grub-2.06/grub-core/osdep/aros/getroot.c grub-2.06.aros/grub-core/osdep/aros/getroot.c
--- grub-2.06/grub-core/osdep/aros/getroot.c 2018-11-24 17:13:02.000000000 +0000
+++ grub-2.06.aros/grub-core/osdep/aros/getroot.c 2020-01-16 19:13:41.085635000 +0000
@@ -29,7 +29,6 @@
#include <string.h>
#include <dos/dos.h>
-#include <dos/filesystem.h>
#include <dos/exall.h>
#include <proto/dos.h>
#include <proto/exec.h>
diff -ruN grub-2.06/grub-core/osdep/aros/hostdisk.c grub-2.06.aros/grub-core/osdep/aros/hostdisk.c
--- grub-2.06/grub-core/osdep/aros/hostdisk.c 2020-02-28 11:39:15.000000000 +0000
+++ grub-2.06.aros/grub-core/osdep/aros/hostdisk.c 2020-01-16 19:13:41.085635000 +0000
@@ -45,7 +45,6 @@
#include <string.h>
#include <dos/dos.h>
-#include <dos/filesystem.h>
#include <dos/exall.h>
#include <proto/dos.h>
#include <devices/hardblocks.h>
diff -ruN grub-2.06/grub-core/osdep/aros/relpath.c grub-2.06.aros/grub-core/osdep/aros/relpath.c
--- grub-2.06/grub-core/osdep/aros/relpath.c 2018-11-24 17:13:02.000000000 +0000
+++ grub-2.06.aros/grub-core/osdep/aros/relpath.c 2020-01-16 19:13:41.085635000 +0000
@@ -29,7 +29,6 @@
#include <string.h>
#include <dos/dos.h>
-#include <dos/filesystem.h>
#include <dos/exall.h>
#include <proto/dos.h>
#include <proto/exec.h>
diff -ruN grub-2.06/grub-core/osdep/basic/no_platform.c grub-2.06.aros/grub-core/osdep/basic/no_platform.c
--- grub-2.06/grub-core/osdep/basic/no_platform.c 2018-11-24 17:13:02.000000000 +0000
+++ grub-2.06.aros/grub-core/osdep/basic/no_platform.c 2020-01-16 19:13:41.085635000 +0000
@@ -30,12 +30,13 @@
grub_util_error ("%s", _("no IEEE1275 routines are available for your platform"));
}
-void
+int
grub_install_register_efi (grub_device_t efidir_grub_dev,
const char *efifile_path,
const char *efi_distributor)
{
grub_util_error ("%s", _("no EFI routines are available for your platform"));
+ return 0;
}
void

332
arch/all-pc/boot/grub2-aros/grub-2.12-aros.diff Normal file
View File

@ -0,0 +1,332 @@
diff -ruN grub-2.12/grub-core/fs/affs.c grub-2.12.aros/grub-core/fs/affs.c
--- grub-2.12/grub-core/fs/affs.c 2022-12-07 22:38:25.000000000 +0000
+++ grub-2.12.aros/grub-core/fs/affs.c 2020-01-16 19:13:41.085635000 +0000
@@ -202,7 +202,9 @@
goto fail;
/* Make sure this is an affs filesystem. */
- if (grub_strncmp ((char *) (data->bblock.type), "DOS", 3) != 0
+ if (((grub_strncmp ((char *) (data->bblock.type), "DOS", 3) != 0)
+ /* Test if the filesystem is a muFS filesystem. */
+ && (grub_strncmp ((char *) (data->bblock.type), "muF", 3) != 0))
/* Test if the filesystem is a OFS filesystem. */
|| !(data->bblock.flags & GRUB_AFFS_FLAG_FFS))
continue;
diff -ruN grub-2.12/grub-core/lib/gnulib/getprogname.c grub-2.12.aros/grub-core/lib/gnulib/getprogname.c
--- grub-2.12/grub-core/lib/gnulib/getprogname.c 2023-12-20 16:00:56.000000000 +0000
+++ grub-2.12.aros/grub-core/lib/gnulib/getprogname.c 2025-05-24 15:52:16.180558812 +0000
@@ -28,6 +28,10 @@
# include <string.h>
#endif
+#ifdef _AMIGA
+# include <proto/exec.h>
+#endif
+
#ifdef __MVS__
# ifndef _OPEN_SYS
# define _OPEN_SYS
@@ -287,6 +291,9 @@
close (fd);
}
return "?";
+# elif defined _AMIGA /* AmigaOS-like */
+ struct Task *thisTask = FindTask(NULL);
+ return (thisTask->tc_Node.ln_Name);
# else
# error "getprogname module not ported to this OS"
# endif
diff -ruN grub-2.12/grub-core/Makefile.in grub-2.12.aros/grub-core/Makefile.in
--- grub-2.12/grub-core/Makefile.in 2023-12-20 16:01:49.000000000 +0000
+++ grub-2.12.aros/grub-core/Makefile.in 2025-06-18 14:24:46.090179643 +0000
@@ -49018,8 +49018,8 @@
crypto.lst: $(srcdir)/lib/libgcrypt-grub/cipher/crypto.lst
cp $^ $@
-syminfo.lst: gensyminfo.sh kernel_syms.lst $(top_srcdir)/grub-core/extra_deps.lst $(MODULE_FILES)
- cat kernel_syms.lst $(top_srcdir)/grub-core/extra_deps.lst > $@.new
+syminfo.lst: gensyminfo.sh kernel_syms.lst $(MODULE_FILES)
+ cat kernel_syms.lst > $@.new
for m in $(MODULE_FILES); do \
sh $< $$m >> $@.new || exit 1; \
done
diff -ruN grub-2.12/grub-core/osdep/aros/getroot.c grub-2.12.aros/grub-core/osdep/aros/getroot.c
--- grub-2.12/grub-core/osdep/aros/getroot.c 2022-03-14 14:58:43.000000000 +0000
+++ grub-2.12.aros/grub-core/osdep/aros/getroot.c 2020-01-16 19:13:41.085635000 +0000
@@ -29,7 +29,6 @@
#include <string.h>
#include <dos/dos.h>
-#include <dos/filesystem.h>
#include <dos/exall.h>
#include <proto/dos.h>
#include <proto/exec.h>
diff -ruN grub-2.12/grub-core/osdep/aros/hostdisk.c grub-2.12.aros/grub-core/osdep/aros/hostdisk.c
--- grub-2.12/grub-core/osdep/aros/hostdisk.c 2022-07-04 12:43:26.000000000 +0000
+++ grub-2.12.aros/grub-core/osdep/aros/hostdisk.c 2020-01-16 19:13:41.085635000 +0000
@@ -45,7 +45,6 @@
#include <string.h>
#include <dos/dos.h>
-#include <dos/filesystem.h>
#include <dos/exall.h>
#include <proto/dos.h>
#include <devices/hardblocks.h>
diff -ruN grub-2.12/grub-core/osdep/aros/relpath.c grub-2.12.aros/grub-core/osdep/aros/relpath.c
--- grub-2.12/grub-core/osdep/aros/relpath.c 2018-11-24 17:13:02.000000000 +0000
+++ grub-2.12.aros/grub-core/osdep/aros/relpath.c 2020-01-16 19:13:41.085635000 +0000
@@ -29,7 +29,6 @@
#include <string.h>
#include <dos/dos.h>
-#include <dos/filesystem.h>
#include <dos/exall.h>
#include <proto/dos.h>
#include <proto/exec.h>
diff -ruN grub-2.12/grub-core/osdep/basic/no_platform.c grub-2.12.aros/grub-core/osdep/basic/no_platform.c
--- grub-2.12/grub-core/osdep/basic/no_platform.c 2018-11-24 17:13:02.000000000 +0000
+++ grub-2.12.aros/grub-core/osdep/basic/no_platform.c 2025-06-18 14:17:31.458180152 +0000
@@ -30,12 +30,13 @@
grub_util_error ("%s", _("no IEEE1275 routines are available for your platform"));
}
-void
+int
grub_install_register_efi (grub_device_t efidir_grub_dev,
const char *efifile_path,
const char *efi_distributor)
{
grub_util_error ("%s", _("no EFI routines are available for your platform"));
+ return 0;
}
void
diff -ruN grub-2.12/Makefile.in grub-2.12.aros/Makefile.in
--- grub-2.12/Makefile.in 2023-12-20 16:01:34.000000000 +0000
+++ grub-2.12.aros/Makefile.in 2025-06-18 14:10:48.254180600 +0000
@@ -3255,35 +3255,35 @@
libgrubgcry_a_CCASFLAGS = $(AM_CCASFLAGS) $(CCASFLAGS_LIBRARY)
grub_mkimage_SOURCES = grub-core/kern/emu/argp_common.c grub-core/osdep/config.c grub-core/osdep/init.c util/config.c util/grub-mkimage.c util/grub-mkimage32.c util/grub-mkimage64.c util/mkimage.c util/resolve.c
nodist_grub_mkimage_SOURCES =
-grub_mkimage_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBLZMA) $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)
+grub_mkimage_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBLZMA) $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lpthread
grub_mkimage_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PROGRAM)
grub_mkimage_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM)
grub_mkimage_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM)
grub_mkimage_CCASFLAGS = $(AM_CCASFLAGS) $(CCASFLAGS_PROGRAM)
grub_mkrelpath_SOURCES = grub-core/kern/emu/argp_common.c grub-core/osdep/init.c util/grub-mkrelpath.c
nodist_grub_mkrelpath_SOURCES =
-grub_mkrelpath_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)
+grub_mkrelpath_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lpthread
grub_mkrelpath_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PROGRAM)
grub_mkrelpath_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM)
grub_mkrelpath_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM)
grub_mkrelpath_CCASFLAGS = $(AM_CCASFLAGS) $(CCASFLAGS_PROGRAM)
grub_script_check_SOURCES = grub-core/kern/emu/argp_common.c grub-core/osdep/init.c util/grub-script-check.c
nodist_grub_script_check_SOURCES =
-grub_script_check_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)
+grub_script_check_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lpthread
grub_script_check_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PROGRAM)
grub_script_check_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM)
grub_script_check_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM)
grub_script_check_CCASFLAGS = $(AM_CCASFLAGS) $(CCASFLAGS_PROGRAM)
grub_editenv_SOURCES = grub-core/osdep/compress.c grub-core/osdep/config.c grub-core/osdep/init.c util/config.c util/editenv.c util/grub-editenv.c util/grub-install-common.c util/grub-mkimage32.c util/grub-mkimage64.c util/mkimage.c util/resolve.c
nodist_grub_editenv_SOURCES =
-grub_editenv_LDADD = $(LIBLZMA) libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)
+grub_editenv_LDADD = $(LIBLZMA) libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lpthread
grub_editenv_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PROGRAM)
grub_editenv_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM)
grub_editenv_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM)
grub_editenv_CCASFLAGS = $(AM_CCASFLAGS) $(CCASFLAGS_PROGRAM)
grub_mkpasswd_pbkdf2_SOURCES = grub-core/kern/emu/argp_common.c grub-core/osdep/init.c grub-core/osdep/random.c util/grub-mkpasswd-pbkdf2.c
nodist_grub_mkpasswd_pbkdf2_SOURCES =
-grub_mkpasswd_pbkdf2_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)
+grub_mkpasswd_pbkdf2_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lpthread
grub_mkpasswd_pbkdf2_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PROGRAM)
grub_mkpasswd_pbkdf2_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM)
grub_mkpasswd_pbkdf2_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM)
@@ -3297,161 +3297,161 @@
@COND_APPLE_LINKER_TRUE@grub_macho2img_CCASFLAGS = $(AM_CCASFLAGS) $(CCASFLAGS_PROGRAM)
grub_fstest_SOURCES = grub-core/disk/host.c grub-core/kern/emu/hostfs.c grub-core/osdep/init.c util/grub-fstest.c
nodist_grub_fstest_SOURCES = grub_fstest_init.c
-grub_fstest_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)
+grub_fstest_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lpthread
grub_fstest_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PROGRAM)
grub_fstest_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM)
grub_fstest_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM)
grub_fstest_CCASFLAGS = $(AM_CCASFLAGS) $(CCASFLAGS_PROGRAM)
@COND_GRUB_MOUNT_TRUE@grub_mount_SOURCES = grub-core/disk/host.c grub-core/kern/emu/hostfs.c grub-core/osdep/init.c util/grub-mount.c
@COND_GRUB_MOUNT_TRUE@nodist_grub_mount_SOURCES = grub_fstest_init.c
-@COND_GRUB_MOUNT_TRUE@grub_mount_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) $(FUSE_LIBS)
+@COND_GRUB_MOUNT_TRUE@grub_mount_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lpthread$(FUSE_LIBS)
@COND_GRUB_MOUNT_TRUE@grub_mount_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PROGRAM) $(FUSE_CFLAGS)
@COND_GRUB_MOUNT_TRUE@grub_mount_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM)
@COND_GRUB_MOUNT_TRUE@grub_mount_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM)
@COND_GRUB_MOUNT_TRUE@grub_mount_CCASFLAGS = $(AM_CCASFLAGS) $(CCASFLAGS_PROGRAM)
@COND_GRUB_MKFONT_TRUE@grub_mkfont_SOURCES = grub-core/kern/emu/argp_common.c grub-core/osdep/init.c util/grub-mkfont.c
@COND_GRUB_MKFONT_TRUE@nodist_grub_mkfont_SOURCES =
-@COND_GRUB_MKFONT_TRUE@grub_mkfont_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(FREETYPE_LIBS) $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)
+@COND_GRUB_MKFONT_TRUE@grub_mkfont_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(FREETYPE_LIBS) $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lpthread
@COND_GRUB_MKFONT_TRUE@grub_mkfont_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PROGRAM) $(FREETYPE_CFLAGS)
@COND_GRUB_MKFONT_TRUE@grub_mkfont_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM)
@COND_GRUB_MKFONT_TRUE@grub_mkfont_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM) -DGRUB_MKFONT=1
@COND_GRUB_MKFONT_TRUE@grub_mkfont_CCASFLAGS = $(AM_CCASFLAGS) $(CCASFLAGS_PROGRAM)
grub_probe_SOURCES = grub-core/kern/emu/argp_common.c grub-core/osdep/init.c grub-core/osdep/ofpath.c util/grub-probe.c util/probe.c
nodist_grub_probe_SOURCES =
-grub_probe_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)
+grub_probe_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lpthread
grub_probe_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PROGRAM)
grub_probe_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM)
grub_probe_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM)
grub_probe_CCASFLAGS = $(AM_CCASFLAGS) $(CCASFLAGS_PROGRAM)
grub_bios_setup_SOURCES = grub-core/kern/emu/argp_common.c grub-core/lib/reed_solomon.c grub-core/osdep/blocklist.c grub-core/osdep/init.c util/grub-setup.c util/setup_bios.c
nodist_grub_bios_setup_SOURCES =
-grub_bios_setup_LDADD = libgrubmods.a libgrubkern.a libgrubgcry.a grub-core/lib/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)
+grub_bios_setup_LDADD = libgrubmods.a libgrubkern.a libgrubgcry.a grub-core/lib/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lpthread
grub_bios_setup_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PROGRAM)
grub_bios_setup_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM)
grub_bios_setup_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM) -DGRUB_SETUP_FUNC=grub_util_bios_setup
grub_bios_setup_CCASFLAGS = $(AM_CCASFLAGS) $(CCASFLAGS_PROGRAM)
grub_sparc64_setup_SOURCES = grub-core/kern/emu/argp_common.c grub-core/lib/reed_solomon.c grub-core/osdep/blocklist.c grub-core/osdep/init.c grub-core/osdep/ofpath.c util/grub-setup.c util/setup_sparc.c
nodist_grub_sparc64_setup_SOURCES =
-grub_sparc64_setup_LDADD = libgrubmods.a libgrubkern.a libgrubgcry.a grub-core/lib/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)
+grub_sparc64_setup_LDADD = libgrubmods.a libgrubkern.a libgrubgcry.a grub-core/lib/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lpthread
grub_sparc64_setup_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PROGRAM)
grub_sparc64_setup_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM)
grub_sparc64_setup_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM) -DGRUB_SETUP_FUNC=grub_util_sparc_setup
grub_sparc64_setup_CCASFLAGS = $(AM_CCASFLAGS) $(CCASFLAGS_PROGRAM)
grub_ofpathname_SOURCES = grub-core/osdep/init.c grub-core/osdep/ofpath.c util/ieee1275/grub-ofpathname.c
nodist_grub_ofpathname_SOURCES =
-grub_ofpathname_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)
+grub_ofpathname_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lpthread
grub_ofpathname_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PROGRAM)
grub_ofpathname_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM)
grub_ofpathname_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM)
grub_ofpathname_CCASFLAGS = $(AM_CCASFLAGS) $(CCASFLAGS_PROGRAM)
grub_mklayout_SOURCES = grub-core/kern/emu/argp_common.c grub-core/osdep/init.c util/grub-mklayout.c
nodist_grub_mklayout_SOURCES =
-grub_mklayout_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)
+grub_mklayout_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lpthread
grub_mklayout_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PROGRAM)
grub_mklayout_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM)
grub_mklayout_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM)
grub_mklayout_CCASFLAGS = $(AM_CCASFLAGS) $(CCASFLAGS_PROGRAM)
grub_macbless_SOURCES = grub-core/kern/emu/argp_common.c grub-core/osdep/init.c util/grub-macbless.c
nodist_grub_macbless_SOURCES =
-grub_macbless_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)
+grub_macbless_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lpthread
grub_macbless_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PROGRAM)
grub_macbless_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM)
grub_macbless_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM)
grub_macbless_CCASFLAGS = $(AM_CCASFLAGS) $(CCASFLAGS_PROGRAM)
@COND_HAVE_EXEC_TRUE@grub_mkrescue_SOURCES = grub-core/disk/host.c grub-core/kern/emu/argp_common.c grub-core/kern/emu/hostfs.c grub-core/lib/reed_solomon.c grub-core/osdep/blocklist.c grub-core/osdep/compress.c grub-core/osdep/config.c grub-core/osdep/init.c grub-core/osdep/ofpath.c grub-core/osdep/platform.c grub-core/osdep/platform_unix.c grub-core/osdep/random.c util/config.c util/editenv.c util/glue-efi.c util/grub-install-common.c util/grub-mkimage32.c util/grub-mkimage64.c util/grub-mkrescue.c util/mkimage.c util/render-label.c util/resolve.c util/setup_bios.c util/setup_sparc.c
@COND_HAVE_EXEC_TRUE@nodist_grub_mkrescue_SOURCES =
-@COND_HAVE_EXEC_TRUE@grub_mkrescue_LDADD = $(LIBLZMA) libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)
+@COND_HAVE_EXEC_TRUE@grub_mkrescue_LDADD = $(LIBLZMA) libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lpthread
@COND_HAVE_EXEC_TRUE@grub_mkrescue_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PROGRAM)
@COND_HAVE_EXEC_TRUE@grub_mkrescue_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM)
@COND_HAVE_EXEC_TRUE@grub_mkrescue_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM)
@COND_HAVE_EXEC_TRUE@grub_mkrescue_CCASFLAGS = $(AM_CCASFLAGS) $(CCASFLAGS_PROGRAM)
grub_mkstandalone_SOURCES = grub-core/disk/host.c grub-core/kern/emu/argp_common.c grub-core/kern/emu/hostfs.c grub-core/lib/reed_solomon.c grub-core/osdep/blocklist.c grub-core/osdep/compress.c grub-core/osdep/config.c grub-core/osdep/init.c grub-core/osdep/ofpath.c grub-core/osdep/platform.c grub-core/osdep/platform_unix.c grub-core/osdep/random.c util/config.c util/editenv.c util/glue-efi.c util/grub-install-common.c util/grub-mkimage32.c util/grub-mkimage64.c util/grub-mkstandalone.c util/mkimage.c util/render-label.c util/resolve.c util/setup_bios.c util/setup_sparc.c
nodist_grub_mkstandalone_SOURCES =
-grub_mkstandalone_LDADD = $(LIBLZMA) libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)
+grub_mkstandalone_LDADD = $(LIBLZMA) libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lpthread
grub_mkstandalone_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PROGRAM)
grub_mkstandalone_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM)
grub_mkstandalone_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM)
grub_mkstandalone_CCASFLAGS = $(AM_CCASFLAGS) $(CCASFLAGS_PROGRAM)
grub_install_SOURCES = grub-core/disk/host.c grub-core/kern/emu/argp_common.c grub-core/kern/emu/hostfs.c grub-core/lib/reed_solomon.c grub-core/osdep/blocklist.c grub-core/osdep/compress.c grub-core/osdep/config.c grub-core/osdep/init.c grub-core/osdep/ofpath.c grub-core/osdep/platform.c grub-core/osdep/platform_unix.c grub-core/osdep/random.c util/config.c util/editenv.c util/grub-install-common.c util/grub-install.c util/grub-mkimage32.c util/grub-mkimage64.c util/mkimage.c util/probe.c util/render-label.c util/resolve.c util/setup_bios.c util/setup_sparc.c
nodist_grub_install_SOURCES =
-grub_install_LDADD = $(LIBLZMA) libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)
+grub_install_LDADD = $(LIBLZMA) libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lpthread
grub_install_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PROGRAM)
grub_install_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM)
grub_install_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM)
grub_install_CCASFLAGS = $(AM_CCASFLAGS) $(CCASFLAGS_PROGRAM)
grub_mknetdir_SOURCES = grub-core/kern/emu/argp_common.c grub-core/lib/reed_solomon.c grub-core/osdep/blocklist.c grub-core/osdep/compress.c grub-core/osdep/config.c grub-core/osdep/init.c grub-core/osdep/ofpath.c grub-core/osdep/platform.c grub-core/osdep/platform_unix.c grub-core/osdep/random.c util/config.c util/editenv.c util/grub-install-common.c util/grub-mkimage32.c util/grub-mkimage64.c util/grub-mknetdir.c util/mkimage.c util/resolve.c util/setup_bios.c util/setup_sparc.c
nodist_grub_mknetdir_SOURCES =
-grub_mknetdir_LDADD = $(LIBLZMA) libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)
+grub_mknetdir_LDADD = $(LIBLZMA) libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lpthread
grub_mknetdir_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PROGRAM)
grub_mknetdir_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM)
grub_mknetdir_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM)
grub_mknetdir_CCASFLAGS = $(AM_CCASFLAGS) $(CCASFLAGS_PROGRAM)
example_unit_test_SOURCES = grub-core/kern/list.c grub-core/kern/misc.c grub-core/tests/lib/test.c tests/example_unit_test.c tests/lib/unit_test.c
nodist_example_unit_test_SOURCES =
-example_unit_test_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)
+example_unit_test_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lpthread
example_unit_test_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PROGRAM)
example_unit_test_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM)
example_unit_test_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM)
example_unit_test_CCASFLAGS = $(AM_CCASFLAGS) $(CCASFLAGS_PROGRAM)
printf_test_SOURCES = grub-core/kern/list.c grub-core/kern/misc.c grub-core/tests/lib/test.c tests/lib/unit_test.c tests/printf_unit_test.c
nodist_printf_test_SOURCES =
-printf_test_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)
+printf_test_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lpthread
printf_test_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PROGRAM)
printf_test_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM)
printf_test_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM)
printf_test_CCASFLAGS = $(AM_CCASFLAGS) $(CCASFLAGS_PROGRAM)
date_test_SOURCES = grub-core/kern/list.c grub-core/kern/misc.c grub-core/tests/lib/test.c tests/date_unit_test.c tests/lib/unit_test.c
nodist_date_test_SOURCES =
-date_test_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)
+date_test_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lpthread
date_test_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PROGRAM)
date_test_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM)
date_test_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM)
date_test_CCASFLAGS = $(AM_CCASFLAGS) $(CCASFLAGS_PROGRAM)
@COND_HAVE_CXX_TRUE@priority_queue_unit_test_SOURCES = grub-core/kern/list.c grub-core/kern/misc.c grub-core/lib/priority_queue.c grub-core/tests/lib/test.c tests/lib/unit_test.c tests/priority_queue_unit_test.cc
@COND_HAVE_CXX_TRUE@nodist_priority_queue_unit_test_SOURCES =
-@COND_HAVE_CXX_TRUE@priority_queue_unit_test_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)
+@COND_HAVE_CXX_TRUE@priority_queue_unit_test_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lpthread
@COND_HAVE_CXX_TRUE@priority_queue_unit_test_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PROGRAM)
@COND_HAVE_CXX_TRUE@priority_queue_unit_test_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM)
@COND_HAVE_CXX_TRUE@priority_queue_unit_test_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM)
@COND_HAVE_CXX_TRUE@priority_queue_unit_test_CCASFLAGS = $(AM_CCASFLAGS) $(CCASFLAGS_PROGRAM)
cmp_test_SOURCES = grub-core/kern/list.c grub-core/kern/misc.c grub-core/tests/lib/test.c tests/cmp_unit_test.c tests/lib/unit_test.c
nodist_cmp_test_SOURCES =
-cmp_test_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)
+cmp_test_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lpthread
cmp_test_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PROGRAM)
cmp_test_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM)
cmp_test_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM)
cmp_test_CCASFLAGS = $(AM_CCASFLAGS) $(CCASFLAGS_PROGRAM)
grub_menulst2cfg_SOURCES = grub-core/lib/i386/pc/vesa_modes_table.c grub-core/lib/legacy_parse.c grub-core/osdep/init.c util/grub-menulst2cfg.c
nodist_grub_menulst2cfg_SOURCES =
-grub_menulst2cfg_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)
+grub_menulst2cfg_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lpthread
grub_menulst2cfg_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PROGRAM)
grub_menulst2cfg_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM)
grub_menulst2cfg_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM)
grub_menulst2cfg_CCASFLAGS = $(AM_CCASFLAGS) $(CCASFLAGS_PROGRAM)
grub_syslinux2cfg_SOURCES = grub-core/disk/host.c grub-core/kern/emu/argp_common.c grub-core/kern/emu/hostfs.c grub-core/lib/getline.c grub-core/lib/syslinux_parse.c grub-core/osdep/init.c util/grub-syslinux2cfg.c
nodist_grub_syslinux2cfg_SOURCES =
-grub_syslinux2cfg_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)
+grub_syslinux2cfg_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lpthread
grub_syslinux2cfg_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PROGRAM)
grub_syslinux2cfg_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM)
grub_syslinux2cfg_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM)
grub_syslinux2cfg_CCASFLAGS = $(AM_CCASFLAGS) $(CCASFLAGS_PROGRAM)
grub_glue_efi_SOURCES = grub-core/kern/emu/argp_common.c grub-core/osdep/init.c util/glue-efi.c util/grub-glue-efi.c
nodist_grub_glue_efi_SOURCES =
-grub_glue_efi_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)
+grub_glue_efi_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lpthread
grub_glue_efi_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PROGRAM)
grub_glue_efi_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM)
grub_glue_efi_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM)
grub_glue_efi_CCASFLAGS = $(AM_CCASFLAGS) $(CCASFLAGS_PROGRAM)
grub_render_label_SOURCES = grub-core/disk/host.c grub-core/kern/emu/argp_common.c grub-core/kern/emu/hostfs.c grub-core/osdep/init.c util/grub-render-label.c util/render-label.c
nodist_grub_render_label_SOURCES =
-grub_render_label_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)
+grub_render_label_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lpthread
grub_render_label_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PROGRAM)
grub_render_label_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM)
grub_render_label_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM)
grub_render_label_CCASFLAGS = $(AM_CCASFLAGS) $(CCASFLAGS_PROGRAM)
grub_file_SOURCES = grub-core/commands/file.c grub-core/commands/file32.c grub-core/commands/file64.c grub-core/disk/host.c grub-core/io/offset.c grub-core/kern/elf.c grub-core/kern/emu/hostfs.c grub-core/loader/i386/xen_file.c grub-core/loader/i386/xen_file32.c grub-core/loader/i386/xen_file64.c grub-core/loader/lzss.c grub-core/loader/macho.c grub-core/loader/macho32.c grub-core/loader/macho64.c grub-core/osdep/init.c util/grub-file.c util/render-label.c
nodist_grub_file_SOURCES =
-grub_file_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)
+grub_file_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/lib/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lpthread
grub_file_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PROGRAM)
grub_file_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM)
grub_file_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM)

2
arch/all-pc/boot/grub2-aros/mmakefile.src
View File

@ -21,6 +21,7 @@ CONFIG_OPTS := \
--datarootdir=$(GRUB2DESTDIR)/share \
--sysconfdir=$(GRUB2DESTDIR)/etc \
--disable-nls \
--disable-efiemu \
--disable-grub-mkfont \
--disable-werror \
--program-prefix=
@ -29,6 +30,7 @@ grub2-aros--touchfileflag := $(GENDIR)/arch/all-pc/boot/.grub2-files-touched
NOWARN_CLFAGS := $(NOWARN_IMPLICIT_FUNCTION_DECL) $(NOWARN_INT_CONVERSION) $(NOWARN_INCOMPAT_POINTER_TYPES)
TARGET_ISA_CFLAGS := $(CFLAGS_GNU11) $(NOWARN_CLFAGS)
TARGET_ISA_CFLAGS += -D_STDC_NOINLINE_CTYPE
%fetch_and_build mmake=grub2-aros \
package=$(GRUB2PACKAGE) version=$(GRUB2_VERSION) suffixes="tar.gz tar.xz" package_repo=$(GRUB2REPOS) \

2
arch/all-pc/boot/grub2_def
View File

@ -1 +1 @@
2.06
2.12