On Sat, Aug 28, 2010 at 5:53 PM, Christian Franke
<[email protected]> wrote:
>
> $ grep ^grub_bin2h_LD Makefile
> grub_bin2h_LDADD = libgrub.a
> grub_bin2h_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM) $(LIBINTL)
> $(LIBDEVMAPPER)
>
> The above should be:
> grub_bin2h_LDADD = libgrub.a $(LIBINTL) $(LIBDEVMAPPER)
> grub_bin2h_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM)
>
> Same for all other utils. This likely needs to be fixed in gentpl.py.
>
It is not necessary to modify gentpl.py, fixing in Makefile.util.def
should be sufficient. Attached patch fixes all these AFAICS.
thanks,
--
bvk.chaitanya
=== modified file 'Makefile.util.def'
--- Makefile.util.def 2010-08-23 15:53:39 +0000
+++ Makefile.util.def 2010-08-28 13:05:34 +0000
@@ -99,7 +99,7 @@
name = grub-bin2h;
common = util/bin2h.c;
ldadd = libgrub.a;
- ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
+ ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
mansection = 1;
};
@@ -112,7 +112,7 @@
extra_dist = util/grub-mkimagexx.c;
ldadd = libgrub.a;
- ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
+ ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
cppflags = '-DGRUB_PKGLIBROOTDIR=\"$(pkglibrootdir)\"';
};
@@ -123,7 +123,7 @@
common = util/grub-mkrelpath.c;
ldadd = libgrub.a;
- ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
+ ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
};
program = {
@@ -133,7 +133,7 @@
common = util/grub-script-check.c;
ldadd = libgrub.a;
- ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
+ ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
};
program = {
@@ -143,7 +143,7 @@
common = util/grub-editenv.c;
ldadd = libgrub.a;
- ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
+ ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
};
program = {
@@ -153,7 +153,7 @@
common = util/grub-mkpasswd-pbkdf2.c;
ldadd = libgrub.a;
- ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
+ ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
cflags = '$(CFLAGS_GCRY)';
cppflags = '$(CPPFLAGS_GCRY)';
};
@@ -171,7 +171,7 @@
common = util/grub-pe2elf.c;
ldadd = libgrub.a;
- ldflags = '$(LIBINTL)';
+ ldadd = '$(LIBINTL)';
condition = COND_GRUB_PE2ELF;
};
@@ -181,7 +181,7 @@
common = util/grub-fstest.c;
ldadd = libgrub.a;
- ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
+ ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
condition = COND_GRUB_FSTEST;
};
@@ -194,8 +194,8 @@
cflags = '$(freetype_cflags)';
ldadd = libgrub.a;
- ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
- ldflags = '$(freetype_libs)';
+ ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
+ ldadd = '$(freetype_libs)';
condition = COND_GRUB_MKFONT;
};
@@ -212,7 +212,7 @@
sparc64_ieee1275 = util/ieee1275/devicemap.c;
ldadd = libgrub.a;
- ldflags = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
+ ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
};
program = {
@@ -222,7 +222,7 @@
common = util/grub-probe.c;
ldadd = libgrub.a;
- ldflags = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
+ ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
};
program = {
@@ -239,7 +239,7 @@
sparc64_ieee1275 = util/lvm.c;
ldadd = libgrub.a;
- ldflags = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
+ ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
enable = i386_pc;
enable = sparc64_ieee1275;
@@ -506,5 +506,5 @@
common = grub-core/tests/lib/test.c;
cflags = -Wno-format;
ldadd = libgrub.a;
- ldflags = '$(LIBDEVMAPPER)';
+ ldadd = '$(LIBDEVMAPPER)';
};
_______________________________________________
Grub-devel mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/grub-devel