From 5de55c25cce83203883fce47374b6a3460fc1d22 Mon Sep 17 00:00:00 2001
From: mb <mb@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 7 Oct 2010 18:06:28 +0000
Subject: [PATCH] mysql: Parallel build fixes

git-svn-id: svn://svn.openwrt.org/openwrt/packages@23310 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 libs/mysql/Makefile | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

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