Patch for successful compilation on FreeBSD Release-6.1

Patch for successful compilation on FreeBSD Release-6.1

[Harley D. Eades III]

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. :)



2006-06-10  Harley D. Eades III  <hde@gnu.org>

        * 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.

diff --exclude=CVS --exclude=configure --exclude=config.log
--exclude=config.h.in -ru grub2/configure.ac grub2Hacked/configure.ac
--- grub2/configure.ac  Mon May 29 19:32:29 2006
+++ grub2Hacked/configure.ac    Mon Jun  5 15:50:36 2006
@@ -122,6 +122,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"
@@ -232,6 +241,12 @@
 AC_SUBST(TARGET_CPPFLAGS)
 AC_SUBST(TARGET_LDFLAGS)
 
+# Restore the flags.
+CC="$tmp_CC"
+CFLAGS="$tmp_CFLAGS"
+CPPFLAGS="$tmp_CPPFLAGS"
+LDFLAGS="$tmp_LDFLAGS"
+
 # Defined in aclocal.m4.
 grub_PROG_OBJCOPY_ABSOLUTE
 grub_ASM_USCORE
@@ -246,12 +261,6 @@
 else
   AC_DEFINE([NESTED_FUNC_ATTR], [], [Catch gcc bug])
 fi
-
-# Restore the flags.
-CC="$tmp_CC"
-CFLAGS="$tmp_CFLAGS"
-CPPFLAGS="$tmp_CPPFLAGS"
-LDFLAGS="$tmp_LDFLAGS"
 
 # Check for options.
 AC_ARG_ENABLE([mm-debug], 
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");

Re: Patch for successful compilation on FreeBSD Release-6.1

[Jeroen Dekkers]

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  <jeroen@dekkers.cx>

        * 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?

Jeroen Dekkers

Re: Patch for successful compilation on FreeBSD Release-6.1

[Harley D. Eades III]

Jeroen Dekkers <jeroen@vrijschrift.org> 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  <jeroen@dekkers.cx>
> 
>         * 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.

Cheers
Harley

Re: Patch for successful compilation on FreeBSD Release-6.1

[Harley D. Eades III]

hde@foobar-qux.org (Harley D. Eades III) writes:

> Jeroen Dekkers <jeroen@vrijschrift.org> 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  <jeroen@dekkers.cx>
> > 
> >         * 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  <hde@gnu.org>
+
+        * 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  <okuji@enbug.org>
 
        * 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  <okuji@enbug.org>
 
        * 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");

Re: Patch for successful compilation on FreeBSD Release-6.1

[Marco Gerards]

hde@foobar-qux.org (Harley D. Eades III) writes:

> hde@foobar-qux.org (Harley D. Eades III) writes:
>
>> Jeroen Dekkers <jeroen@vrijschrift.org> 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  <jeroen@dekkers.cx>
>> > 
>> >         * 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. :)

Looks fine to me.  Hopefully an autoconf expert can check again to be
sure.  If I don't hear any complaints within the week, I will commit
this patch.

--
Marco

Re: Patch for successful compilation on FreeBSD Release-6.1

[Yoshinori K. Okuji]

On Monday 12 June 2006 17:31, Harley D. Eades III wrote:
> --- 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.])],
> ,)
> +

Please use AC_CHECK_HEADERS instead. Usually, you don't have to use 
AC_CHECK_HEADER. See the autoconf manual for more details.

> +AC_CHECK_FUNC([memalign],
> +             [AC_DEFINE(HAVE_MEMALIGN, [],
> +             [Define to 1 if you have the memalign function.])], ,)
> +

Likewise, please use AC_CHECK_FUNCS instead.

> --- 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>

Can you tell me why it is necessary to include unistd.h here?

> --- 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
> +

I don't know why it is necessary to include malloc.h. IIRC, FreeBSD does not 
use malloc.h since 4.2 or something. In fact, other projects, such as KDE, 
stop including malloc.h in all platforms. Can you elaborate on this change?

Thanks,
Okuji

Re: Patch for successful compilation on FreeBSD Release-6.1

[Harley D. Eades III]

"Yoshinori K. Okuji" <okuji@enbug.org> writes:

> On Monday 12 June 2006 17:31, Harley D. Eades III wrote:
> > --- 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.])],
> > ,)
> > +
> 
> Please use AC_CHECK_HEADERS instead. Usually, you don't have to use 
> AC_CHECK_HEADER. See the autoconf manual for more details.
ok

> 
> > +AC_CHECK_FUNC([memalign],
> > +             [AC_DEFINE(HAVE_MEMALIGN, [],
> > +             [Define to 1 if you have the memalign function.])], ,)
> > +
ok

> Likewise, please use AC_CHECK_FUNCS instead.
> 
> > --- 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>
> 
> Can you tell me why it is necessary to include unistd.h here?
off_t is defined here on FreeBSD.
 
> > --- 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
> > +
> 
> I don't know why it is necessary to include malloc.h. IIRC, FreeBSD does not 
> use malloc.h since 4.2 or something. In fact, other projects, such as KDE, 
> stop including malloc.h in all platforms. Can you elaborate on this change?
I am not adding the include.  All I added was the #if statement so
this is not included on FreeBSD.  So you are correct about the header
file not being used on FreeBSD, because it's not. :)  IIRC, GNU/Linux
does define memalign in malloc.h though, so this could be the reason
it has been included already.

Cheers
Harley

Re: Patch for successful compilation on FreeBSD Release-6.1

[Yoshinori K. Okuji]

On Tuesday 13 June 2006 23:52, Harley D. Eades III wrote:
> off_t is defined here on FreeBSD.

I understand.

> I am not adding the include.  All I added was the #if statement so
> this is not included on FreeBSD.  So you are correct about the header
> file not being used on FreeBSD, because it's not. :)  IIRC, GNU/Linux
> does define memalign in malloc.h though, so this could be the reason
> it has been included already.

You are right. I've checked in my own fix for this problem. Since recent 
FreeBSD supports posix_memalign, I think mine is a bit better. Can you 
confirm that this works on FreeBSD?

BTW, I am afraid that there are some more dependencies on glibc, such as argp. 
How do you deal with those?

Thanks,
Okuji

Re: Patch for successful compilation on FreeBSD Release-6.1

[Harley D. Eades III]

"Yoshinori K. Okuji" <okuji@enbug.org> writes:

> On Tuesday 13 June 2006 23:52, Harley D. Eades III wrote:
> > off_t is defined here on FreeBSD.
> 
> I understand.

:)
 
> > I am not adding the include.  All I added was the #if statement so
> > this is not included on FreeBSD.  So you are correct about the header
> > file not being used on FreeBSD, because it's not. :)  IIRC, GNU/Linux
> > does define memalign in malloc.h though, so this could be the reason
> > it has been included already.
> 
> You are right. I've checked in my own fix for this problem. Since recent 
> FreeBSD supports posix_memalign, I think mine is a bit better. Can you 
> confirm that this works on FreeBSD?
Will do, but, I thought posix_memalign is not going to be active until
the next release?

This explains my concern (See Release:) :  
http://www.freebsd.org/cgi/query-pr.cgi?pr=85090

> BTW, I am afraid that there are some more dependencies on glibc, such as argp. 
> How do you deal with those?
FreeBSD packages libargp, I add it to LDFLAGS. :)

Cheers
Harley

Re: Patch for successful compilation on FreeBSD Release-6.1

[Harley D. Eades III]

hde@foobar-qux.org (Harley D. Eades III) writes:
> > 
> > You are right. I've checked in my own fix for this problem. Since recent 
> > FreeBSD supports posix_memalign, I think mine is a bit better. Can you 
> > confirm that this works on FreeBSD?
Well your fix is better.  It all works.