summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLionel Landwerlin <llandwerlin@gmail.com>2010-09-18 14:16:46 +0200
committerPeter Korsgaard <jacmet@sunsite.dk>2010-09-20 09:21:24 +0200
commit3df6b56f53a0dd92752a23e63a0ee5fcacc8ffd0 (patch)
treec1ff1cbfcc1c3a04fba6cbe42e145c97077a607d
parente5a9c22c905257dd5b9057eda8a380cb283580cd (diff)
zlib: Fix build
Using "make -j $(N)" with N > 1 sometimes breaks zlib build. Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--CHANGES2
-rw-r--r--package/zlib/zlib.mk4
2 files changed, 3 insertions, 3 deletions
diff --git a/CHANGES b/CHANGES
index f8501b4d6..92d06be96 100644
--- a/CHANGES
+++ b/CHANGES
@@ -24,7 +24,7 @@
pango, pcre, php, prboom, radvd, qt, samba, sdl_sound,
shared-mime-info, speex, sqlite, strace, taglib, tcpdump,
tiff, tn5250, udev, udpcast, usbmount, usbutils, which,
- xlib_libX11
+ xlib_libX11, zlib
Removed packages: dillo, libglib12, libgtk12, microwin,
pcmcia
diff --git a/package/zlib/zlib.mk b/package/zlib/zlib.mk
index ad5eda7ad..751cfc122 100644
--- a/package/zlib/zlib.mk
+++ b/package/zlib/zlib.mk
@@ -42,11 +42,11 @@ define HOST_ZLIB_CONFIGURE_CMDS
endef
define ZLIB_BUILD_CMDS
- $(MAKE) -C $(@D) all libz.a
+ $(MAKE1) -C $(@D) all libz.a
endef
define HOST_ZLIB_BUILD_CMDS
- $(MAKE) -C $(@D) all libz.a
+ $(MAKE1) -C $(@D) all libz.a
endef
define ZLIB_INSTALL_STAGING_CMDS