mysql: Parallel build fixes

git-svn-id: svn://svn.openwrt.org/openwrt/packages@23310 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
mb 2010-10-07 18:06:28 +00:00
parent f20a22d428
commit 5de55c25cc

View File

@ -20,6 +20,7 @@ PKG_SOURCE_URL:=\
PKG_MD5SUM:=f18153b0239aaa03fc5a751f2d82cb71 PKG_MD5SUM:=f18153b0239aaa03fc5a751f2d82cb71
PKG_BUILD_DEPENDS:=libncurses libreadline PKG_BUILD_DEPENDS:=libncurses libreadline
PKG_BUILD_PARALLEL:=1
PKG_FIXUP:=libtool PKG_FIXUP:=libtool
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -105,29 +106,44 @@ endef
TARGET_CFLAGS += $(FPIC) TARGET_CFLAGS += $(FPIC)
define Build/Compile define Build/Compile
$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
SUBDIRS="include" \
DESTDIR="$(PKG_INSTALL_DIR)" \
all
$(MAKE) -C "$(PKG_BUILD_DIR)" \ $(MAKE) -C "$(PKG_BUILD_DIR)" \
SUBDIRS="include" \ SUBDIRS="include" \
DESTDIR="$(PKG_INSTALL_DIR)" \ DESTDIR="$(PKG_INSTALL_DIR)" \
all install install
$(MAKE) -C "$(PKG_BUILD_DIR)/libmysql" \ $(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)/libmysql" \
CC="$(HOSTCC)" \ CC="$(HOSTCC)" \
LINK="$(HOSTCC) -o conf_to_src -lc" \ LINK="$(HOSTCC) -o conf_to_src -lc" \
CFLAGS="" \ CFLAGS="" \
CPPFLAGS="" \ CPPFLAGS="" \
conf_to_src conf_to_src
$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
SUBDIRS="libmysql" \
DESTDIR="$(PKG_INSTALL_DIR)" \
all
$(MAKE) -C "$(PKG_BUILD_DIR)" \ $(MAKE) -C "$(PKG_BUILD_DIR)" \
SUBDIRS="libmysql" \ SUBDIRS="libmysql" \
DESTDIR="$(PKG_INSTALL_DIR)" \ DESTDIR="$(PKG_INSTALL_DIR)" \
all install install
$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
SUBDIRS="libmysql_r" \
DESTDIR="$(PKG_INSTALL_DIR)" \
all
$(MAKE) -C "$(PKG_BUILD_DIR)" \ $(MAKE) -C "$(PKG_BUILD_DIR)" \
SUBDIRS="libmysql_r" \ SUBDIRS="libmysql_r" \
DESTDIR="$(PKG_INSTALL_DIR)" \ DESTDIR="$(PKG_INSTALL_DIR)" \
all install install
$(MAKE) -C "$(PKG_BUILD_DIR)" \ $(MAKE) -C "$(PKG_BUILD_DIR)" \
SUBDIRS="scripts" \ SUBDIRS="scripts" \
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)" \
DESTDIR="$(PKG_INSTALL_DIR)" \
all
$(MAKE) -C "$(PKG_BUILD_DIR)" \ $(MAKE) -C "$(PKG_BUILD_DIR)" \
DESTDIR="$(PKG_INSTALL_DIR)" \ DESTDIR="$(PKG_INSTALL_DIR)" \
install install