bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

packages: fix parallel build by adding + for every make command that passes the jobserver

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@33524 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2012-09-23 09:58:24 +00:00
parent 403a026e8f
commit ca74ca9b86
24 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devel/binutils/Makefile
View File

@ -91,7 +91,7 @@ define Build/InstallDev
endef endef
define Build/Compile 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) $(call Build/Compile/Default)
endef endef

2
ipv6/mrd6/Makefile
View File

@ -49,7 +49,7 @@ MRD6_MAKEFLAGS:= \
PREFIX="/usr" PREFIX="/usr"
define Build/Compile 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 endef
define Build/Install define Build/Install

2
lang/python-sip/Makefile
View File

@ -75,7 +75,7 @@ define Build/Configure
endef endef
define Build/Compile define Build/Compile
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
CC="$(TARGET_CROSS)gcc" \ CC="$(TARGET_CROSS)gcc" \
CXX="$(TARGET_CROSS)g++" \ CXX="$(TARGET_CROSS)g++" \
LINK="$(TARGET_CROSS)g++" \ LINK="$(TARGET_CROSS)g++" \

4
lang/python/Makefile
View File

@ -463,9 +463,9 @@ define Host/Configure
endef endef
define Host/Compile define Host/Compile
$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) \ +$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) \
python Parser/pgen python Parser/pgen
$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) \ +$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) \
HOSTPYTHON=$(HOST_BUILD_DIR)/python \ HOSTPYTHON=$(HOST_BUILD_DIR)/python \
sharedmods sharedmods
endef endef

2
libs/boost/Makefile
View File

@ -190,7 +190,7 @@ define Build/Compile
echo "using python : : $(STAGING_DIR_ROOT)/usr/bin/python : $(STAGING_DIR)/usr/include/python2.7/ ;" >> \ echo "using python : : $(STAGING_DIR_ROOT)/usr/bin/python : $(STAGING_DIR)/usr/include/python2.7/ ;" >> \
tools/build/v2/user-config.jam; \ tools/build/v2/user-config.jam; \
) \ ) \
bjam \ +bjam \
'-sBUILD=release <optimization>space <inlining>on <debug-symbols>off' \ '-sBUILD=release <optimization>space <inlining>on <debug-symbols>off' \
$(filter -j%,$(PKG_JOBS)) \ $(filter -j%,$(PKG_JOBS)) \
--toolset=gcc-$(ARCH) --build-type=minimal --layout=system \ --toolset=gcc-$(ARCH) --build-type=minimal --layout=system \

2
libs/curl/Makefile
View File

@ -85,7 +85,7 @@ CONFIGURE_VARS += \
CC="$(filter-out ccache,$(TARGET_CC))" CC="$(filter-out ccache,$(TARGET_CC))"
define Build/Compile define Build/Compile
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
DESTDIR="$(PKG_INSTALL_DIR)" \ DESTDIR="$(PKG_INSTALL_DIR)" \
CC="$(TARGET_CC)" \ CC="$(TARGET_CC)" \
install install

2
libs/db47/Makefile
View File

@ -77,7 +77,7 @@ endef
TARGET_CFLAGS += $(FPIC) TARGET_CFLAGS += $(FPIC)
define Build/Compile 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 DESTDIR="$(PKG_INSTALL_DIR)" all
$(MAKE) -C $(PKG_BUILD_DIR)/build_unix \ $(MAKE) -C $(PKG_BUILD_DIR)/build_unix \
DESTDIR="$(PKG_INSTALL_DIR)" install DESTDIR="$(PKG_INSTALL_DIR)" install

2
libs/expat/Makefile
View File

@ -42,7 +42,7 @@ CONFIGURE_ARGS += \
--enable-static --enable-static
define Build/Compile 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 endef
define Host/Install define Host/Install

2
libs/gdbm/Makefile
View File

@ -34,7 +34,7 @@ CONFIGURE_ARGS += \
--enable-static \ --enable-static \
define Build/Compile define Build/Compile
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
BINOWN=`id -u` \ BINOWN=`id -u` \
BINGRP=`id -g` \ BINGRP=`id -g` \
DESTDIR="$(PKG_INSTALL_DIR)" \ DESTDIR="$(PKG_INSTALL_DIR)" \

2
libs/jpeg/Makefile
View File

@ -63,7 +63,7 @@ endef
define Build/Compile define Build/Compile
$(INSTALL_DIR) $(PKG_INSTALL_DIR)/usr/{include,lib,bin,man/man1} $(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" \ LIBTOOL="./libtool --tag=CC" \
prefix="$(PKG_INSTALL_DIR)/usr" \ prefix="$(PKG_INSTALL_DIR)/usr" \
exec_prefix="$(PKG_INSTALL_DIR)/usr" \ exec_prefix="$(PKG_INSTALL_DIR)/usr" \

2
libs/matrixssl/Makefile
View File

@ -36,7 +36,7 @@ endef
TARGET_CFLAGS += $(FPIC) TARGET_CFLAGS += $(FPIC)
define Build/Compile define Build/Compile
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/src \ +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/src \
$(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_OPTS) \
DFLAGS="$(TARGET_CFLAGS) -Wall" DFLAGS="$(TARGET_CFLAGS) -Wall"
endef endef

10
libs/mysql/Makefile
View File

@ -112,7 +112,7 @@ endef
TARGET_CFLAGS += $(FPIC) TARGET_CFLAGS += $(FPIC)
define Build/Compile define Build/Compile
$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \ +$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
SUBDIRS="include" \ SUBDIRS="include" \
DESTDIR="$(PKG_INSTALL_DIR)" \ DESTDIR="$(PKG_INSTALL_DIR)" \
all all
@ -120,13 +120,13 @@ define Build/Compile
SUBDIRS="include" \ SUBDIRS="include" \
DESTDIR="$(PKG_INSTALL_DIR)" \ DESTDIR="$(PKG_INSTALL_DIR)" \
install install
$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)/libmysql" \ +$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)/libmysql" \
CC="g++" \ CC="g++" \
CFLAGS="$(HOST_CFLAGS)" \ CFLAGS="$(HOST_CFLAGS)" \
CPPFLAGS="$(HOST_CFLAGS)" \ CPPFLAGS="$(HOST_CFLAGS)" \
LDFLAGS="$(HOST_LDFLAGS)" \ LDFLAGS="$(HOST_LDFLAGS)" \
conf_to_src conf_to_src
$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \ +$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
SUBDIRS="libmysql" \ SUBDIRS="libmysql" \
DESTDIR="$(PKG_INSTALL_DIR)" \ DESTDIR="$(PKG_INSTALL_DIR)" \
all all
@ -134,7 +134,7 @@ define Build/Compile
SUBDIRS="libmysql" \ SUBDIRS="libmysql" \
DESTDIR="$(PKG_INSTALL_DIR)" \ DESTDIR="$(PKG_INSTALL_DIR)" \
install install
$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \ +$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
SUBDIRS="libmysql_r" \ SUBDIRS="libmysql_r" \
DESTDIR="$(PKG_INSTALL_DIR)" \ DESTDIR="$(PKG_INSTALL_DIR)" \
all all
@ -147,7 +147,7 @@ define Build/Compile
DESTDIR="$(PKG_INSTALL_DIR)" \ DESTDIR="$(PKG_INSTALL_DIR)" \
bin_SCRIPTS="mysql_config" \ bin_SCRIPTS="mysql_config" \
install install
$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \ +$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
DESTDIR="$(PKG_INSTALL_DIR)" \ DESTDIR="$(PKG_INSTALL_DIR)" \
all all
$(MAKE) -C "$(PKG_BUILD_DIR)" \ $(MAKE) -C "$(PKG_BUILD_DIR)" \

4
libs/postgresql/Makefile
View File

@ -160,10 +160,10 @@ TARGET_CFLAGS += $(FPIC)
unexport PROFILE unexport PROFILE
define Build/Compile define Build/Compile
$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \ +$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
DESTDIR="$(PKG_INSTALL_DIR)" \ DESTDIR="$(PKG_INSTALL_DIR)" \
all all
$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \ +$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
DESTDIR="$(PKG_INSTALL_DIR)" \ DESTDIR="$(PKG_INSTALL_DIR)" \
install install
endef endef

2
multimedia/crtmpserver/Makefile
View File

@ -61,7 +61,7 @@ define Build/Configure
endef endef
define Build/Compile 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 PLATFORM=linux-openwrt-uclibc
endef endef

4
net/lispmob/Makefile
View File

@ -90,7 +90,7 @@ endif
ifdef CONFIG_PACKAGE_lispd ifdef CONFIG_PACKAGE_lispd
define Build/Compile/lispd define Build/Compile/lispd
$(MAKE_VARS) \ +$(MAKE_VARS) \
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/lispd \ $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/lispd \
$(MAKE_FLAGS) $(MAKE_FLAGS)
endef endef
@ -98,7 +98,7 @@ endif
ifdef CONFIG_PACKAGE_lispconf ifdef CONFIG_PACKAGE_lispconf
define Build/Compile/lispconf define Build/Compile/lispconf
$(MAKE_VARS) \ +$(MAKE_VARS) \
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/lispconf \ $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/lispconf \
$(MAKE_FLAGS) $(MAKE_FLAGS)
endef endef

4
net/openswan/Makefile
View File

@ -74,8 +74,8 @@ OPENSWAN_MAKEFLAGS:= \
DESTDIR="$(PKG_INSTALL_DIR)" DESTDIR="$(PKG_INSTALL_DIR)"
define Build/Compile define Build/Compile
$(MAKE) $(PKG_JOBS) $(OPENSWAN_MAKEFLAGS) programs +$(MAKE) $(PKG_JOBS) $(OPENSWAN_MAKEFLAGS) programs
$(MAKE) $(PKG_JOBS) $(OPENSWAN_MAKEFLAGS) module +$(MAKE) $(PKG_JOBS) $(OPENSWAN_MAKEFLAGS) module
endef endef
define Build/Install define Build/Install

2
net/peerguardian/Makefile
View File

@ -47,7 +47,7 @@ CONFIGURE_VARS+= \
LIBS="-lm" LIBS="-lm"
define Build/Compile define Build/Compile
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
CXXLD="$(TARGET_CXX)" CXXLD="$(TARGET_CXX)"
endef endef

4
net/vnstat/Makefile
View File

@ -60,13 +60,13 @@ define Package/vnstat/conffiles
endef endef
define Build/Compile/vnstat define Build/Compile/vnstat
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" CFLAGS="$(TARGET_CFLAGS)"
endef endef
define Build/Compile/vnstati define Build/Compile/vnstati
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \
LDFLAGS="$(TARGET_LDFLAGS) -Wl,-rpath-link,$(STAGING_DIR)/usr/lib" \ LDFLAGS="$(TARGET_LDFLAGS) -Wl,-rpath-link,$(STAGING_DIR)/usr/lib" \

2
net/xtables-addons/Makefile
View File

@ -39,7 +39,7 @@ CONFIGURE_ARGS+= \
--with-xtlibdir="/usr/lib/iptables" \ --with-xtlibdir="/usr/lib/iptables" \
define Build/Compile define Build/Compile
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
ARCH="$(LINUX_KARCH)" \ ARCH="$(LINUX_KARCH)" \
CROSS_COMPILE="$(TARGET_CROSS)" \ CROSS_COMPILE="$(TARGET_CROSS)" \
DESTDIR="$(PKG_INSTALL_DIR)" \ DESTDIR="$(PKG_INSTALL_DIR)" \

2
net/znc/Makefile
View File

@ -284,7 +284,7 @@ endef
define Build/Compile define Build/Compile
$(call Build/Compile/Default,znc) $(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) $(MAKE_FLAGS) $(ZNC_MODULE_TARGETS)
endef endef

2
utils/bemused/Makefile
View File

@ -40,7 +40,7 @@ EXTRA_CPPFLAGS:= \
-I$(STAGING_DIR)/usr/lib/glib/include -I$(STAGING_DIR)/usr/lib/glib/include
define Build/Compile define Build/Compile
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \ CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \ CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \

2
utils/lm-sensors/Makefile
View File

@ -65,7 +65,7 @@ define Package/lm-sensors/conffiles
endef endef
define Build/Compile define Build/Compile
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_OPTS) \
KERNELVERSION="$(LINUX_VERSION)" \ KERNELVERSION="$(LINUX_VERSION)" \
LINUX="$(LINUX_DIR)" \ LINUX="$(LINUX_DIR)" \

2
utils/loop-aes/Makefile
View File

@ -37,7 +37,7 @@ define KernelPackage/loop-aes/description
endef endef
define Build/Compile define Build/Compile
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
ARCH="$(LINUX_KARCH)" \ ARCH="$(LINUX_KARCH)" \
CROSS_COMPILE="$(TARGET_CROSS)" \ CROSS_COMPILE="$(TARGET_CROSS)" \
CC="$(TARGET_CC)" \ CC="$(TARGET_CC)" \

6
utils/vim/Makefile
View File

@ -117,7 +117,7 @@ define Build/Compile/vim
--disable-multibyte \ --disable-multibyte \
) )
$(MAKE) -C $(PKG_BUILD_DIR) clean $(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 DESTDIR="$(PKG_INSTALL_DIR)" all
$(CP) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(PKG_BUILD_DIR)/vim_tiny $(CP) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(PKG_BUILD_DIR)/vim_tiny
endef endef
@ -130,7 +130,7 @@ define Build/Compile/vim-full
--enable-multibyte \ --enable-multibyte \
) )
$(MAKE) -C $(PKG_BUILD_DIR) clean $(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 DESTDIR="$(PKG_INSTALL_DIR)" all
$(CP) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(PKG_BUILD_DIR)/vim_normal $(CP) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(PKG_BUILD_DIR)/vim_normal
endef endef
@ -138,7 +138,7 @@ endif
ifneq ($(CONFIG_PACKAGE_xxd),) ifneq ($(CONFIG_PACKAGE_xxd),)
define Build/Compile/xxd define Build/Compile/xxd
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
DESTDIR="$(PKG_INSTALL_DIR)" all DESTDIR="$(PKG_INSTALL_DIR)" all
endef endef
endif endif