TLP/PPS: intro, package cleanup.
cover TLP/PPS: intro, package cleanup.
From: Gustavo Zacarias <[email protected]>
This is the first step in picking up Fabio Porcedda's work ( http://lists.busybox.net/pipermail/buildroot/2015-June/131051.html ) regarding TLP (Top-Level Parallel) support and moving it forward for mainstream buildroot inclusion.
PPS (Per-Package Staging) is the central piece in enabling the configure/build/install of packages simultaneously. Right now packages pick up libraries/includes from a shared (the staging) directory. Once TLP is enabled this is problematic because despite the developers/contributors best efforts not all dependencies are accounted for properly.
When building and installing in parallel a package 'A' can be installing development files (headers/libraries) while package 'B' is configuring, and potentially probing for its dependencies. If package 'B' can use unaccounted dependencies from package 'A' this can be a problem since the feature probe might not be atomic, hence it might find erroneous package 'A' features since the install to the staging area might not be complete when it's doing this.
To avoid this the proposal is to limit the staging directory scope of packages only to the required and requested dependencies. For this to happen packages need a special staging area that fulfills its dependencies, hence overriding its sysroot, which must happen via environment variable overrides (there are a couple of ways to accomplish this, but they all require overrides via env variables).
To accomplish this some packages need a small cleanup, which is passing the $(TARGET_MAKE_ENV) variable which will contain this setup for their build and install steps, to be able to override the default build rules.
Even without PPS/TLP this is required for reproducibility since some packages will build with distro-provided tools instead of buildroot provided ones if the PATH isn't set on make invocation.
The patches are one per package to simplify the review/application process and to make it easy to revert with granularity in case of problems with one or more of them.
Most of the packages were built-tested using the qemu_arm_versatile defconfig with an external toolchain.
Gustavo Zacarias (51):
lsof: use $(TARGET_MAKE_ENV) when calling $(MAKE)
wf111: use $(TARGET_MAKE_ENV) when calling $(MAKE)
p910nd: use $(TARGET_MAKE_ENV) when calling $(MAKE)
lz4: use $(TARGET_MAKE_ENV) when calling $(MAKE)
zlog: use $(TARGET_MAKE_ENV) when calling $(MAKE)
ed: use $(TARGET_MAKE_ENV) when calling $(MAKE)
arptables: use $(TARGET_MAKE_ENV) when calling $(MAKE)
librtas: use $(TARGET_MAKE_ENV) when calling $(MAKE)
wireless_tools: use $(TARGET_MAKE_ENV) when calling $(MAKE)
pifmrds: use $(TARGET_MAKE_ENV) when calling $(MAKE)
hans: use $(TARGET_MAKE_ENV) when calling $(MAKE)
irda-utils: use $(TARGET_MAKE_ENV) when calling $(MAKE)
xvkbd: use $(TARGET_MAKE_ENV) when calling $(MAKE)
tinyalsa: use $(TARGET_MAKE_ENV) when calling $(MAKE)
openssl: use $(TARGET_MAKE_ENV) when calling $(MAKE)
mplayer: use $(TARGET_MAKE_ENV) when calling $(MAKE)
tcping: use $(TARGET_MAKE_ENV) when calling $(MAKE)
ncurses: use $(TARGET_MAKE_ENV) when calling $(MAKE)
smstools3: use $(TARGET_MAKE_ENV) when calling $(MAKE)
rtmpdump: use $(TARGET_MAKE_ENV) when calling $(MAKE)
iputils: use $(TARGET_MAKE_ENV) when calling $(MAKE)
open2300: use $(TARGET_MAKE_ENV) when calling $(MAKE)
opentyrian: use $(TARGET_MAKE_ENV) when calling $(MAKE)
poco: use $(TARGET_MAKE_ENV) when calling $(MAKE)
pppd: use $(TARGET_MAKE_ENV) when calling $(MAKE)
statserial: use $(TARGET_MAKE_ENV) when calling $(MAKE)
ti-utils: use $(TARGET_MAKE_ENV) when calling $(MAKE)
blktrace: use $(TARGET_MAKE_ENV) when calling $(MAKE)
boost: use $(TARGET_MAKE_ENV) when calling $(MAKE)
bsdiff: use $(TARGET_MAKE_ENV) when calling $(MAKE)
feh: use $(TARGET_MAKE_ENV) when calling $(MAKE)
gadgetfs-test: use $(TARGET_MAKE_ENV) when calling $(MAKE)
iw: use $(TARGET_MAKE_ENV) when calling $(MAKE)
jack2: use $(TARGET_MAKE_ENV) when calling $(MAKE)
libnss: use $(TARGET_MAKE_ENV) when calling $(MAKE)
lmbench: use $(TARGET_MAKE_ENV) when calling $(MAKE)
moarvm: use $(TARGET_MAKE_ENV) when calling $(MAKE)
mongoose: use $(TARGET_MAKE_ENV) when calling $(MAKE)
libfreeimage: use $(TARGET_MAKE_ENV) when calling $(MAKE)
live555: use $(TARGET_MAKE_ENV) when calling $(MAKE)
pptp-linux: use $(TARGET_MAKE_ENV) when calling $(MAKE)
unrar: use $(TARGET_MAKE_ENV) when calling $(MAKE)
mtdev2tuio: use $(TARGET_MAKE_ENV) when calling $(MAKE)
ushare: use $(TARGET_MAKE_ENV) when calling $(MAKE)
libtommath: use $(TARGET_MAKE_ENV) when calling $(MAKE)
odhcploc: use $(TARGET_MAKE_ENV) when calling $(MAKE)
espeak: use $(TARGET_MAKE_ENV) when calling $(MAKE)
duma: use $(TARGET_MAKE_ENV) when calling $(MAKE)
aufs-util: use $(TARGET_MAKE_ENV) when calling $(MAKE)
ocrad: use $(TARGET_MAKE_ENV) when calling $(MAKE)
dmidecode: use $(TARGET_MAKE_ENV) when calling $(MAKE)
package/arptables/arptables.mk | 2 +- package/aufs-util/aufs-util.mk | 4 ++-- package/blktrace/blktrace.mk | 4 ++-- package/boost/boost.mk | 6 +++--- package/botan/botan.mk | 6 +++--- package/bsdiff/bsdiff.mk | 4 ++-- package/dmidecode/dmidecode.mk | 4 ++-- package/duma/duma.mk | 6 +++--- package/ed/ed.mk | 4 ++-- package/espeak/espeak.mk | 4 ++-- package/feh/feh.mk | 4 ++-- package/gadgetfs-test/gadgetfs-test.mk | 4 ++-- package/hans/hans.mk | 2 +- package/iputils/iputils.mk | 2 +- package/irda-utils/irda-utils.mk | 2 +- package/iw/iw.mk | 4 +++- package/jack2/jack2.mk | 12 +++++++++--- package/libfreeimage/libfreeimage.mk | 4 ++-- package/libnss/libnss.mk | 4 ++-- package/librtas/librtas.mk | 4 ++-- package/libtommath/libtommath.mk | 4 ++-- package/live555/live555.mk | 6 +++--- package/lmbench/lmbench.mk | 4 ++-- package/lsof/lsof.mk | 2 +- package/lz4/lz4.mk | 6 +++--- package/moarvm/moarvm.mk | 6 +++--- package/mongoose/mongoose.mk | 4 ++-- package/mplayer/mplayer.mk | 4 ++-- package/mtdev2tuio/mtdev2tuio.mk | 2 +- package/ncurses/ncurses.mk | 4 ++-- package/ocrad/ocrad.mk | 6 +++--- package/odhcploc/odhcploc.mk | 4 ++-- package/open2300/open2300.mk | 2 +- package/openssl/openssl.mk | 6 +++--- package/opentyrian/opentyrian.mk | 2 +- package/p910nd/p910nd.mk | 2 +- package/pifmrds/pifmrds.mk | 2 +- package/poco/poco.mk | 6 +++--- package/pppd/pppd.mk | 4 ++-- package/pptp-linux/pptp-linux.mk | 2 +- package/rtmpdump/rtmpdump.mk | 6 +++--- package/smstools3/smstools3.mk | 2 +- package/statserial/statserial.mk | 2 +- package/tcping/tcping.mk | 2 +- package/ti-utils/ti-utils.mk | 2 +- package/tinyalsa/tinyalsa.mk | 2 +- package/unrar/unrar.mk | 4 ++-- package/ushare/ushare.mk | 4 ++-- package/wf111/wf111.mk | 2 +- package/wireless_tools/wireless_tools.mk | 8 ++++---- package/xvkbd/xvkbd.mk | 4 ++-- package/zlog/zlog.mk | 6 +++--- 52 files changed, 108 insertions(+), 100 deletions(-)
Signature · 1 line
2.7.3
PATCH 1/51 lsof: use $(TARGET_MAKE_ENV) when calling $(MAKE)
From: Gustavo Zacarias <[email protected]>
--- package/lsof/lsof.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/lsof/lsof.mk +1 -1
@@ -47,7 +47,7 @@ define LSOF_CONFIGURE_CMDS endef define LSOF_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) DEBUG="$(TARGET_CFLAGS)" -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) DEBUG="$(TARGET_CFLAGS)" -C $(@D) endef define LSOF_INSTALL_TARGET_CMDS
Signature · 1 line
2.7.3
PATCH 1/51 lsof: use $(TARGET_MAKE_ENV) when calling $(MAKE)
Quoted 12 lines · gustavo.zacarias at free-electrons.com
From: Gustavo Zacarias <[email protected]>
Signed-off-by Gustavo Zacarias <[email protected]>--- package/lsof/lsof.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)package/lsof/lsof.mk +0
-0
package/lsof/lsof.mk define LSOF_CONFIGURE_CMDS · line 50
Quoted 5 lines
package/lsof/lsof.mk +1
-1@@ -47,7 +47,7 @@ define LSOF_CONFIGURE_CMDS endef define LSOF_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) DEBUG="$(TARGET_CFLAGS)" -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) DEBUG="$(TARGET_CFLAGS)" -C $(@D)
TARGET_CONFIGURE_OPTS is already there, so TARGET_MAKE_ENV shouldn't be needed
anymore, right? Well, no, wrong: variables passed as arguments to make are not passed down to subprocesses, so we do want to explicitly set it in the environment again.
(Just to be clear: this patch is OK, I just note this in case anyone else is
looking at it.)
Regards,
Arnout
Quoted 4 lines
package/lsof/lsof.mk +0
-0endef define LSOF_INSTALL_TARGET_CMDS
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
PATCH 2/51 wf111: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/wf111/wf111.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/wf111/wf111.mk +1 -1
@@ -25,7 +25,7 @@ endif # separately the build step and the install step and get a correct # behavior. So we do everything in the install step. define WF111_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) PWD=$(@D) \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PWD=$(@D) \ $(LINUX_MAKE_FLAGS) KDIR=$(LINUX_DIR) \ OUTPUT=$(TARGET_DIR) install_static endef
Signature · 1 line
2.7.3
PATCH 3/51 p910nd: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/p910nd/p910nd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/p910nd/p910nd.mk +1 -1
@@ -11,7 +11,7 @@ P910ND_LICENSE = GPLv2 P910ND_LICENSE_FILES = COPYING define P910ND_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) endef define P910ND_INSTALL_TARGET_CMDS
Signature · 1 line
2.7.3
PATCH 4/51 lz4: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/lz4/lz4.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
package/lz4/lz4.mk +3 -3
@@ -27,16 +27,16 @@ define HOST_LZ4_INSTALL_CMDS endef define LZ4_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)/lib + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)/lib endef define LZ4_INSTALL_STAGING_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(STAGING_DIR) \ + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(STAGING_DIR) \ PREFIX=/usr install -C $(@D) endef define LZ4_INSTALL_TARGET_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) \ + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) \ PREFIX=/usr install -C $(@D)/lib endef
Signature · 1 line
2.7.3
PATCH 4/51 lz4: use $(TARGET_MAKE_ENV) when calling $(MAKE)
package/lz4/lz4.mk define HOST_LZ4_INSTALL_CMDS · line 27
Quoted 13 lines · gustavo.zacarias at free-electrons.com
From: Gustavo Zacarias <[email protected]>
Signed-off-by Gustavo Zacarias <[email protected]>--- package/lz4/lz4.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)package/lz4/lz4.mk +0
-0@@ -27,16 +27,16 @@ define HOST_LZ4_INSTALL_CMDS endef
Could you add a patch that does the same for host-lz4 as well?
Regards,
Arnout
Quoted 19 lines
package/lz4/lz4.mk +3
-3define LZ4_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)/lib + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)/lib endef define LZ4_INSTALL_STAGING_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(STAGING_DIR) \ + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(STAGING_DIR) \ PREFIX=/usr install -C $(@D) endef define LZ4_INSTALL_TARGET_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) \ + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) \ PREFIX=/usr install -C $(@D)/lib endef
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
PATCH 4/51 lz4: use $(TARGET_MAKE_ENV) when calling $(MAKE)
Quoted 18 lines · Arnout Vandecappelle
package/lz4/lz4.mk define HOST_LZ4_INSTALL_CMDS · line 27
Quoted 13 lines · gustavo.zacarias at free-electrons.com
From: Gustavo Zacarias <[email protected]>
Signed-off-by Gustavo Zacarias <[email protected]>--- package/lz4/lz4.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)package/lz4/lz4.mk +0
-0@@ -27,16 +27,16 @@ define HOST_LZ4_INSTALL_CMDS endefCould you add a patch that does the same for host-lz4 as well?
Quoted 2 lines
Regards,
Arnout
Hi.
Yes, i'll handle that on a separate series.
Regards.
PATCH 5/51 zlog: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/zlog/zlog.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
package/zlog/zlog.mk +3 -3
@@ -11,16 +11,16 @@ ZLOG_LICENSE_FILES = COPYING ZLOG_INSTALL_STAGING = YES define ZLOG_BUILD_CMDS - $(MAKE1) CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS)" \ + $(TARGET_MAKE_ENV) $(MAKE1) CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS)" \ -C $(@D) all endef define ZLOG_INSTALL_STAGING_CMDS - $(MAKE) PREFIX=$(STAGING_DIR)/usr -C $(@D) install + $(TARGET_MAKE_ENV) $(MAKE) PREFIX=$(STAGING_DIR)/usr -C $(@D) install endef define ZLOG_INSTALL_TARGET_CMDS - $(MAKE) PREFIX=$(TARGET_DIR)/usr -C $(@D) install + $(TARGET_MAKE_ENV) $(MAKE) PREFIX=$(TARGET_DIR)/usr -C $(@D) install endef $(eval $(generic-package))
Signature · 1 line
2.7.3
PATCH 6/51 ed: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/botan/botan.mk | 6 +++--- package/ed/ed.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)
package/botan/botan.mk +3 -3
@@ -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))
package/ed/ed.mk +2 -2
@@ -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))
Signature · 1 line
2.7.3
PATCH 6/51 ed: use $(TARGET_MAKE_ENV) when calling $(MAKE)
Quoted 5 lines · gustavo.zacarias at free-electrons.com
From: Gustavo Zacarias <[email protected]>
Signed-off-by Gustavo Zacarias <[email protected]>--- package/botan/botan.mk | 6 +++---
botan sneaked in into the same patch.
Regards,
Arnout
Quoted 45 lines
package/ed/ed.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)package/botan/botan.mk +3
-3@@ -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))package/ed/ed.mk +2
-2@@ -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))
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
PATCH 6/51 ed: use $(TARGET_MAKE_ENV) when calling $(MAKE)
Quoted 14 lines · Arnout Vandecappelle
Quoted 5 lines · gustavo.zacarias at free-electrons.com
From: Gustavo Zacarias <[email protected]>
Signed-off-by Gustavo Zacarias <[email protected]>--- package/botan/botan.mk | 6 +++---botan sneaked in into the same patch.
Regards,
Arnout
Quoted 8 lines
package/botan/botan.mk define BOTAN_CONFIGURE_CMDS
Quoted 8 lines
package/ed/ed.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)package/botan/botan.mk +0
-0@@ -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
Quoted 38 lines
Quoted 37 lines
package/botan/botan.mk +3
-3endef 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))package/ed/ed.mk +2
-2@@ -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))
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
PATCH 6/51 ed: use $(TARGET_MAKE_ENV) when calling $(MAKE)
[I'm sorry for reviewing this in pieces...]
Quoted 9 lines · Arnout Vandecappelle
Quoted 6 lines · Arnout Vandecappelle
Quoted 3 lines · gustavo.zacarias at free-electrons.com
From: Gustavo Zacarias <[email protected]>
Signed-off-by Gustavo Zacarias <[email protected]>
[snip]
Quoted 6 lines
Quoted 6 lines
package/ed/ed.mk define ED_CONFIGURE_CMDS · line 21
Quoted 6 lines
package/ed/ed.mk +0
-0@@ -21,11 +21,11 @@ define ED_CONFIGURE_CMDS endef
ED_CONFIGURE_CMDS should also get TARGET_MAKE_ENV. It does already getTARGET_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
Quoted 15 lines
Quoted 14 lines
Quoted 13 lines
package/ed/ed.mk +2
-2define 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))
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
PATCH 7/51 arptables: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/arptables/arptables.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/arptables/arptables.mk +1 -1
@@ -10,7 +10,7 @@ ARPTABLES_SITE = http://downloads.sourceforge.net/project/ebtables/arptables/arp ARPTABLES_LICENSE = GPLv2+ define ARPTABLES_BUILD_CMDS - $(MAKE) -C $(@D) \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ CC="$(TARGET_CC)" COPT_FLAGS="$(TARGET_CFLAGS)" endef
Signature · 1 line
2.7.3
PATCH 8/51 librtas: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/librtas/librtas.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
package/librtas/librtas.mk +2 -2
@@ -15,11 +15,11 @@ define LIBRTAS_BUILD_CMDS endef define LIBRTAS_INSTALL_STAGING_CMDS - $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install endef define LIBRTAS_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install endef $(eval $(generic-package))
Signature · 1 line
2.7.3
PATCH 8/51 librtas: use $(TARGET_MAKE_ENV) when calling $(MAKE)
Quoted 12 lines · gustavo.zacarias at free-electrons.com
From: Gustavo Zacarias <[email protected]>
Signed-off-by Gustavo Zacarias <[email protected]>--- package/librtas/librtas.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)package/librtas/librtas.mk +0
-0
package/librtas/librtas.mk define LIBRTAS_BUILD_CMDS · line 18
Quoted 5 lines
package/librtas/librtas.mk +1
-1@@ -15,11 +15,11 @@ define LIBRTAS_BUILD_CMDS endef define LIBRTAS_INSTALL_STAGING_CMDS - $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install
Hm, the LIBRTAS_BUILD_COMMANDS use TARGET_CONFIGURE_OPTS instead ofTARGET_MAKE_ENV. So perhaps it nicer to use TARGET_CONFIGURE_OPTS as well for the install commands?
Regards,
Arnout
Quoted 9 lines
package/librtas/librtas.mk +1
-1endef define LIBRTAS_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install endef $(eval $(generic-package))
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
PATCH 9/51 wireless_tools: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/wireless_tools/wireless_tools.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
package/wireless_tools/wireless_tools.mk +4 -4
@@ -20,20 +20,20 @@ WIRELESS_TOOLS_BUILD_TARGETS += libiw.so.$(WIRELESS_TOOLS_VERSION_MAJOR) WIRELESS_TOOLS_INSTALL_TARGETS += install-dynamic define WIRELESS_TOOLS_INSTALL_STAGING_CMDS - $(MAKE) -C $(@D) PREFIX="$(STAGING_DIR)" LDCONFIG=/bin/true \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX="$(STAGING_DIR)" LDCONFIG=/bin/true \ install-dynamic - $(MAKE) -C $(@D) PREFIX="$(STAGING_DIR)/usr" install-hdr + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX="$(STAGING_DIR)/usr" install-hdr endef endif define WIRELESS_TOOLS_BUILD_CMDS - $(MAKE) -C $(@D) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \ $(WIRELESS_TOOLS_BUILD_TARGETS) endef define WIRELESS_TOOLS_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) PREFIX="$(TARGET_DIR)" LDCONFIG=/bin/true \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX="$(TARGET_DIR)" LDCONFIG=/bin/true \ $(WIRELESS_TOOLS_INSTALL_TARGETS) endef
Signature · 1 line
2.7.3
PATCH 10/51 pifmrds: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/pifmrds/pifmrds.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/pifmrds/pifmrds.mk +1 -1
@@ -11,7 +11,7 @@ PIFMRDS_LICENSE = GPLv3+ PIFMRDS_LICENSE_FILES = LICENSE define PIFMRDS_BUILD_CMDS - $(MAKE) -C $(@D)/src CC="$(TARGET_CC)" LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src CC="$(TARGET_CC)" LDFLAGS="$(TARGET_LDFLAGS)" \ CFLAGS="$(TARGET_CFLAGS) -std=gnu99 -ffast-math -c" \ app rds_wav endef
Signature · 1 line
2.7.3
PATCH 11/51 hans: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/hans/hans.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/hans/hans.mk +1 -1
@@ -10,7 +10,7 @@ HANS_LICENSE = GPLv3+ HANS_LICENSE_FILES = LICENSE define HANS_BUILD_CMDS - $(MAKE) GCC="$(TARGET_CC)" GPP="$(TARGET_CXX)" -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) GCC="$(TARGET_CC)" GPP="$(TARGET_CXX)" -C $(@D) endef define HANS_INSTALL_TARGET_CMDS
Signature · 1 line
2.7.3
PATCH 12/51 irda-utils: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/irda-utils/irda-utils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/irda-utils/irda-utils.mk +1 -1
@@ -15,7 +15,7 @@ IRDA_UTILS_CFLAGS += -DNO_FORK=1 endif define IRDA_UTILS_BUILD_CMDS - $(MAKE) \ + $(TARGET_MAKE_ENV) $(MAKE) \ CC="$(TARGET_CC)" \ CFLAGS="$(IRDA_UTILS_CFLAGS)" \ SYS_INCLUDES= \
Signature · 1 line
2.7.3
PATCH 13/51 xvkbd: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/xvkbd/xvkbd.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
package/xvkbd/xvkbd.mk +2 -2
@@ -12,12 +12,12 @@ XVKBD_LICENSE_FILES = README # Passing USRLIBDIR ensures that the stupid Makefile doesn't add # /usr/lib to the library search path. define XVKBD_BUILD_CMDS - $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ USRLIBDIR="$(STAGING_DIR)/usr/lib" endef define XVKBD_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install endef XVKBD_DEPENDENCIES = \
Signature · 1 line
2.7.3
PATCH 14/51 tinyalsa: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/tinyalsa/tinyalsa.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/tinyalsa/tinyalsa.mk +1 -1
@@ -10,7 +10,7 @@ TINYALSA_LICENSE = BSD-3c TINYALSA_INSTALL_STAGING = YES define TINYALSA_BUILD_CMDS - $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" -C $(@D) endef define TINYALSA_INSTALL_STAGING_CMDS
Signature · 1 line
2.7.3
PATCH 15/51 openssl: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/openssl/openssl.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
package/openssl/openssl.mk +3 -3
@@ -106,11 +106,11 @@ define HOST_OPENSSL_BUILD_CMDS endef define OPENSSL_BUILD_CMDS - $(MAKE) -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) endef define OPENSSL_INSTALL_STAGING_CMDS - $(MAKE) -C $(@D) INSTALL_PREFIX=$(STAGING_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) INSTALL_PREFIX=$(STAGING_DIR) install endef define HOST_OPENSSL_INSTALL_CMDS
@@ -118,7 +118,7 @@ define HOST_OPENSSL_INSTALL_CMDS endef define OPENSSL_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) INSTALL_PREFIX=$(TARGET_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) INSTALL_PREFIX=$(TARGET_DIR) install rm -rf $(TARGET_DIR)/usr/lib/ssl rm -f $(TARGET_DIR)/usr/bin/c_rehash endef
Signature · 1 line
2.7.3
PATCH 15/51 openssl: use $(TARGET_MAKE_ENV) when calling $(MAKE)
package/openssl/openssl.mk define HOST_OPENSSL_BUILD_CMDS · line 106
Quoted 13 lines · gustavo.zacarias at free-electrons.com
From: Gustavo Zacarias <[email protected]>
Signed-off-by Gustavo Zacarias <[email protected]>--- package/openssl/openssl.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)package/openssl/openssl.mk +0
-0@@ -106,11 +106,11 @@ define HOST_OPENSSL_BUILD_CMDS endef
Could you add a patch that does the same for host-openssl as well?
Regards,
Arnout
Quoted 22 lines
package/openssl/openssl.mk +3
-3define OPENSSL_BUILD_CMDS - $(MAKE) -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) endef define OPENSSL_INSTALL_STAGING_CMDS - $(MAKE) -C $(@D) INSTALL_PREFIX=$(STAGING_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) INSTALL_PREFIX=$(STAGING_DIR) install endef define HOST_OPENSSL_INSTALL_CMDS@@ -118,7 +118,7 @@ define HOST_OPENSSL_INSTALL_CMDS endef define OPENSSL_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) INSTALL_PREFIX=$(TARGET_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) INSTALL_PREFIX=$(TARGET_DIR) install rm -rf $(TARGET_DIR)/usr/lib/ssl rm -f $(TARGET_DIR)/usr/bin/c_rehash endef
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
PATCH 16/51 mplayer: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/mplayer/mplayer.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
package/mplayer/mplayer.mk +2 -2
@@ -368,11 +368,11 @@ define MPLAYER_CONFIGURE_CMDS endef define MPLAYER_BUILD_CMDS - $(MAKE) -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) endef define MPLAYER_INSTALL_TARGET_CMDS - $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install + $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install endef $(eval $(generic-package))
Signature · 1 line
2.7.3
PATCH 17/51 tcping: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/tcping/tcping.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/tcping/tcping.mk +1 -1
@@ -10,7 +10,7 @@ TCPING_LICENSE = GPLv3+ TCPING_LICENSE_FILES = LICENSE define TCPING_BUILD_CMDS - $(MAKE) CC="$(TARGET_CC)" CCFLAGS="$(TARGET_CFLAGS) $(TARGET_LDFLAGS)" \ + $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CCFLAGS="$(TARGET_CFLAGS) $(TARGET_LDFLAGS)" \ -C $(@D) tcping.linux endef
Signature · 1 line
2.7.3
PATCH 18/51 ncurses: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/ncurses/ncurses.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
package/ncurses/ncurses.mk +2 -2
@@ -127,9 +127,9 @@ endif # ncurses breaks with parallel build, but takes quite a while to # build single threaded. Work around it similar to how Gentoo does define NCURSES_BUILD_CMDS - $(MAKE1) -C $(@D) DESTDIR=$(STAGING_DIR) sources + $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) DESTDIR=$(STAGING_DIR) sources rm -rf $(@D)/misc/pc-files - $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) endef ifneq ($(BR2_STATIC_LIBS),y)
Signature · 1 line
2.7.3
PATCH 18/51 ncurses: use $(TARGET_MAKE_ENV) when calling $(MAKE)
Quoted 3 lines · gustavo.zacarias at free-electrons.com
From: Gustavo Zacarias <[email protected]>
Signed-off-by Gustavo Zacarias <[email protected]>
Could you add a patch that does the same for host-ncurses as well?
Regards,
Arnout
Quoted 21 lines
--- package/ncurses/ncurses.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)package/ncurses/ncurses.mk +2
-2@@ -127,9 +127,9 @@ endif # ncurses breaks with parallel build, but takes quite a while to # build single threaded. Work around it similar to how Gentoo does define NCURSES_BUILD_CMDS - $(MAKE1) -C $(@D) DESTDIR=$(STAGING_DIR) sources + $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) DESTDIR=$(STAGING_DIR) sources rm -rf $(@D)/misc/pc-files - $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) endef ifneq ($(BR2_STATIC_LIBS),y)
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
PATCH 19/51 smstools3: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/smstools3/smstools3.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/smstools3/smstools3.mk +1 -1
@@ -14,7 +14,7 @@ SMSTOOLS3_CFLAGS += -D NUMBER_OF_MODEMS=$(BR2_PACKAGE_SMSTOOLS3_NB_MODEMS) SMSTOOLS3_CFLAGS += -D NOSTATS define SMSTOOLS3_BUILD_CMDS - $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(SMSTOOLS3_CFLAGS)" -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(SMSTOOLS3_CFLAGS)" -C $(@D) endef define SMSTOOLS3_INSTALL_INIT_SYSV
Signature · 1 line
2.7.3
PATCH 20/51 rtmpdump: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/rtmpdump/rtmpdump.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
package/rtmpdump/rtmpdump.mk +3 -3
@@ -38,7 +38,7 @@ RTMPDUMP_MAKE_FLAGS = \ $(RTMPDUMP_SHARED) define RTMPDUMP_BUILD_CMDS - $(MAKE) $(RTMPDUMP_MAKE_FLAGS) \ + $(TARGET_MAKE_ENV) $(MAKE) $(RTMPDUMP_MAKE_FLAGS) \ XCFLAGS="$(RTMPDUMP_CFLAGS)" \ XLDFLAGS="$(TARGET_LDFLAGS)" \ CROSS_COMPILE="$(TARGET_CROSS)" \
@@ -46,11 +46,11 @@ define RTMPDUMP_BUILD_CMDS endef define RTMPDUMP_INSTALL_STAGING_CMDS - $(MAKE) -C $(@D)/librtmp install DESTDIR=$(STAGING_DIR) $(RTMPDUMP_MAKE_FLAGS) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/librtmp install DESTDIR=$(STAGING_DIR) $(RTMPDUMP_MAKE_FLAGS) endef define RTMPDUMP_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D)/librtmp install DESTDIR=$(TARGET_DIR) $(RTMPDUMP_MAKE_FLAGS) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/librtmp install DESTDIR=$(TARGET_DIR) $(RTMPDUMP_MAKE_FLAGS) endef $(eval $(generic-package))
Signature · 1 line
2.7.3
PATCH 21/51 iputils: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/iputils/iputils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/iputils/iputils.mk +1 -1
@@ -62,7 +62,7 @@ IPUTILS_MAKE_OPTS += USE_CRYPTO=no endif define IPUTILS_BUILD_CMDS - $(MAKE) -C $(@D) $(IPUTILS_MAKE_OPTS) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(IPUTILS_MAKE_OPTS) endef define IPUTILS_INSTALL_TARGET_CMDS
Signature · 1 line
2.7.3
PATCH 22/51 open2300: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/open2300/open2300.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/open2300/open2300.mk +1 -1
@@ -28,7 +28,7 @@ endif endif define OPEN2300_BUILD_CMDS - $(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" \ + $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" \ CFLAGS="$(OPEN2300_CFLAGS)" CC_LDFLAGS="$(OPEN2300_LDFLAGS)" \ -C $(@D) $(OPEN2300_BINS) endef
Signature · 1 line
2.7.3
PATCH 23/51 opentyrian: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/opentyrian/opentyrian.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/opentyrian/opentyrian.mk +1 -1
@@ -20,7 +20,7 @@ OPENTYRIAN_NETWORK = false endif define OPENTYRIAN_BUILD_CMDS - $(MAKE) PLATFORM=UNIX \ + $(TARGET_MAKE_ENV) $(MAKE) PLATFORM=UNIX \ CC="$(TARGET_CC)" \ STRIP="/bin/true" \ SDL_CONFIG="$(STAGING_DIR)/usr/bin/sdl-config" \
Signature · 1 line
2.7.3
PATCH 24/51 poco: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/poco/poco.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
package/poco/poco.mk +3 -3
@@ -58,19 +58,19 @@ define POCO_CONFIGURE_CMDS endef define POCO_BUILD_CMDS - $(MAKE) POCO_TARGET_OSARCH=$(ARCH) CROSS_COMPILE=$(TARGET_CROSS) \ + $(TARGET_MAKE_ENV) $(MAKE) POCO_TARGET_OSARCH=$(ARCH) CROSS_COMPILE=$(TARGET_CROSS) \ MYSQL_LIBDIR=$(STAGING_DIR)/usr/lib/mysql \ MYSQL_INCDIR=$(STAGING_DIR)/usr/include/mysql \ DEFAULT_TARGET=$(POCO_MAKE_TARGET) -C $(@D) endef define POCO_INSTALL_STAGING_CMDS - $(MAKE) DESTDIR=$(STAGING_DIR) POCO_TARGET_OSARCH=$(ARCH) \ + $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(STAGING_DIR) POCO_TARGET_OSARCH=$(ARCH) \ DEFAULT_TARGET=$(POCO_MAKE_TARGET) install -C $(@D) endef define POCO_INSTALL_TARGET_CMDS - $(MAKE) DESTDIR=$(TARGET_DIR) POCO_TARGET_OSARCH=$(ARCH) \ + $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) POCO_TARGET_OSARCH=$(ARCH) \ DEFAULT_TARGET=$(POCO_MAKE_TARGET) install -C $(@D) endef
Signature · 1 line
2.7.3
PATCH 24/51 poco: use $(TARGET_MAKE_ENV) when calling $(MAKE)
package/poco/poco.mk define POCO_CONFIGURE_CMDS · line 58
Quoted 13 lines · gustavo.zacarias at free-electrons.com
From: Gustavo Zacarias <[email protected]>
Signed-off-by Gustavo Zacarias <[email protected]>--- package/poco/poco.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)package/poco/poco.mk +0
-0@@ -58,19 +58,19 @@ define POCO_CONFIGURE_CMDS endef
Again, I think it should be done for configure as well.
Regards,
Arnout
Quoted 22 lines
package/poco/poco.mk +3
-3define POCO_BUILD_CMDS - $(MAKE) POCO_TARGET_OSARCH=$(ARCH) CROSS_COMPILE=$(TARGET_CROSS) \ + $(TARGET_MAKE_ENV) $(MAKE) POCO_TARGET_OSARCH=$(ARCH) CROSS_COMPILE=$(TARGET_CROSS) \ MYSQL_LIBDIR=$(STAGING_DIR)/usr/lib/mysql \ MYSQL_INCDIR=$(STAGING_DIR)/usr/include/mysql \ DEFAULT_TARGET=$(POCO_MAKE_TARGET) -C $(@D) endef define POCO_INSTALL_STAGING_CMDS - $(MAKE) DESTDIR=$(STAGING_DIR) POCO_TARGET_OSARCH=$(ARCH) \ + $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(STAGING_DIR) POCO_TARGET_OSARCH=$(ARCH) \ DEFAULT_TARGET=$(POCO_MAKE_TARGET) install -C $(@D) endef define POCO_INSTALL_TARGET_CMDS - $(MAKE) DESTDIR=$(TARGET_DIR) POCO_TARGET_OSARCH=$(ARCH) \ + $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) POCO_TARGET_OSARCH=$(ARCH) \ DEFAULT_TARGET=$(POCO_MAKE_TARGET) install -C $(@D) endef
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
PATCH 25/51 pppd: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/pppd/pppd.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
package/pppd/pppd.mk +2 -2
@@ -50,7 +50,7 @@ define PPPD_CONFIGURE_CMDS endef define PPPD_BUILD_CMDS - $(MAKE) CC="$(TARGET_CC)" COPTS="$(TARGET_CFLAGS)" \ + $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" COPTS="$(TARGET_CFLAGS)" \ -C $(@D) $(PPPD_MAKE_OPTS) endef
@@ -104,7 +104,7 @@ define PPPD_INSTALL_TARGET_CMDS endef define PPPD_INSTALL_STAGING_CMDS - $(MAKE) INSTROOT=$(STAGING_DIR)/ -C $(@D) $(PPPD_MAKE_OPTS) install-devel + $(TARGET_MAKE_ENV) $(MAKE) INSTROOT=$(STAGING_DIR)/ -C $(@D) $(PPPD_MAKE_OPTS) install-devel endef $(eval $(generic-package))
Signature · 1 line
2.7.3
PATCH 25/51 pppd: use $(TARGET_MAKE_ENV) when calling $(MAKE)
package/pppd/pppd.mk define PPPD_CONFIGURE_CMDS · line 50
Quoted 13 lines · gustavo.zacarias at free-electrons.com
From: Gustavo Zacarias <[email protected]>
Signed-off-by Gustavo Zacarias <[email protected]>--- package/pppd/pppd.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)package/pppd/pppd.mk +0
-0@@ -50,7 +50,7 @@ define PPPD_CONFIGURE_CMDS endef
Again, I think it should be done for configure as well.
Regards,
Arnout
Quoted 17 lines
package/pppd/pppd.mk +2
-2define PPPD_BUILD_CMDS - $(MAKE) CC="$(TARGET_CC)" COPTS="$(TARGET_CFLAGS)" \ + $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" COPTS="$(TARGET_CFLAGS)" \ -C $(@D) $(PPPD_MAKE_OPTS) endef@@ -104,7 +104,7 @@ define PPPD_INSTALL_TARGET_CMDS endef define PPPD_INSTALL_STAGING_CMDS - $(MAKE) INSTROOT=$(STAGING_DIR)/ -C $(@D) $(PPPD_MAKE_OPTS) install-devel + $(TARGET_MAKE_ENV) $(MAKE) INSTROOT=$(STAGING_DIR)/ -C $(@D) $(PPPD_MAKE_OPTS) install-devel endef $(eval $(generic-package))
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
PATCH 26/51 statserial: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/statserial/statserial.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/statserial/statserial.mk +1 -1
@@ -11,7 +11,7 @@ STATSERIAL_LICENSE = GPLv2+ STATSERIAL_LICENSE_FILES = COPYING define STATSERIAL_BUILD_CMDS - $(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D) endef define STATSERIAL_INSTALL_TARGET_CMDS
Signature · 1 line
2.7.3
PATCH 27/51 ti-utils: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/ti-utils/ti-utils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/ti-utils/ti-utils.mk +1 -1
@@ -14,7 +14,7 @@ TI_UTILS_CFLAGS = `$(PKG_CONFIG_HOST_BINARY) --cflags libnl-genl-3.0` TI_UTILS_LIBS = `$(PKG_CONFIG_HOST_BINARY) --libs libnl-genl-3.0` define TI_UTILS_BUILD_CMDS - $(MAKE1) NFSROOT="$(STAGING_DIR)" \ + $(TARGET_MAKE_ENV) $(MAKE1) NFSROOT="$(STAGING_DIR)" \ CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) $(TI_UTILS_CFLAGS)" \ LIBS="$(TI_UTILS_LIBS)" -C $(@D) all endef
Signature · 1 line
2.7.3
PATCH 28/51 blktrace: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/blktrace/blktrace.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
package/blktrace/blktrace.mk +2 -2
@@ -11,11 +11,11 @@ BLKTRACE_LICENSE = GPLv2+ BLKTRACE_LICENSE_FILES = COPYING define BLKTRACE_BUILD_CMDS - $(MAKE1) -C $(@D) $(TARGET_CONFIGURE_OPTS) + $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) $(TARGET_CONFIGURE_OPTS) endef define BLKTRACE_INSTALL_TARGET_CMDS - $(MAKE1) -C $(@D) $(TARGET_CONFIGURE_OPTS) install \ + $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) $(TARGET_CONFIGURE_OPTS) install \ DESTDIR=$(TARGET_DIR) prefix=/usr endef
Signature · 1 line
2.7.3
PATCH 29/51 boost: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/boost/boost.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
package/boost/boost.mk +3 -3
@@ -131,7 +131,7 @@ define BOOST_CONFIGURE_CMDS endef define BOOST_BUILD_CMDS - (cd $(@D) && ./bjam -j$(PARALLEL_JOBS) -q \ + (cd $(@D) && $(TARGET_MAKE_ENV) ./bjam -j$(PARALLEL_JOBS) -q \ --user-config=$(@D)/user-config.jam \ $(BOOST_OPTS) \ --ignore-site-config \
@@ -139,7 +139,7 @@ define BOOST_BUILD_CMDS endef define BOOST_INSTALL_TARGET_CMDS - (cd $(@D) && ./b2 -j$(PARALLEL_JOBS) -q \ + (cd $(@D) && $(TARGET_MAKE_ENV) ./b2 -j$(PARALLEL_JOBS) -q \ --user-config=$(@D)/user-config.jam \ $(BOOST_OPTS) \ --prefix=$(TARGET_DIR)/usr \
@@ -148,7 +148,7 @@ define BOOST_INSTALL_TARGET_CMDS endef define BOOST_INSTALL_STAGING_CMDS - (cd $(@D) && ./bjam -j$(PARALLEL_JOBS) -q \ + (cd $(@D) && $(TARGET_MAKE_ENV) ./bjam -j$(PARALLEL_JOBS) -q \ --user-config=$(@D)/user-config.jam \ $(BOOST_OPTS) \ --prefix=$(STAGING_DIR)/usr \
Signature · 1 line
2.7.3
PATCH 30/51 bsdiff: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/bsdiff/bsdiff.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
package/bsdiff/bsdiff.mk +2 -2
@@ -11,9 +11,9 @@ BSDIFF_LICENSE = BSD-2c BSDIFF_LICENSE_FILES = bsdiff.c define BSDIFF_BUILD_CMDS - $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \ + $(TARGET_MAKE_ENV) $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \ $(@D)/bsdiff.c -lbz2 -o $(@D)/bsdiff - $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \ + $(TARGET_MAKE_ENV) $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \ $(@D)/bspatch.c -lbz2 -o $(@D)/bspatch endef
Signature · 1 line
2.7.3
PATCH 31/51 feh: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/feh/feh.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
package/feh/feh.mk +2 -2
@@ -12,12 +12,12 @@ FEH_LICENSE = MIT FEH_LICENSE_FILES = COPYING define FEH_BUILD_CMDS - $(MAKE1) CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS)" \ + $(TARGET_MAKE_ENV) $(MAKE1) CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS)" \ -C $(@D) all endef define FEH_INSTALL_TARGET_CMDS - $(MAKE1) CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) " \ + $(TARGET_MAKE_ENV) $(MAKE1) CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) " \ PREFIX=/usr DESTDIR=$(TARGET_DIR) -C $(@D) install endef
Signature · 1 line
2.7.3
PATCH 32/51 gadgetfs-test: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/gadgetfs-test/gadgetfs-test.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
package/gadgetfs-test/gadgetfs-test.mk +2 -2
@@ -15,11 +15,11 @@ GADGETFS_TEST_MAKEOPTS += USE_AIO=y endif define GADGETFS_TEST_BUILD_CMDS - $(MAKE) -C $(@D) $(GADGETFS_TEST_MAKEOPTS) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(GADGETFS_TEST_MAKEOPTS) endef define GADGETFS_TEST_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) prefix=/usr install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) prefix=/usr install endef $(eval $(generic-package))
Signature · 1 line
2.7.3
PATCH 33/51 iw: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/iw/iw.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
package/iw/iw.mk +3 -1
@@ -11,7 +11,9 @@ IW_LICENSE = ISC IW_LICENSE_FILES = COPYING IW_DEPENDENCIES = host-pkgconf libnl IW_MAKE_OPTS = CC="$(TARGET_CC)" LD="$(TARGET_LD)" LDFLAGS="$(TARGET_LDFLAGS)" -IW_MAKE_ENV = PKG_CONFIG="$(HOST_DIR)/usr/bin/pkg-config" \ +IW_MAKE_ENV = \ + $(TARGET_MAKE_ENV) \ + PKG_CONFIG="$(HOST_DIR)/usr/bin/pkg-config" \ GIT_DIR=$(IW_DIR) define IW_BUILD_CMDS
Signature · 1 line
2.7.3
PATCH 34/51 jack2: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
In this case in particular it's $(TARGET_CONFIGURE_OPTS), which includes $(TARGET_MAKE_ENV).
--- package/jack2/jack2.mk | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
package/jack2/jack2.mk +9 -3
@@ -53,16 +53,22 @@ define JACK2_CONFIGURE_CMDS endef define JACK2_BUILD_CMDS - (cd $(@D); $(HOST_DIR)/usr/bin/python2 ./waf build -j $(PARALLEL_JOBS)) + (cd $(@D); \ + $(TARGET_CONFIGURE_OPTS) \ + $(HOST_DIR)/usr/bin/python2 ./waf build -j $(PARALLEL_JOBS)) endef define JACK2_INSTALL_TARGET_CMDS - (cd $(@D); $(HOST_DIR)/usr/bin/python2 ./waf --destdir=$(TARGET_DIR) \ + (cd $(@D); \ + $(TARGET_CONFIGURE_OPTS) \ + $(HOST_DIR)/usr/bin/python2 ./waf --destdir=$(TARGET_DIR) \ install) endef define JACK2_INSTALL_STAGING_CMDS - (cd $(@D); $(HOST_DIR)/usr/bin/python2 ./waf --destdir=$(STAGING_DIR) \ + (cd $(@D); \ + $(TARGET_CONFIGURE_OPTS) \ + $(HOST_DIR)/usr/bin/python2 ./waf --destdir=$(STAGING_DIR) \ install) endef
Signature · 1 line
2.7.3
PATCH 34/51 jack2: use $(TARGET_MAKE_ENV) when calling $(MAKE)
Quoted 4 lines · gustavo.zacarias at free-electrons.com
From: Gustavo Zacarias <[email protected]>
In this case in particular it's $(TARGET_CONFIGURE_OPTS), which includes $(TARGET_MAKE_ENV).
Incredible, you predicted http://patchwork.ozlabs.org/patch/682287/ ! Before
that patch, TARGET_CONFIGURE_OPTS did not include TARGET_MAKE_ENV... Or are we missing something?
Regards,
Arnout
Quoted 37 lines
Signed-off-by Gustavo Zacarias <[email protected]>--- package/jack2/jack2.mk | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)package/jack2/jack2.mk +9
-3@@ -53,16 +53,22 @@ define JACK2_CONFIGURE_CMDS endef define JACK2_BUILD_CMDS - (cd $(@D); $(HOST_DIR)/usr/bin/python2 ./waf build -j $(PARALLEL_JOBS)) + (cd $(@D); \ + $(TARGET_CONFIGURE_OPTS) \ + $(HOST_DIR)/usr/bin/python2 ./waf build -j $(PARALLEL_JOBS)) endef define JACK2_INSTALL_TARGET_CMDS - (cd $(@D); $(HOST_DIR)/usr/bin/python2 ./waf --destdir=$(TARGET_DIR) \ + (cd $(@D); \ + $(TARGET_CONFIGURE_OPTS) \ + $(HOST_DIR)/usr/bin/python2 ./waf --destdir=$(TARGET_DIR) \ install) endef define JACK2_INSTALL_STAGING_CMDS - (cd $(@D); $(HOST_DIR)/usr/bin/python2 ./waf --destdir=$(STAGING_DIR) \ + (cd $(@D); \ + $(TARGET_CONFIGURE_OPTS) \ + $(HOST_DIR)/usr/bin/python2 ./waf --destdir=$(STAGING_DIR) \ install) endef
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
PATCH 35/51 libnss: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/libnss/libnss.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
package/libnss/libnss.mk +2 -2
@@ -45,12 +45,12 @@ endif endif define LIBNSS_BUILD_CMDS - $(MAKE1) -C $(@D)/nss coreconf \ + $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D)/nss coreconf \ SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ DIST=$(@D)/$(LIBNSS_DISTDIR) \ CHECKLOC= \ $(LIBNSS_BUILD_VARS) - $(MAKE1) -C $(@D)/nss lib/dbm all \ + $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D)/nss lib/dbm all \ SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ DIST=$(@D)/$(LIBNSS_DISTDIR) \ CHECKLOC= \
Signature · 1 line
2.7.3
PATCH 36/51 lmbench: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/lmbench/lmbench.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
package/lmbench/lmbench.mk +2 -2
@@ -31,11 +31,11 @@ endef # script. So the variables override below don't take direct effect in # src/Makefile. define LMBENCH_BUILD_CMDS - $(MAKE) CFLAGS="$(LMBENCH_CFLAGS)" LDLIBS="$(LMBENCH_LDLIBS)" OS=$(ARCH) CC="$(TARGET_CC)" -C $(@D)/src + $(TARGET_MAKE_ENV) $(MAKE) CFLAGS="$(LMBENCH_CFLAGS)" LDLIBS="$(LMBENCH_LDLIBS)" OS=$(ARCH) CC="$(TARGET_CC)" -C $(@D)/src endef define LMBENCH_INSTALL_TARGET_CMDS - $(MAKE) CFLAGS="$(TARGET_CFLAGS)" OS=$(ARCH) CC="$(TARGET_CC)" BASE=$(TARGET_DIR)/usr -C $(@D)/src install + $(TARGET_MAKE_ENV) $(MAKE) CFLAGS="$(TARGET_CFLAGS)" OS=$(ARCH) CC="$(TARGET_CC)" BASE=$(TARGET_DIR)/usr -C $(@D)/src install endef $(eval $(generic-package))
Signature · 1 line
2.7.3
PATCH 37/51 moarvm: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/moarvm/moarvm.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
package/moarvm/moarvm.mk +3 -3
@@ -33,15 +33,15 @@ define MOARVM_CONFIGURE_CMDS endef define MOARVM_BUILD_CMDS - $(MAKE) -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) endef define MOARVM_INSTALL_STAGING_CMDS - $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install endef define MOARVM_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install endef $(eval $(generic-package))
Signature · 1 line
2.7.3
PATCH 37/51 moarvm: use $(TARGET_MAKE_ENV) when calling $(MAKE)
package/moarvm/moarvm.mk define MOARVM_CONFIGURE_CMDS · line 33
Quoted 13 lines · gustavo.zacarias at free-electrons.com
From: Gustavo Zacarias <[email protected]>
Signed-off-by Gustavo Zacarias <[email protected]>--- package/moarvm/moarvm.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)package/moarvm/moarvm.mk +0
-0@@ -33,15 +33,15 @@ define MOARVM_CONFIGURE_CMDS endef
Again, I think the configure commands should get TARGET_MAKE_ENV as well.
Regards,
Arnout
Quoted 18 lines
package/moarvm/moarvm.mk +3
-3define MOARVM_BUILD_CMDS - $(MAKE) -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) endef define MOARVM_INSTALL_STAGING_CMDS - $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install endef define MOARVM_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install endef $(eval $(generic-package))
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
PATCH 38/51 mongoose: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/mongoose/mongoose.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
package/mongoose/mongoose.mk +2 -2
@@ -19,8 +19,8 @@ MONGOOSE_CFLAGS += -DNS_ENABLE_SSL -lssl -lcrypto -lz endif define MONGOOSE_BUILD_CMDS - $(TARGET_CC) -c $(@D)/mongoose.c $(MONGOOSE_CFLAGS) -o $(@D)/mongoose.o - $(TARGET_AR) rcs $(@D)/libmongoose.a $(@D)/mongoose.o + $(TARGET_MAKE_ENV) $(TARGET_CC) -c $(@D)/mongoose.c $(MONGOOSE_CFLAGS) -o $(@D)/mongoose.o + $(TARGET_MAKE_ENV) $(TARGET_AR) rcs $(@D)/libmongoose.a $(@D)/mongoose.o endef define MONGOOSE_INSTALL_STAGING_CMDS
Signature · 1 line
2.7.3
PATCH 39/51 libfreeimage: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/libfreeimage/libfreeimage.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
package/libfreeimage/libfreeimage.mk +2 -2
@@ -22,11 +22,11 @@ define LIBFREEIMAGE_BUILD_CMDS endef define LIBFREEIMAGE_INSTALL_STAGING_CMDS - $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install endef define LIBFREEIMAGE_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install endef $(eval $(generic-package))
Signature · 1 line
2.7.3
PATCH 40/51 live555: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/live555/live555.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
package/live555/live555.mk +3 -3
@@ -41,15 +41,15 @@ define LIVE555_CONFIGURE_CMDS endef define LIVE555_BUILD_CMDS - $(MAKE) -C $(@D) all + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) all endef define LIVE555_INSTALL_STAGING_CMDS - $(MAKE) DESTDIR=$(STAGING_DIR) -C $(@D) install + $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(STAGING_DIR) -C $(@D) install endef define LIVE555_INSTALL_TARGET_CMDS - $(MAKE) DESTDIR=$(TARGET_DIR) PREFIX=/usr -C $(@D) install + $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) PREFIX=/usr -C $(@D) install endef $(eval $(generic-package))
Signature · 1 line
2.7.3
PATCH 41/51 pptp-linux: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/pptp-linux/pptp-linux.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/pptp-linux/pptp-linux.mk +1 -1
@@ -12,7 +12,7 @@ PPTP_LINUX_LICENSE = GPLv2+ PPTP_LINUX_LICENSE_FILES = COPYING define PPTP_LINUX_BUILD_CMDS - $(MAKE) -C $(@D) OPTIMIZE= DEBUG= \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) OPTIMIZE= DEBUG= \ CC="$(TARGET_CC)" \ CFLAGS="$(TARGET_CFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS)" \
Signature · 1 line
2.7.3
PATCH 42/51 unrar: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/unrar/unrar.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
package/unrar/unrar.mk +2 -2
@@ -11,13 +11,13 @@ UNRAR_LICENSE = unrar UNRAR_LICENSE_FILES = license.txt define UNRAR_BUILD_CMDS - $(MAKE) CXX="$(TARGET_CXX)" STRIP="/bin/true" \ + $(TARGET_MAKE_ENV) $(MAKE) CXX="$(TARGET_CXX)" STRIP="/bin/true" \ CXXFLAGS="$(TARGET_CXXFLAGS) -pthread" \ LDFLAGS="$(TARGET_LDFLAGS) -pthread" -C $(@D) endef define UNRAR_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))
Signature · 1 line
2.7.3
PATCH 43/51 mtdev2tuio: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/mtdev2tuio/mtdev2tuio.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/mtdev2tuio/mtdev2tuio.mk +1 -1
@@ -13,7 +13,7 @@ MTDEV2TUIO_LICENSE_FILES = COPYING # mtdev2tuio Makefile misuses $(LD) as gcc, so we need to override LD # here. Liblo uses log(3), so we need to link with -lm define MTDEV2TUIO_BUILD_CMDS - $(MAKE) \ + $(TARGET_MAKE_ENV) $(MAKE) \ $(TARGET_CONFIGURE_OPTS) \ LD="$(TARGET_CC)" \ LIBS="-lmtdev -llo -lm" \
Signature · 1 line
2.7.3
PATCH 44/51 ushare: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/ushare/ushare.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
package/ushare/ushare.mk +2 -2
@@ -26,11 +26,11 @@ define USHARE_CONFIGURE_CMDS endef define USHARE_BUILD_CMDS - $(MAKE) LDFLAGS="$(TARGET_LDFLAGS) $(USHARE_LDFLAGS)" -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) LDFLAGS="$(TARGET_LDFLAGS) $(USHARE_LDFLAGS)" -C $(@D) endef define USHARE_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install rm -f $(TARGET_DIR)/etc/init.d/ushare endef
Signature · 1 line
2.7.3
PATCH 45/51 libtommath: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/libtommath/libtommath.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
package/libtommath/libtommath.mk +2 -2
@@ -13,11 +13,11 @@ LIBTOMMATH_INSTALL_STAGING = YES LIBTOMMATH_INSTALL_TARGET = NO # only static library define LIBTOMMATH_BUILD_CMDS - $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) CFLAGS="-I./ -fPIC $(TARGET_CFLAGS)" + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) CFLAGS="-I./ -fPIC $(TARGET_CFLAGS)" endef define LIBTOMMATH_INSTALL_STAGING_CMDS - $(MAKE) -C $(@D) DESTDIR="$(STAGING_DIR)" install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(STAGING_DIR)" install endef $(eval $(generic-package))
Signature · 1 line
2.7.3
PATCH 46/51 odhcploc: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/odhcploc/odhcploc.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
package/odhcploc/odhcploc.mk +2 -2
@@ -10,11 +10,11 @@ ODHCPLOC_LICENSE = ISC ODHCPLOC_LICENSE_FILES = COPYING define ODHCPLOC_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all endef define ODHCPLOC_INSTALL_TARGET_CMDS - $(MAKE) PREFIX=/usr DESTDIR=$(TARGET_DIR) -C $(@D) install + $(TARGET_MAKE_ENV) $(MAKE) PREFIX=/usr DESTDIR=$(TARGET_DIR) -C $(@D) install endef $(eval $(generic-package))
Signature · 1 line
2.7.3
PATCH 47/51 espeak: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/espeak/espeak.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
package/espeak/espeak.mk +2 -2
@@ -32,12 +32,12 @@ define ESPEAK_CONFIGURE_CMDS endef define ESPEAK_BUILD_CMDS - $(MAKE) -C $(@D)/src $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src $(TARGET_CONFIGURE_OPTS) \ AUDIO="$(ESPEAK_AUDIO_BACKEND)" all endef define ESPEAK_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D)/src DESTDIR="$(TARGET_DIR)" install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src DESTDIR="$(TARGET_DIR)" install endef $(eval $(generic-package))
Signature · 1 line
2.7.3
PATCH 48/51 duma: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/duma/duma.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
package/duma/duma.mk +3 -3
@@ -18,18 +18,18 @@ DUMA_OPTIONS = \ # The dependency of some source files in duma_config.h, which is generated at # build time, is not specified in the Makefile. Force non-parallel build. define DUMA_BUILD_CMDS - $(MAKE1) $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_MAKE_ENV) $(MAKE1) $(TARGET_CONFIGURE_OPTS) \ OS=linux \ DUMA_OPTIONS="$(DUMA_OPTIONS)" \ $(DUMA_CPP) -C $(@D) endef define DUMA_INSTALL_STAGING_CMDS - $(MAKE) OS=linux prefix=$(STAGING_DIR)/usr install -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) OS=linux prefix=$(STAGING_DIR)/usr install -C $(@D) endef define DUMA_INSTALL_TARGET_CMDS - $(MAKE) OS=linux prefix=$(TARGET_DIR)/usr install -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) OS=linux prefix=$(TARGET_DIR)/usr install -C $(@D) endef $(eval $(generic-package))
Signature · 1 line
2.7.3
PATCH 49/51 aufs-util: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/aufs-util/aufs-util.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
package/aufs-util/aufs-util.mk +2 -2
@@ -46,14 +46,14 @@ define AUFS_UTIL_BUILD_CMDS CPPFLAGS="$(AUFS_UTIL_HOST_CPPFLAGS)" \ HOSTCC="$(HOSTCC)" HOSTLD="$(HOSTLD)" \ INSTALL="$(INSTALL)" c2sh c2tmac - $(MAKE1) -C $(@D) \ + $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) \ $(TARGET_CONFIGURE_OPTS) \ CPPFLAGS="$(AUFS_UTIL_CPPFLAGS)" \ INSTALL="$(INSTALL)" all endef define AUFS_UTIL_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) INSTALL="$(INSTALL)" DESTDIR="$(TARGET_DIR)" install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) INSTALL="$(INSTALL)" DESTDIR="$(TARGET_DIR)" install endef $(eval $(generic-package))
Signature · 1 line
2.7.3
PATCH 50/51 ocrad: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/ocrad/ocrad.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
package/ocrad/ocrad.mk +3 -3
@@ -17,15 +17,15 @@ define OCRAD_CONFIGURE_CMDS endef define OCRAD_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) endef define OCRAD_INSTALL_STAGING_CMDS - $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install endef define OCRAD_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install endef $(eval $(generic-package))
Signature · 1 line
2.7.3
PATCH 50/51 ocrad: use $(TARGET_MAKE_ENV) when calling $(MAKE)
package/ocrad/ocrad.mk define OCRAD_CONFIGURE_CMDS · line 17
Quoted 13 lines · gustavo.zacarias at free-electrons.com
From: Gustavo Zacarias <[email protected]>
Signed-off-by Gustavo Zacarias <[email protected]>--- package/ocrad/ocrad.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)package/ocrad/ocrad.mk +0
-0@@ -17,15 +17,15 @@ define OCRAD_CONFIGURE_CMDS endef
Again, should be done for configure as well. Even though the configure script
doesn't call the compiler at the moment, it might in the future.
Regards,
Arnout
Quoted 18 lines
package/ocrad/ocrad.mk +3
-3define OCRAD_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) endef define OCRAD_INSTALL_STAGING_CMDS - $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install endef define OCRAD_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install endef $(eval $(generic-package))
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
PATCH 51/51 dmidecode: use $(TARGET_MAKE_ENV) when calling $(MAKE)
In reply to gustavo.zacarias at free-electrons.comFrom: Gustavo Zacarias <[email protected]>
--- package/dmidecode/dmidecode.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
package/dmidecode/dmidecode.mk +2 -2
@@ -11,11 +11,11 @@ DMIDECODE_LICENSE = GPLv2+ DMIDECODE_LICENSE_FILES = LICENSE define DMIDECODE_BUILD_CMDS - $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) endef define DMIDECODE_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) prefix=/usr DESTDIR=$(TARGET_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) prefix=/usr DESTDIR=$(TARGET_DIR) install endef $(eval $(generic-package))
Signature · 1 line
2.7.3
cover TLP/PPS: intro, package cleanup.
In reply to gustavo.zacarias at free-electrons.comHi Gustavo,
Quoted 7 lines · gustavo.zacarias at free-electrons.com
From: Gustavo Zacarias <[email protected]>
This is the first step in picking up Fabio Porcedda's work ( http://lists.busybox.net/pipermail/buildroot/2015-June/131051.html ) regarding TLP (Top-Level Parallel) support and moving it forward for mainstream buildroot inclusion.
Quoted 15 lines
PPS (Per-Package Staging) is the central piece in enabling the configure/build/install of packages simultaneously. Right now packages pick up libraries/includes from a shared (the staging) directory. Once TLP is enabled this is problematic because despite the developers/contributors best efforts not all dependencies are accounted for properly.
When building and installing in parallel a package 'A' can be installing development files (headers/libraries) while package 'B' is configuring, and potentially probing for its dependencies. If package 'B' can use unaccounted dependencies from package 'A' this can be a problem since the feature probe might not be atomic, hence it might find erroneous package 'A' features since the install to the staging area might not be complete when it's doing this.
To avoid this the proposal is to limit the staging directory scope of packages only to the required and requested dependencies.
Note that it's not enough to do it for staging, host needs it as well.
Quoted 9 lines
For this to happen packages need a special staging area that fulfills its dependencies, hence overriding its sysroot, which must happen via environment variable overrides (there are a couple of ways to accomplish this, but they all require overrides via env variables).
To accomplish this some packages need a small cleanup, which is passing the $(TARGET_MAKE_ENV) variable which will contain this setup for their build and install steps, to be able to override the default build rules.
Actually, I think it's better/safer/easier to just do a global export from theMakefile:
export BR2_STAGING_DIR = $($(PKG)_STAGING_DIR)
and perhaps also
_STAGING_DIR = $(STAGING_DIR)
to allow it to be used outside package build rules as well.
Quoted 3 lines · That
Even without PPS/TLP this is required for reproducibility since some packages will build with distro-provided tools instead of buildroot provided ones if the PATH isn't set on make invocation.
So this series should still be applied.
Quoted 4 lines
The patches are one per package to simplify the review/application process and to make it easy to revert with granularity in case of problems with one or more of them.
Great work!
As you saw, I reviewed them and had some comments on some of them. Actually
there were mainly two categories:
- TARGET_MAKE_ENV should also be applied to configure. In most cases it is probably not strictly needed because the configure script doesn't compile anything, but I think it's better for consistency to do it anyway. If you have arguments to the contrary, feel free to tell them.
- Same patch should be applied to host. That is for two reasons: for TLP, we'll need to pass a per-package host-dir as well (except if the global export that I propose is used); and the reproducibility argument also applies to host packages. And of course, it's better to keep the host and target part consistent. I commented on the patches you already posted where the host bit is missing, but probably there are other host packages that are missing it as well... Anyway, the host part can be done in a separate patch so this is not blocking acceptance of those patches.
I give my
to the remaining patches. I've created a bundle with those:
http://patchwork.ozlabs.org/bundle/arnout/gustavoz_target_make_env/
Regards,
Arnout
Quoted 111 lines
Most of the packages were built-tested using the
qemu_arm_versatiledefconfig with an external toolchain.Gustavo Zacarias (51):
lsof: use $(TARGET_MAKE_ENV) when calling $(MAKE)
wf111: use $(TARGET_MAKE_ENV) when calling $(MAKE)
p910nd: use $(TARGET_MAKE_ENV) when calling $(MAKE)
lz4: use $(TARGET_MAKE_ENV) when calling $(MAKE)
zlog: use $(TARGET_MAKE_ENV) when calling $(MAKE)
ed: use $(TARGET_MAKE_ENV) when calling $(MAKE)
arptables: use $(TARGET_MAKE_ENV) when calling $(MAKE)
librtas: use $(TARGET_MAKE_ENV) when calling $(MAKE)
wireless_tools: use $(TARGET_MAKE_ENV) when calling $(MAKE)
pifmrds: use $(TARGET_MAKE_ENV) when calling $(MAKE)
hans: use $(TARGET_MAKE_ENV) when calling $(MAKE)
irda-utils: use $(TARGET_MAKE_ENV) when calling $(MAKE)
xvkbd: use $(TARGET_MAKE_ENV) when calling $(MAKE)
tinyalsa: use $(TARGET_MAKE_ENV) when calling $(MAKE)
openssl: use $(TARGET_MAKE_ENV) when calling $(MAKE)
mplayer: use $(TARGET_MAKE_ENV) when calling $(MAKE)
tcping: use $(TARGET_MAKE_ENV) when calling $(MAKE)
ncurses: use $(TARGET_MAKE_ENV) when calling $(MAKE)
smstools3: use $(TARGET_MAKE_ENV) when calling $(MAKE)
rtmpdump: use $(TARGET_MAKE_ENV) when calling $(MAKE)
iputils: use $(TARGET_MAKE_ENV) when calling $(MAKE)
open2300: use $(TARGET_MAKE_ENV) when calling $(MAKE)
opentyrian: use $(TARGET_MAKE_ENV) when calling $(MAKE)
poco: use $(TARGET_MAKE_ENV) when calling $(MAKE)
pppd: use $(TARGET_MAKE_ENV) when calling $(MAKE)
statserial: use $(TARGET_MAKE_ENV) when calling $(MAKE)
ti-utils: use $(TARGET_MAKE_ENV) when calling $(MAKE)
blktrace: use $(TARGET_MAKE_ENV) when calling $(MAKE)
boost: use $(TARGET_MAKE_ENV) when calling $(MAKE)
bsdiff: use $(TARGET_MAKE_ENV) when calling $(MAKE)
feh: use $(TARGET_MAKE_ENV) when calling $(MAKE)
gadgetfs-test: use $(TARGET_MAKE_ENV) when calling $(MAKE)
iw: use $(TARGET_MAKE_ENV) when calling $(MAKE)
jack2: use $(TARGET_MAKE_ENV) when calling $(MAKE)
libnss: use $(TARGET_MAKE_ENV) when calling $(MAKE)
lmbench: use $(TARGET_MAKE_ENV) when calling $(MAKE)
moarvm: use $(TARGET_MAKE_ENV) when calling $(MAKE)
mongoose: use $(TARGET_MAKE_ENV) when calling $(MAKE)
libfreeimage: use $(TARGET_MAKE_ENV) when calling $(MAKE)
live555: use $(TARGET_MAKE_ENV) when calling $(MAKE)
pptp-linux: use $(TARGET_MAKE_ENV) when calling $(MAKE)
unrar: use $(TARGET_MAKE_ENV) when calling $(MAKE)
mtdev2tuio: use $(TARGET_MAKE_ENV) when calling $(MAKE)
ushare: use $(TARGET_MAKE_ENV) when calling $(MAKE)
libtommath: use $(TARGET_MAKE_ENV) when calling $(MAKE)
odhcploc: use $(TARGET_MAKE_ENV) when calling $(MAKE)
espeak: use $(TARGET_MAKE_ENV) when calling $(MAKE)
duma: use $(TARGET_MAKE_ENV) when calling $(MAKE)
aufs-util: use $(TARGET_MAKE_ENV) when calling $(MAKE)
ocrad: use $(TARGET_MAKE_ENV) when calling $(MAKE)
dmidecode: use $(TARGET_MAKE_ENV) when calling $(MAKE)package/arptables/arptables.mk | 2 +- package/aufs-util/aufs-util.mk | 4 ++-- package/blktrace/blktrace.mk | 4 ++-- package/boost/boost.mk | 6 +++--- package/botan/botan.mk | 6 +++--- package/bsdiff/bsdiff.mk | 4 ++-- package/dmidecode/dmidecode.mk | 4 ++-- package/duma/duma.mk | 6 +++--- package/ed/ed.mk | 4 ++-- package/espeak/espeak.mk | 4 ++-- package/feh/feh.mk | 4 ++-- package/gadgetfs-test/gadgetfs-test.mk | 4 ++-- package/hans/hans.mk | 2 +- package/iputils/iputils.mk | 2 +- package/irda-utils/irda-utils.mk | 2 +- package/iw/iw.mk | 4 +++- package/jack2/jack2.mk | 12 +++++++++--- package/libfreeimage/libfreeimage.mk | 4 ++-- package/libnss/libnss.mk | 4 ++-- package/librtas/librtas.mk | 4 ++-- package/libtommath/libtommath.mk | 4 ++-- package/live555/live555.mk | 6 +++--- package/lmbench/lmbench.mk | 4 ++-- package/lsof/lsof.mk | 2 +- package/lz4/lz4.mk | 6 +++--- package/moarvm/moarvm.mk | 6 +++--- package/mongoose/mongoose.mk | 4 ++-- package/mplayer/mplayer.mk | 4 ++-- package/mtdev2tuio/mtdev2tuio.mk | 2 +- package/ncurses/ncurses.mk | 4 ++-- package/ocrad/ocrad.mk | 6 +++--- package/odhcploc/odhcploc.mk | 4 ++-- package/open2300/open2300.mk | 2 +- package/openssl/openssl.mk | 6 +++--- package/opentyrian/opentyrian.mk | 2 +- package/p910nd/p910nd.mk | 2 +- package/pifmrds/pifmrds.mk | 2 +- package/poco/poco.mk | 6 +++--- package/pppd/pppd.mk | 4 ++-- package/pptp-linux/pptp-linux.mk | 2 +- package/rtmpdump/rtmpdump.mk | 6 +++--- package/smstools3/smstools3.mk | 2 +- package/statserial/statserial.mk | 2 +- package/tcping/tcping.mk | 2 +- package/ti-utils/ti-utils.mk | 2 +- package/tinyalsa/tinyalsa.mk | 2 +- package/unrar/unrar.mk | 4 ++-- package/ushare/ushare.mk | 4 ++-- package/wf111/wf111.mk | 2 +- package/wireless_tools/wireless_tools.mk | 8 ++++---- package/xvkbd/xvkbd.mk | 4 ++-- package/zlog/zlog.mk | 6 +++--- 52 files changed, 108 insertions(+), 100 deletions(-)
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
cover TLP/PPS: intro, package cleanup.
Hello,
Quoted 4 lines · Arnout Vandecappelle
I give my
to the remaining patches. I've created a bundle with those:
http://patchwork.ozlabs.org/bundle/arnout/gustavoz_target_make_env/
Thanks, all applied! I've added your Reviewed-by on all commits when applying.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com
cover TLP/PPS: intro, package cleanup.
In reply to Arnout VandecappelleQuoted 27 lines · Arnout Vandecappelle
Hi Gustavo,
Quoted 7 lines · gustavo.zacarias at free-electrons.com
From: Gustavo Zacarias <[email protected]>
This is the first step in picking up Fabio Porcedda's work ( http://lists.busybox.net/pipermail/buildroot/2015-June/131051.html ) regarding TLP (Top-Level Parallel) support and moving it forward for mainstream buildroot inclusion.
Quoted 16 lines
PPS (Per-Package Staging) is the central piece in enabling the configure/build/install of packages simultaneously. Right now packages pick up libraries/includes from a shared (the staging) directory. Once TLP is enabled this is problematic because despite the developers/contributors best efforts not all dependencies are accounted
for properly.
When building and installing in parallel a package 'A' can be installing development files (headers/libraries) while package 'B' is configuring, and potentially probing for its dependencies. If package 'B' can use unaccounted dependencies from package 'A' this can be a problem since the feature probe might not be atomic, hence it might find erroneous package 'A' features since the install to the staging area might not be complete when it's doing this.
To avoid this the proposal is to limit the staging directory scope of packages only to the required and requested dependencies.
Quoted 1 line
Note that it's not enough to do it for staging, host needs it as well.
Hi Arnout.
Indeed, i'll be sending a new series that handles more target package fixes, addressed the ones from the previous series that needed fixes and does so for host packages as well.
For host packages i call this PPH (Per-Package Host directory/area), i'm working on PPS first and then i'll move on to PPH.
And then there's PPL (Per-Package Logging) since looking at the output when building TLP makes debugging very hard, so having a per-package configure/build/install/etc log will make life easier (with a decent playback when things go bad).
Quoted 14 lines
Quoted 9 lines
For this to happen packages need a special staging area that fulfills its dependencies, hence overriding its sysroot, which must happen via environment variable overrides (there are a couple of ways to accomplish this, but they all require overrides via env variables).
To accomplish this some packages need a small cleanup, which is passing the $(TARGET_MAKE_ENV) variable which will contain this setup for their build and install steps, to be able to override the default build rules.
Actually, I think it's better/safer/easier to just do a global export
from theMakefile:
Quoted 7 lines
export
BR2_STAGING_DIR= $($(PKG)_STAGING_DIR)and perhaps also
_STAGING_DIR= $(STAGING_DIR)to allow it to be used outside package build rules as well.
I'm toying with the idea of a sandbox as well that will just restrict the view of the full staging area per-package to the dependencies it needs (LD_PRELOADed).
This would alleviate the overhead in copying/linking all those files, but it's a bit more complex.
Regards.
cover TLP/PPS: intro, package cleanup.
On 17-10-16 18:02, Gustavo Zacarias wrote:
[snip]
Quoted 4 lines
And then there's PPL (Per-Package Logging) since looking at the output when building TLP makes debugging very hard, so having a per-package configure/build/install/etc log will make life easier (with a decent playback when things go bad).
Would be great, but isn't that super-complicated or wouldn't it require major
surgery to the infrastructure? You'd need to somehow amend the _CMDS to redirect their output, or run every package in a separate sub-make, or something like that...
[snip]
Quoted 4 lines
I'm toying with the idea of a sandbox as well that will just restrict the view of the full staging area per-package to the dependencies it needs (
LD_PRELOADed). This would alleviate the overhead in copying/linking all those files, but it's a bit more complex.
Yeah, perhaps we should use bitbake instead of make :-P
Regards,
Arnout
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
cover TLP/PPS: intro, package cleanup.
Quoted 8 lines
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Arnout" == Arnout Vandecappelle <[email protected]> writes:
I'm toying with the idea of a sandbox as well that will just restrict the view of the full staging area per-package to the dependencies it needs (
LD_PRELOADed). This would alleviate the overhead in copying/linking all those files, but it's a bit more complex.Yeah, perhaps we should use bitbake instead of make :-P
Argh!
Signature · 1 line
Bye, Peter Korsgaard
cover TLP/PPS: intro, package cleanup.
In reply to Arnout VandecappelleHello Arnoult,
Quoted 8 lines · On Monday 17 October 2016 18:52:43 Arnout Vandecappelle wrote:
On 17-10-16 18:02, Gustavo Zacarias wrote:
[snip]Quoted 4 lines
And then there's PPL (Per-Package Logging) since looking at the output when building TLP makes debugging very hard, so having a per-package configure/build/install/etc log will make life easier (with a decent playback when things go bad).
Quoted 4 lines
Would be great, but isn't that super-complicated or wouldn't it
require major surgery to the infrastructure? You'd need to somehow amend the_CMDSto redirect their output, or run every package in a separate sub-make, or something like that...
Even if I think it can't be an official solution, some time ago I suggested a hack to redirect output of Buildroot in separate log files:
http://lists.busybox.net/pipermail/buildroot/2014-November/112991.html
I think it should also work with top level parallelization.
BR,
Signature · 3 lines
J?r?me Pouiller, Sysmic Embedded Linux specialist http://www.sysmic.fr
cover TLP/PPS: intro, package cleanup.
Quoted 16 lines · J?r?me Pouiller
Hello Arnoult,
Quoted 8 lines · On Monday 17 October 2016 18:52:43 Arnout Vandecappelle wrote:
On 17-10-16 18:02, Gustavo Zacarias wrote:
[snip]Quoted 4 lines
And then there's PPL (Per-Package Logging) since looking at the output when building TLP makes debugging very hard, so having a per-package configure/build/install/etc log will make life easier (with a decent playback when things go bad).
Quoted 4 lines
Would be great, but isn't that super-complicated or wouldn't it
require major surgery to the infrastructure? You'd need to somehow amend the_CMDSto redirect their output, or run every package in a separate sub-make, or something like that...
Quoted 6 lines
Even if I think it can't be an official solution, some time ago I suggested a hack to redirect output of Buildroot in separate log files:
http://lists.busybox.net/pipermail/buildroot/2014-November/112991.html
I think it should also work with top level parallelization.
I don't think it will, because $$PPID will be the same make process for all
packages that are built in parallel. So when starting the build of package 1, you're redirecting to logfile 1; as soon as package 2 starts to build, the output is redirected to logfile 2, so any new process spawned for package 1 will also be redirected. It will probably seem to work in many cases, because _BUILD_CMDS typically contains only a single call to $(MAKE) and that *probably* gets executed before the hook of package 2 is called. But I think you will get some occasional weird mixups of different packages.
But I have thought of a possible approach:
export BR_CURRENT_LOGFILE = $(BUILD_DIR)/$($(PKG)_RAWNAME).log export SHELL = $(TOPDIR)/support/scripts/shell_logwrapper
and in shell_logwrapper:
exec >> $(BR_CURRENT_LOGFILE) 2>&1
exec /bin/bash "$@"
Regards,
Arnout
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
cover TLP/PPS: intro, package cleanup.
Quoted 10 lines · Arnout Vandecappelle
I don't think it will, because $$PPID will be the same make process for all
packages that are built in parallel. So when starting the build of package 1, you're redirecting to logfile 1; as soon as package 2 starts to build, the output is redirected to logfile 2, so any new process spawned for package 1 will also be redirected. It will probably seem to work in many cases, because_BUILD_CMDStypically contains only a single call to $(MAKE) and that *probably* gets executed before the hook of package 2 is called. But I think you will get some occasional weird mixups of different packages.
Quoted 4 lines
But I have thought of a possible approach:
export
BR_CURRENT_LOGFILE= $(BUILD_DIR)/$($(PKG)_RAWNAME).log export SHELL = $(TOPDIR)/support/scripts/shell_logwrapper
Hi Arnout.
I'd use $($(PKG)_NAME).log or you risk the host/target packages writing the same log file at the same time, besides a single file being more "noisy".
Quoted 4 lines
and in
shell_logwrapper:exec >> $(BR_CURRENT_LOGFILE) 2>&1
exec/bin/bash"$@"
This generally results in a forkbomb, it should work, but it doesn't :) Using exec file descriptor copying results in the same forkbomb. But i've got an alternative, RFC/test patchset incoming.
Regards.
cover TLP/PPS: intro, package cleanup.
In reply to gustavo.zacarias at free-electrons.comHello,
Quoted 3 lines · gustavo.zacarias at free-electrons.com
The patches are one per package to simplify the review/application process and to make it easy to revert with granularity in case of problems with one or more of them.
[...]
Many of the patches have been applied. However, a few of the patches had comments, so can you respin them?
I've marked the following patches as Changes Requested in patchwork:
ocrad: use $(TARGET_MAKE_ENV) when calling $(MAKE) moarvm: use $(TARGET_MAKE_ENV) when calling $(MAKE) pppd: use $(TARGET_MAKE_ENV) when calling $(MAKE) poco: use $(TARGET_MAKE_ENV) when calling $(MAKE) librtas: use $(TARGET_MAKE_ENV) when calling $(MAKE) ed: use $(TARGET_MAKE_ENV) when calling $(MAKE)
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com