From 3c7eac445b1cfff1d2eaa92e13e690f04dd5ed88 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Thu, 22 Aug 2013 16:25:10 +0200 Subject: [PATCH] Fix dependencies on cygwin. * gentpl.py: Support variable dependencies. Add $TARGET_OBJ2ELF to dependencies when used and defined. * grub-core/Makefile.core.def (regexp): Add dependency on libgnulib.a. --- ChangeLog | 8 ++++++++ gentpl.py | 10 ++++++++-- grub-core/Makefile.core.def | 1 + 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4780ec1ea..e80b50148 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2013-08-22 Vladimir Serbinenko + + Fix dependencies on cygwin. + + * gentpl.py: Support variable dependencies. Add $TARGET_OBJ2ELF to + dependencies when used and defined. + * grub-core/Makefile.core.def (regexp): Add dependency on libgnulib.a. + 2013-08-22 Vladimir Serbinenko * include/grub/zfs/spa.h (zio_cksum): Add explicit members for mac. diff --git a/gentpl.py b/gentpl.py index b38cc1032..05f3f969b 100644 --- a/gentpl.py +++ b/gentpl.py @@ -331,6 +331,10 @@ def define_macro_for_platform_ldadd(p): return define_autogen_macro( "get_" + p + "_ldadd", platform_specific_values(p, "_ldadd", "ldadd")) +def define_macro_for_platform_dependencies(p): + return define_autogen_macro( + "get_" + p + "_dependencies", + platform_specific_values(p, "_dependencies", "dependencies")) def define_macro_for_platform_ldflags(p): return define_autogen_macro( "get_" + p + "_ldflags", @@ -356,6 +360,7 @@ def define_macro_for_platform_objcopyflags(p): # def platform_startup(p): return "[+ get_" + p + "_startup +]" def platform_ldadd(p): return "[+ get_" + p + "_ldadd +]" +def platform_dependencies(p): return "[+ get_" + p + "_dependencies +]" def platform_cflags(p): return "[+ get_" + p + "_cflags +]" def platform_ldflags(p): return "[+ get_" + p + "_ldflags +]" def platform_cppflags(p): return "[+ get_" + p + "_cppflags +]" @@ -385,7 +390,7 @@ def module(platform): r += var_set(cname() + "_LDFLAGS", "$(AM_LDFLAGS) $(LDFLAGS_MODULE) " + platform_ldflags(platform)) r += var_set(cname() + "_CPPFLAGS", "$(AM_CPPFLAGS) $(CPPFLAGS_MODULE) " + platform_cppflags(platform)) r += var_set(cname() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAGS_MODULE) " + platform_ccasflags(platform)) - # r += var_set(cname() + "_DEPENDENCIES", platform_dependencies(platform) + " " + platform_ldadd(platform)) + r += var_set(cname() + "_DEPENDENCIES", "$(TARGET_OBJ2ELF) " + platform_dependencies(platform)) r += gvar_add("dist_noinst_DATA", extra_dist()) r += gvar_add("BUILT_SOURCES", "$(nodist_" + cname() + "_SOURCES)") @@ -413,7 +418,7 @@ def kernel(platform): r += var_set(cname() + "_CPPFLAGS", "$(AM_CPPFLAGS) $(CPPFLAGS_KERNEL) " + platform_cppflags(platform)) r += var_set(cname() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAGS_KERNEL) " + platform_ccasflags(platform)) r += var_set(cname() + "_STRIPFLAGS", "$(AM_STRIPFLAGS) $(STRIPFLAGS_KERNEL) " + platform_stripflags(platform)) - # r += var_set(cname() + "_DEPENDENCIES", platform_dependencies(platform) + " " + platform_ldadd(platform)) + r += var_set(cname() + "_DEPENDENCIES", "$(TARGET_OBJ2ELF)") r += gvar_add("dist_noinst_DATA", extra_dist()) r += gvar_add("BUILT_SOURCES", "$(nodist_" + cname() + "_SOURCES)") @@ -605,6 +610,7 @@ for p in GRUB_PLATFORMS: print (define_macro_for_platform_startup(p)) print (define_macro_for_platform_cflags(p)) print (define_macro_for_platform_ldadd(p)) + print (define_macro_for_platform_dependencies(p)) print (define_macro_for_platform_ldflags(p)) print (define_macro_for_platform_cppflags(p)) print (define_macro_for_platform_ccasflags(p)) diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def index 06617d79a..bf0a6cd26 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -615,6 +615,7 @@ module = { common = commands/regexp.c; common = commands/wildcard.c; ldadd = libgnulib.a; + dependencies = libgnulib.a; cflags = '$(CFLAGS_POSIX) $(CFLAGS_GNULIB)'; cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB)'; };