mirror of
http://git.openwrt.org/packages.git
synced 2025-01-08 11:57:34 +08:00
packages: fix parallel build by adding + for every make command that passes the jobserver
git-svn-id: svn://svn.openwrt.org/openwrt/packages@33524 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
403a026e8f
commit
ca74ca9b86
@ -91,7 +91,7 @@ define Build/InstallDev
|
||||
endef
|
||||
|
||||
define Build/Compile
|
||||
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/bfd/doc/ CFLAGS="-I$(PKG_BUILD_DIR)/include" chew
|
||||
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/bfd/doc/ CFLAGS="-I$(PKG_BUILD_DIR)/include" chew
|
||||
$(call Build/Compile/Default)
|
||||
endef
|
||||
|
||||
|
@ -49,7 +49,7 @@ MRD6_MAKEFLAGS:= \
|
||||
PREFIX="/usr"
|
||||
|
||||
define Build/Compile
|
||||
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/src $(MRD6_MAKEFLAGS) all
|
||||
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/src $(MRD6_MAKEFLAGS) all
|
||||
endef
|
||||
|
||||
define Build/Install
|
||||
|
@ -75,7 +75,7 @@ define Build/Configure
|
||||
endef
|
||||
|
||||
define Build/Compile
|
||||
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
|
||||
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
|
||||
CC="$(TARGET_CROSS)gcc" \
|
||||
CXX="$(TARGET_CROSS)g++" \
|
||||
LINK="$(TARGET_CROSS)g++" \
|
||||
|
@ -463,9 +463,9 @@ define Host/Configure
|
||||
endef
|
||||
|
||||
define Host/Compile
|
||||
$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) \
|
||||
+$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) \
|
||||
python Parser/pgen
|
||||
$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) \
|
||||
+$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) \
|
||||
HOSTPYTHON=$(HOST_BUILD_DIR)/python \
|
||||
sharedmods
|
||||
endef
|
||||
|
@ -190,7 +190,7 @@ define Build/Compile
|
||||
echo "using python : : $(STAGING_DIR_ROOT)/usr/bin/python : $(STAGING_DIR)/usr/include/python2.7/ ;" >> \
|
||||
tools/build/v2/user-config.jam; \
|
||||
) \
|
||||
bjam \
|
||||
+bjam \
|
||||
'-sBUILD=release <optimization>space <inlining>on <debug-symbols>off' \
|
||||
$(filter -j%,$(PKG_JOBS)) \
|
||||
--toolset=gcc-$(ARCH) --build-type=minimal --layout=system \
|
||||
|
@ -85,7 +85,7 @@ CONFIGURE_VARS += \
|
||||
CC="$(filter-out ccache,$(TARGET_CC))"
|
||||
|
||||
define Build/Compile
|
||||
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
|
||||
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
|
||||
DESTDIR="$(PKG_INSTALL_DIR)" \
|
||||
CC="$(TARGET_CC)" \
|
||||
install
|
||||
|
@ -77,7 +77,7 @@ endef
|
||||
TARGET_CFLAGS += $(FPIC)
|
||||
|
||||
define Build/Compile
|
||||
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/build_unix \
|
||||
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/build_unix \
|
||||
DESTDIR="$(PKG_INSTALL_DIR)" all
|
||||
$(MAKE) -C $(PKG_BUILD_DIR)/build_unix \
|
||||
DESTDIR="$(PKG_INSTALL_DIR)" install
|
||||
|
@ -42,7 +42,7 @@ CONFIGURE_ARGS += \
|
||||
--enable-static
|
||||
|
||||
define Build/Compile
|
||||
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
|
||||
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
|
||||
endef
|
||||
|
||||
define Host/Install
|
||||
|
@ -34,7 +34,7 @@ CONFIGURE_ARGS += \
|
||||
--enable-static \
|
||||
|
||||
define Build/Compile
|
||||
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
|
||||
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
|
||||
BINOWN=`id -u` \
|
||||
BINGRP=`id -g` \
|
||||
DESTDIR="$(PKG_INSTALL_DIR)" \
|
||||
|
@ -63,7 +63,7 @@ endef
|
||||
|
||||
define Build/Compile
|
||||
$(INSTALL_DIR) $(PKG_INSTALL_DIR)/usr/{include,lib,bin,man/man1}
|
||||
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
|
||||
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
|
||||
LIBTOOL="./libtool --tag=CC" \
|
||||
prefix="$(PKG_INSTALL_DIR)/usr" \
|
||||
exec_prefix="$(PKG_INSTALL_DIR)/usr" \
|
||||
|
@ -36,7 +36,7 @@ endef
|
||||
TARGET_CFLAGS += $(FPIC)
|
||||
|
||||
define Build/Compile
|
||||
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/src \
|
||||
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/src \
|
||||
$(TARGET_CONFIGURE_OPTS) \
|
||||
DFLAGS="$(TARGET_CFLAGS) -Wall"
|
||||
endef
|
||||
|
@ -112,7 +112,7 @@ endef
|
||||
TARGET_CFLAGS += $(FPIC)
|
||||
|
||||
define Build/Compile
|
||||
$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
|
||||
+$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
|
||||
SUBDIRS="include" \
|
||||
DESTDIR="$(PKG_INSTALL_DIR)" \
|
||||
all
|
||||
@ -120,13 +120,13 @@ define Build/Compile
|
||||
SUBDIRS="include" \
|
||||
DESTDIR="$(PKG_INSTALL_DIR)" \
|
||||
install
|
||||
$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)/libmysql" \
|
||||
+$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)/libmysql" \
|
||||
CC="g++" \
|
||||
CFLAGS="$(HOST_CFLAGS)" \
|
||||
CPPFLAGS="$(HOST_CFLAGS)" \
|
||||
LDFLAGS="$(HOST_LDFLAGS)" \
|
||||
conf_to_src
|
||||
$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
|
||||
+$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
|
||||
SUBDIRS="libmysql" \
|
||||
DESTDIR="$(PKG_INSTALL_DIR)" \
|
||||
all
|
||||
@ -134,7 +134,7 @@ define Build/Compile
|
||||
SUBDIRS="libmysql" \
|
||||
DESTDIR="$(PKG_INSTALL_DIR)" \
|
||||
install
|
||||
$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
|
||||
+$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
|
||||
SUBDIRS="libmysql_r" \
|
||||
DESTDIR="$(PKG_INSTALL_DIR)" \
|
||||
all
|
||||
@ -147,7 +147,7 @@ define Build/Compile
|
||||
DESTDIR="$(PKG_INSTALL_DIR)" \
|
||||
bin_SCRIPTS="mysql_config" \
|
||||
install
|
||||
$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
|
||||
+$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
|
||||
DESTDIR="$(PKG_INSTALL_DIR)" \
|
||||
all
|
||||
$(MAKE) -C "$(PKG_BUILD_DIR)" \
|
||||
|
@ -160,10 +160,10 @@ TARGET_CFLAGS += $(FPIC)
|
||||
unexport PROFILE
|
||||
|
||||
define Build/Compile
|
||||
$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
|
||||
+$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
|
||||
DESTDIR="$(PKG_INSTALL_DIR)" \
|
||||
all
|
||||
$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
|
||||
+$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
|
||||
DESTDIR="$(PKG_INSTALL_DIR)" \
|
||||
install
|
||||
endef
|
||||
|
@ -61,7 +61,7 @@ define Build/Configure
|
||||
endef
|
||||
|
||||
define Build/Compile
|
||||
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/builders/make \
|
||||
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/builders/make \
|
||||
PLATFORM=linux-openwrt-uclibc
|
||||
endef
|
||||
|
||||
|
@ -90,7 +90,7 @@ endif
|
||||
|
||||
ifdef CONFIG_PACKAGE_lispd
|
||||
define Build/Compile/lispd
|
||||
$(MAKE_VARS) \
|
||||
+$(MAKE_VARS) \
|
||||
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/lispd \
|
||||
$(MAKE_FLAGS)
|
||||
endef
|
||||
@ -98,7 +98,7 @@ endif
|
||||
|
||||
ifdef CONFIG_PACKAGE_lispconf
|
||||
define Build/Compile/lispconf
|
||||
$(MAKE_VARS) \
|
||||
+$(MAKE_VARS) \
|
||||
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/lispconf \
|
||||
$(MAKE_FLAGS)
|
||||
endef
|
||||
|
@ -74,8 +74,8 @@ OPENSWAN_MAKEFLAGS:= \
|
||||
DESTDIR="$(PKG_INSTALL_DIR)"
|
||||
|
||||
define Build/Compile
|
||||
$(MAKE) $(PKG_JOBS) $(OPENSWAN_MAKEFLAGS) programs
|
||||
$(MAKE) $(PKG_JOBS) $(OPENSWAN_MAKEFLAGS) module
|
||||
+$(MAKE) $(PKG_JOBS) $(OPENSWAN_MAKEFLAGS) programs
|
||||
+$(MAKE) $(PKG_JOBS) $(OPENSWAN_MAKEFLAGS) module
|
||||
endef
|
||||
|
||||
define Build/Install
|
||||
|
@ -47,7 +47,7 @@ CONFIGURE_VARS+= \
|
||||
LIBS="-lm"
|
||||
|
||||
define Build/Compile
|
||||
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
|
||||
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
|
||||
CXXLD="$(TARGET_CXX)"
|
||||
endef
|
||||
|
||||
|
@ -60,13 +60,13 @@ define Package/vnstat/conffiles
|
||||
endef
|
||||
|
||||
define Build/Compile/vnstat
|
||||
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
|
||||
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
|
||||
$(TARGET_CONFIGURE_OPTS) \
|
||||
CFLAGS="$(TARGET_CFLAGS)"
|
||||
endef
|
||||
|
||||
define Build/Compile/vnstati
|
||||
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
|
||||
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
|
||||
$(TARGET_CONFIGURE_OPTS) \
|
||||
CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \
|
||||
LDFLAGS="$(TARGET_LDFLAGS) -Wl,-rpath-link,$(STAGING_DIR)/usr/lib" \
|
||||
|
@ -39,7 +39,7 @@ CONFIGURE_ARGS+= \
|
||||
--with-xtlibdir="/usr/lib/iptables" \
|
||||
|
||||
define Build/Compile
|
||||
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
|
||||
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
|
||||
ARCH="$(LINUX_KARCH)" \
|
||||
CROSS_COMPILE="$(TARGET_CROSS)" \
|
||||
DESTDIR="$(PKG_INSTALL_DIR)" \
|
||||
|
@ -284,7 +284,7 @@ endef
|
||||
|
||||
define Build/Compile
|
||||
$(call Build/Compile/Default,znc)
|
||||
$(MAKE_VARS) $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/modules \
|
||||
+$(MAKE_VARS) $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/modules \
|
||||
$(MAKE_FLAGS) $(ZNC_MODULE_TARGETS)
|
||||
endef
|
||||
|
||||
|
@ -40,7 +40,7 @@ EXTRA_CPPFLAGS:= \
|
||||
-I$(STAGING_DIR)/usr/lib/glib/include
|
||||
|
||||
define Build/Compile
|
||||
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
|
||||
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
|
||||
$(TARGET_CONFIGURE_OPTS) \
|
||||
CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
|
||||
CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
|
||||
|
@ -65,7 +65,7 @@ define Package/lm-sensors/conffiles
|
||||
endef
|
||||
|
||||
define Build/Compile
|
||||
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
|
||||
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
|
||||
$(TARGET_CONFIGURE_OPTS) \
|
||||
KERNELVERSION="$(LINUX_VERSION)" \
|
||||
LINUX="$(LINUX_DIR)" \
|
||||
|
@ -37,7 +37,7 @@ define KernelPackage/loop-aes/description
|
||||
endef
|
||||
|
||||
define Build/Compile
|
||||
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
|
||||
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
|
||||
ARCH="$(LINUX_KARCH)" \
|
||||
CROSS_COMPILE="$(TARGET_CROSS)" \
|
||||
CC="$(TARGET_CC)" \
|
||||
|
@ -117,7 +117,7 @@ define Build/Compile/vim
|
||||
--disable-multibyte \
|
||||
)
|
||||
$(MAKE) -C $(PKG_BUILD_DIR) clean
|
||||
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
|
||||
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
|
||||
DESTDIR="$(PKG_INSTALL_DIR)" all
|
||||
$(CP) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(PKG_BUILD_DIR)/vim_tiny
|
||||
endef
|
||||
@ -130,7 +130,7 @@ define Build/Compile/vim-full
|
||||
--enable-multibyte \
|
||||
)
|
||||
$(MAKE) -C $(PKG_BUILD_DIR) clean
|
||||
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
|
||||
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
|
||||
DESTDIR="$(PKG_INSTALL_DIR)" all
|
||||
$(CP) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(PKG_BUILD_DIR)/vim_normal
|
||||
endef
|
||||
@ -138,7 +138,7 @@ endif
|
||||
|
||||
ifneq ($(CONFIG_PACKAGE_xxd),)
|
||||
define Build/Compile/xxd
|
||||
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
|
||||
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
|
||||
DESTDIR="$(PKG_INSTALL_DIR)" all
|
||||
endef
|
||||
endif
|
||||
|
Loading…
Reference in New Issue
Block a user