| Message ID | 1476396838-12276-7-git-send-email-gustavo.zacarias@free-electrons.com |
|---|---|
| State | Changes Requested |
| Headers | show |
On 14-10-16 00:13, gustavo.zacarias@free-electrons.com wrote: > From: Gustavo Zacarias <gustavo.zacarias@free-electrons.com> > > Signed-off-by: Gustavo Zacarias <gustavo.zacarias@free-electrons.com> > --- > package/botan/botan.mk | 6 +++--- botan sneaked in into the same patch. Regards, Arnout > package/ed/ed.mk | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/botan/botan.mk b/package/botan/botan.mk > index 69c973e..4da557a 100644 > --- a/package/botan/botan.mk > +++ b/package/botan/botan.mk > @@ -48,15 +48,15 @@ define BOTAN_CONFIGURE_CMDS > endef > > define BOTAN_BUILD_CMDS > - $(MAKE) -C $(@D) AR="$(TARGET_AR) crs" > + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) AR="$(TARGET_AR) crs" > endef > > define BOTAN_INSTALL_STAGING_CMDS > - $(MAKE) -C $(@D) DESTDIR="$(STAGING_DIR)/usr" install > + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(STAGING_DIR)/usr" install > endef > > define BOTAN_INSTALL_TARGET_CMDS > - $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)/usr" install > + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)/usr" install > endef > > $(eval $(generic-package)) > diff --git a/package/ed/ed.mk b/package/ed/ed.mk > index f3bcb74..101be0e 100644 > --- a/package/ed/ed.mk > +++ b/package/ed/ed.mk > @@ -21,11 +21,11 @@ define ED_CONFIGURE_CMDS > endef > > define ED_BUILD_CMDS > - $(MAKE) -C $(@D) > + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) > endef > > define ED_INSTALL_TARGET_CMDS > - $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" install > + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" install > endef > > $(eval $(generic-package)) >
On 14-10-16 16:41, Arnout Vandecappelle wrote: > > > On 14-10-16 00:13, gustavo.zacarias@free-electrons.com wrote: >> From: Gustavo Zacarias <gustavo.zacarias@free-electrons.com> >> >> Signed-off-by: Gustavo Zacarias <gustavo.zacarias@free-electrons.com> >> --- >> package/botan/botan.mk | 6 +++--- > > botan sneaked in into the same patch. > > Regards, > Arnout > >> package/ed/ed.mk | 4 ++-- >> 2 files changed, 5 insertions(+), 5 deletions(-) >> >> diff --git a/package/botan/botan.mk b/package/botan/botan.mk >> index 69c973e..4da557a 100644 >> --- a/package/botan/botan.mk >> +++ b/package/botan/botan.mk >> @@ -48,15 +48,15 @@ define BOTAN_CONFIGURE_CMDS Also, I think you should pass it in CONFIGURE_CMDS as well - even if botan configure doesn't look at staging dir, it's better for symmetry and for the future. Regards, Arnout >> endef >> >> define BOTAN_BUILD_CMDS >> - $(MAKE) -C $(@D) AR="$(TARGET_AR) crs" >> + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) AR="$(TARGET_AR) crs" >> endef >> >> define BOTAN_INSTALL_STAGING_CMDS >> - $(MAKE) -C $(@D) DESTDIR="$(STAGING_DIR)/usr" install >> + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(STAGING_DIR)/usr" install >> endef >> >> define BOTAN_INSTALL_TARGET_CMDS >> - $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)/usr" install >> + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)/usr" install >> endef >> >> $(eval $(generic-package)) >> diff --git a/package/ed/ed.mk b/package/ed/ed.mk >> index f3bcb74..101be0e 100644 >> --- a/package/ed/ed.mk >> +++ b/package/ed/ed.mk >> @@ -21,11 +21,11 @@ define ED_CONFIGURE_CMDS >> endef >> >> define ED_BUILD_CMDS >> - $(MAKE) -C $(@D) >> + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) >> endef >> >> define ED_INSTALL_TARGET_CMDS >> - $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" install >> + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" install >> endef >> >> $(eval $(generic-package)) >> >
[I'm sorry for reviewing this in pieces...] On 14-10-16 16:45, Arnout Vandecappelle wrote: > > > On 14-10-16 16:41, Arnout Vandecappelle wrote: >> >> >> On 14-10-16 00:13, gustavo.zacarias@free-electrons.com wrote: >>> From: Gustavo Zacarias <gustavo.zacarias@free-electrons.com> >>> >>> Signed-off-by: Gustavo Zacarias <gustavo.zacarias@free-electrons.com> [snip] >>> diff --git a/package/ed/ed.mk b/package/ed/ed.mk >>> index f3bcb74..101be0e 100644 >>> --- a/package/ed/ed.mk >>> +++ b/package/ed/ed.mk >>> @@ -21,11 +21,11 @@ define ED_CONFIGURE_CMDS >>> endef ED_CONFIGURE_CMDS should also get TARGET_MAKE_ENV. It does already get TARGET_CONFIGURE_OPTS, but only as arguments to configure and as far as I can see that script doesn't load the assignment arguments in its environment. Admittedly, the configure script doesn't try to compile anything so it's not strictly needed to export the corrected staging dir, but for consistency it would be better to pass it anyway. Regards, Arnout >>> >>> define ED_BUILD_CMDS >>> - $(MAKE) -C $(@D) >>> + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) >>> endef >>> >>> define ED_INSTALL_TARGET_CMDS >>> - $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" install >>> + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" install >>> endef >>> >>> $(eval $(generic-package)) >>> >> >
diff --git a/package/botan/botan.mk b/package/botan/botan.mk index 69c973e..4da557a 100644 --- a/package/botan/botan.mk +++ b/package/botan/botan.mk @@ -48,15 +48,15 @@ define BOTAN_CONFIGURE_CMDS endef define BOTAN_BUILD_CMDS - $(MAKE) -C $(@D) AR="$(TARGET_AR) crs" + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) AR="$(TARGET_AR) crs" endef define BOTAN_INSTALL_STAGING_CMDS - $(MAKE) -C $(@D) DESTDIR="$(STAGING_DIR)/usr" install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(STAGING_DIR)/usr" install endef define BOTAN_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)/usr" install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)/usr" install endef $(eval $(generic-package)) diff --git a/package/ed/ed.mk b/package/ed/ed.mk index f3bcb74..101be0e 100644 --- a/package/ed/ed.mk +++ b/package/ed/ed.mk @@ -21,11 +21,11 @@ define ED_CONFIGURE_CMDS endef define ED_BUILD_CMDS - $(MAKE) -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) endef define ED_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" install endef $(eval $(generic-package))