diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2012-09-17 21:18:06 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2012-09-17 21:24:49 +0200 |
| commit | 52975d89daa00d8e7ccc5aad5c0b02fd745bb1d1 (patch) | |
| tree | 79e063c87d94f4de11bba15b8232745b73f709fa /package/poco/poco.mk | |
| parent | 9bf020f54415345a22f11754d8280e4ae8fa8ef4 (diff) | |
Revert "poco: fix parallel build failure"
This reverts commit 32f4957b153bdabe7af60d529942aca7d1a4783d.
Adding the phony objdir target as a prerequisite of all the .o targets
doesn't work, as they are then always considered out of date, leading
to poco getting rebuilt (without the proper MYSQL_{INC,LIB}DIR settings)
at staging-install / target-install time.
Instead simply use MAKE1 for the build step.
Fixes http://autobuild.buildroot.net/results/1cca8b4115674f12884bcbc0c680efed0fb939ae
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/poco/poco.mk')
| -rw-r--r-- | package/poco/poco.mk | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/package/poco/poco.mk b/package/poco/poco.mk index 5b8bdbf0d..eaa93e66c 100644 --- a/package/poco/poco.mk +++ b/package/poco/poco.mk @@ -45,19 +45,17 @@ define POCO_CONFIGURE_CMDS endef define POCO_BUILD_CMDS - $(MAKE) POCO_TARGET_OSARCH=$(ARCH) CROSSENV=$(TARGET_CROSS) \ + $(MAKE1) POCO_TARGET_OSARCH=$(ARCH) CROSSENV=$(TARGET_CROSS) \ MYSQL_LIBDIR=$(STAGING_DIR)/usr/lib/mysql \ MYSQL_INCDIR=$(STAGING_DIR)/usr/include/mysql -C $(@D) endef define POCO_INSTALL_STAGING_CMDS - $(MAKE) DESTDIR=$(STAGING_DIR) POCO_TARGET_OSARCH=$(ARCH) \ - CROSSENV=$(TARGET_CROSS) install -C $(@D) + $(MAKE) DESTDIR=$(STAGING_DIR) POCO_TARGET_OSARCH=$(ARCH) install -C $(@D) endef define POCO_INSTALL_TARGET_CMDS - $(MAKE) DESTDIR=$(TARGET_DIR) POCO_TARGET_OSARCH=$(ARCH) \ - CROSSENV=$(TARGET_CROSS) install -C $(@D) + $(MAKE) DESTDIR=$(TARGET_DIR) POCO_TARGET_OSARCH=$(ARCH) install -C $(@D) endef $(eval $(generic-package)) |