Hi,
this patch fixes fuse parallel build.
-Raphael
diff -pruN fuse.orig//Makefile fuse/Makefile
--- fuse.orig//Makefile 2010-03-08 17:55:29.000000000 +0100
+++ fuse/Makefile 2010-03-08 17:54:43.000000000 +0100
@@ -1,5 +1,5 @@
-#
-# Copyright (C) 2006-2009 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.
@@ -10,12 +10,14 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=fuse
PKG_VERSION:=2.7.4
-PKG_RELEASE:=2
+PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=...@sf/$(PKG_NAME)
PKG_MD5SUM:=4879f06570d2225667534c37fea04213
+PKG_INSTALL:=1
+
include $(INCLUDE_DIR)/package.mk
define Package/fuse/Default
@@ -24,7 +26,7 @@ define Package/fuse/Default
endef
define Package/fuse/Default/description
- FUSE (Filesystem in UserSpacE)
+FUSE (Filesystem in UserSpacE)
endef
define Package/fuse-utils
@@ -54,7 +56,7 @@ endef
define KernelPackage/fuse/description
$(call Package/fuse/Default/description)
- This package contains the FUSE kernel module.
+This package contains the FUSE kernel module.
endef
define Package/libfuse
@@ -68,7 +70,7 @@ endef
define Package/libfuse/description
$(call Package/fuse/Default/description)
- This package contains the FUSE shared library, needed by other programs.
+This package contains the FUSE shared library, needed by other programs.
endef
CONFIGURE_VARS += \
@@ -83,11 +85,11 @@ CONFIGURE_ARGS += \
--disable-example \
--disable-auto-modprobe \
--with-kernel="$(LINUX_DIR)" \
- --disable-mtab
+ --disable-mtab
-# Since kernel 2.6.14 the fuse module is officially part of the kernel.
+# Since kernel 2.6.14 the fuse module is officially part of the kernel.
# Generally it is better to use the kernel's module. Because it is patched
-# against the DCACHE BUG on arm architectures (currently brcm-2.4, brcm-47xx)
+# against the DCACHE BUG on arm architectures (currently brcm-2.4, brcm-47xx)
# and from fuse 2.8.0 on it will be removed from the fuse package anyway.
#
CONFIGURE_ARGS += --disable-kernel-module
@@ -103,22 +105,17 @@ define Build/Configure
$(call Build/Configure/Default)
endef
-define Build/Compile
- $(MAKE) -C $(PKG_BUILD_DIR) \
- ARCH="$(LINUX_KARCH)" \
- CROSS_COMPILE="$(TARGET_CROSS)" \
- DESTDIR="$(PKG_INSTALL_DIR)" \
- AM_CFLAGS="$(TARGET_CFLAGS) -DDISABLE_COMPAT=1" \
- EXTRA_DIST="" \
- all install
-endef
+MAKE_ARGS += ARCH="$(LINUX_KARCH)" \
+ CROSS_COMPILE="$(TARGET_CROSS)" \
+ AM_CFLAGS="$(TARGET_CFLAGS) -DDISABLE_COMPAT=1" \
+ EXTRA_DIST=""
define Build/InstallDev
- mkdir -p $(1)/usr/include
+ $(INSTALL_DIR) $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/usr/include/fuse{,.h} $(1)/usr/include/
- mkdir -p $(1)/usr/lib
+ $(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfuse.{a,so*} $(1)/usr/lib/
- mkdir -p $(1)/usr/lib/pkgconfig
+ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/fuse.pc $(1)/usr/lib/pkgconfig/
$(SED) 's,-I$$$${includedir}/fuse,,g' $(1)/usr/lib/pkgconfig/fuse.pc
$(SED) 's,-L$$$${libdir},,g' $(1)/usr/lib/pkgconfig/fuse.pc
_______________________________________________
openwrt-devel mailing list
[email protected]
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
