Hi all, Attached patches fix parallel builds in packages: e2fsprogs, linux-atm, uclibc++. Mainly, I prevent the call of "$(MAKE) all install" replaced by PKG_INSTALL:=1.
Regards, Miguel
>From 5e3bb11aee0ffa3a5d4ff4f2d89c175d876dd9a2 Mon Sep 17 00:00:00 2001 From: Miguel Gaio <[email protected]> Date: Wed, 21 Jul 2010 11:16:53 +0200 Subject: [PATCH 1/2] * e2fsprogs: parallel build fix --- package/e2fsprogs/Makefile | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index 847d40d..3a6a966 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2008 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # Copyright 2010 Vertical Communications # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -15,6 +15,8 @@ PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=...@sf/e2fsprogs +PKG_INSTALL:=1 + include $(INCLUDE_DIR)/package.mk define Package/e2fsprogs/Default @@ -64,7 +66,7 @@ define Package/libblkid $(call Package/e2fsprogs/Default) SECTION:=libs CATEGORY:=Libraries - TITLE:=block device id library + TITLE:=Block device id library endef define Package/libblkid/description @@ -132,7 +134,7 @@ define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ BUILDCC="$(HOSTCC)" \ DESTDIR="$(PKG_INSTALL_DIR)" \ - all install + all endef define Build/InstallDev -- 1.7.1
>From 799c750310f2e29aeea6036a5b6e01618736c058 Mon Sep 17 00:00:00 2001 From: Miguel Gaio <[email protected]> Date: Wed, 21 Jul 2010 11:17:52 +0200 Subject: [PATCH 2/2] * linux-atm: parallel build fix --- package/linux-atm/Makefile | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile index fd92cc1..4b12af9 100644 --- a/package/linux-atm/Makefile +++ b/package/linux-atm/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -16,6 +16,8 @@ PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/l/linux-atm/ PKG_MD5SUM:=9560b0e1f410a05b849dfdab465dd758 +PKG_INSTALL:=1 + include $(INCLUDE_DIR)/package.mk define Package/linux-atm @@ -54,9 +56,7 @@ define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR)/src/qgen \ LDFLAGS="" \ all - $(MAKE) -C $(PKG_BUILD_DIR) \ - DESTDIR="$(PKG_INSTALL_DIR)" \ - all install + $(MAKE) -C $(PKG_BUILD_DIR) all endef define Build/InstallDev -- 1.7.1
>From a93c258183151f66007c6b9240d929a2898be028 Mon Sep 17 00:00:00 2001 From: Miguel Gaio <[email protected]> Date: Wed, 21 Jul 2010 11:19:33 +0200 Subject: [PATCH 1/2] * uclibc++: parallel build fix --- libs/uclibc++/Makefile | 19 +++++++------------ 1 files changed, 7 insertions(+), 12 deletions(-) diff --git a/libs/uclibc++/Makefile b/libs/uclibc++/Makefile index 5e32966..8351c92 100644 --- a/libs/uclibc++/Makefile +++ b/libs/uclibc++/Makefile @@ -17,6 +17,8 @@ PKG_MD5SUM:=1ceef3209cca88be8f1bd9de99735954 PKG_BUILD_DIR:=$(BUILD_DIR)/uClibc++-$(PKG_VERSION) +PKG_INSTALL:=1 + include $(INCLUDE_DIR)/package.mk define Package/uclibcxx @@ -60,18 +62,11 @@ define Build/Configure fi endef -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) \ - $(MAKE_FLAGS) \ - DESTDIR="$(PKG_INSTALL_DIR)/usr" \ - all install -endef - define Build/InstallDev $(INSTALL_DIR) $(2)/bin $(1)/usr/include/uClibc++ $(1)/usr/lib - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/g++-uc $(2)/bin/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/uClibc++/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libuClibc++*.{a,so*} $(1)/usr/lib/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/bin/g++-uc $(2)/bin/ + $(CP) $(PKG_INSTALL_DIR)/include/* $(1)/usr/include/uClibc++/ + $(CP) $(PKG_INSTALL_DIR)/lib/libuClibc++*.a $(1)/usr/lib/ $(SED) 's|-I/include/|-I$(STAGING_DIR)/usr/include/uClibc++/|g' $(2)/bin/g++-uc $(SED) 's|-L/lib/|-L$(STAGING_DIR)/usr/lib/|g' $(2)/bin/g++-uc # add another wrapper which links against both uClibc++ and libstdc++ @@ -83,8 +78,8 @@ endef define Package/uclibcxx/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libuClibc++.so.* $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libuClibc++-*.so $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/lib/libuClibc++.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/lib/libuClibc++-*.so $(1)/usr/lib/ endef $(eval $(call BuildPackage,uclibcxx)) -- 1.7.1
_______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel
