[EMAIL PROTECTED] (Harley D. Eades III) writes:
> Jeroen Dekkers <[EMAIL PROTECTED]> writes:
>
> > On Sun, Jun 11, 2006 at 10:28:44AM -0500, Harley D. Eades III wrote:
> > > Hello, I managed to work up a small patch for grub2. She makes it
> > > possible to build grub2 on FreeBSD Release-6.1. There is one thing
> > > I am not sure on. In configure.ac I had to move the lines which
> > > restore the compiler flags above the checks for _start etc..see the
> > > patch. I would like as much feedback as possible. Thanks. :)
> >
> > The problem with the compiler flags should have been fixed with this
> > change:
> >
> > 2006-05-31 Jeroen Dekkers <[EMAIL PROTECTED]>
> >
> > * configure.ac: Don't set host_m32 for x86_64. Also reset LIBS
> > for the target-specific tests. Make sure that we also have the
> > up-to-date target variables for those tests.
> >
> >
> > If I read your patch correctly you haven't updated to recent CVS
> > yet. Can you try whether this fix also works for you?
> >
> Sure thing. :) Thanks for the reply.
Your patch does fix that issue. Here is my updated patch. :)
Cheers
Harley
diff --exclude=CVS --exclude=configure --exclude=config.log
--exclude=config.h.in -ru grub2/ChangeLog grub2Hacked/ChangeLog
--- grub2/ChangeLog Mon Jun 12 10:11:10 2006
+++ grub2Hacked/ChangeLog Mon Jun 12 10:25:28 2006
@@ -1,3 +1,12 @@
+2006-06-10 Harley D. Eades III <[EMAIL PROTECTED]>
+
+ * configure.ac: Check for <malloc.h>. Check for memalign().
+ * include/grub/util/misc.h: Include <unistd.h>.
+ * util/grub-emu.c [HAVE_MALLOC_H]: Include <malloc.h>.
+ * util/misc.c: Likewise.
+ (grub_memalign) [!HAVE_MEMALIGN]: Don't call memalign, but
+ generate an error instead.
+
2006-06-09 Yoshinori K. Okuji <[EMAIL PROTECTED]>
* loader/i386/pc/linux.c (grub_rescue_cmd_initrd): Make sure
that
@@ -335,7 +344,6 @@
for the target-specific tests. Make sure that we also have the
up-to-date target variables for those tests.
->>>>>>> 1.283
2006-05-31 Yoshinori K. Okuji <[EMAIL PROTECTED]>
* genmk.rb (Image::rule): Prefix CFLAGS or ASFLAGS with
TARGET_.
diff --exclude=CVS --exclude=configure --exclude=config.log
--exclude=config.h.in -ru grub2/configure.ac
grub2Hacked/configure.ac
--- grub2/configure.ac Sun Jun 11 17:49:23 2006
+++ grub2Hacked/configure.ac Sun Jun 11 17:55:34 2006
@@ -121,6 +121,15 @@
AC_CHECK_SIZEOF(void *)
AC_CHECK_SIZEOF(long)
+# BSD checks.
+AC_CHECK_HEADER([malloc.h],
+ [AC_DEFINE(HAVE_MALLOC_H, [],
+ [Define to 1 if you have the malloc.h header file.])],
,)
+
+AC_CHECK_FUNC([memalign],
+ [AC_DEFINE(HAVE_MEMALIGN, [],
+ [Define to 1 if you have the memalign function.])], ,)
+
if test "x$host_m32" = x1; then
# Force 32-bit mode.
CFLAGS="$CFLAGS -m32"
diff --exclude=CVS --exclude=configure --exclude=config.log
--exclude=config.h.in -ru grub2/include/grub/util/misc.h
grub2Hacked/include/grub/util/misc.h
--- grub2/include/grub/util/misc.h Mon Feb 14 18:07:01 2005
+++ grub2Hacked/include/grub/util/misc.h Mon Jun 5 15:25:38
2006
@@ -23,6 +23,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <setjmp.h>
+#include <unistd.h>
extern char *progname;
extern int verbosity;
diff --exclude=CVS --exclude=configure --exclude=config.log
--exclude=config.h.in -ru grub2/util/grub-emu.c
grub2Hacked/util/grub-emu.c
--- grub2/util/grub-emu.c Wed Apr 26 16:58:36 2006
+++ grub2Hacked/util/grub-emu.c Mon Jun 5 15:26:30 2006
@@ -18,7 +18,11 @@
*/
#include <stdlib.h>
+
+#ifdef HAVE_MALLOC_H
#include <malloc.h>
+#endif
+
#include <sys/stat.h>
#include <argp.h>
#include <string.h>
diff --exclude=CVS --exclude=configure --exclude=config.log
--exclude=config.h.in -ru grub2/util/misc.c grub2Hacked/util/misc.c
--- grub2/util/misc.c Sun Apr 23 08:37:36 2006
+++ grub2Hacked/util/misc.c Mon Jun 5 15:28:12 2006
@@ -24,7 +24,11 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/time.h>
+
+#ifdef HAVE_MALLOC_H
#include <malloc.h>
+#endif
+
#include <unistd.h>
#include <grub/util/misc.h>
@@ -228,8 +232,13 @@
grub_memalign (grub_size_t align, grub_size_t size)
{
void *p;
-
+
+#ifdef HAVE_MEMALIGN
p = memalign (align, size);
+#else
+ grub_util_error ("memalign not available");
+#endif
+
if (! p)
grub_util_error ("out of memory");
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/grub-devel
