summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcmchao <cmchao@gmail.com>2010-06-16 11:47:11 (GMT)
committer Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2010-06-24 11:51:08 (GMT)
commit6e9655a5e86c276b2e3dd872d93741d3c03c14b1 (patch)
tree96a36eb8a89f60d6ea336df17c4f426ea5f360eb
parentfb42c6a11a72adb1cb4b1e18e957095bbc97adf2 (diff)
downloadbuildroot-6e9655a5e86c276b2e3dd872d93741d3c03c14b1.tar.gz
buildroot-6e9655a5e86c276b2e3dd872d93741d3c03c14b1.tar.bz2
libfuse : convert to autotools infrastructure & bump to 2.8.4
Changes by Thomas Petazzoni <thomas.petazzoni@free-electrons.com> * Installation to target is the default * Remove incorrect libfuse-dirclean target * Remove INSTALL_STAGING_CMDS, since its implementation was the default behaviour * No need to strip, done globally * No need to create main directories in $(TARGET_DIR) Signed-off-by: cmchao <cmchao@gmail.com>
-rw-r--r--package/fuse/libfuse.mk69
1 files changed, 12 insertions, 57 deletions
diff --git a/package/fuse/libfuse.mk b/package/fuse/libfuse.mk
index b45f9ee..87d746f 100644
--- a/package/fuse/libfuse.mk
+++ b/package/fuse/libfuse.mk
@@ -3,75 +3,30 @@
# libfuse
#
#############################################################
-LIBFUSE_VERSION:=2.8.1
+LIBFUSE_VERSION:=2.8.4
LIBFUSE_SOURCE:=fuse-$(LIBFUSE_VERSION).tar.gz
LIBFUSE_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/fuse/
-LIBFUSE_DIR:=$(BUILD_DIR)/fuse-$(LIBFUSE_VERSION)
-LIBFUSE_BINARY:=libfuse
-$(DL_DIR)/$(LIBFUSE_SOURCE):
- $(call DOWNLOAD,$(LIBFUSE_SITE),$(LIBFUSE_SOURCE))
-$(LIBFUSE_DIR)/.source: $(DL_DIR)/$(LIBFUSE_SOURCE)
- $(ZCAT) $(DL_DIR)/$(LIBFUSE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(LIBFUSE_DIR) package/fuse/ \*.patch
- touch $@
-
-
-$(LIBFUSE_DIR)/.configured: $(LIBFUSE_DIR)/.source
- (cd $(LIBFUSE_DIR); rm -rf config.cache ; \
- $(TARGET_CONFIGURE_OPTS) \
- CFLAGS="$(TARGET_CFLAGS)" \
- ./configure $(QUIET) \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --sysconfdir=/etc \
- --program-prefix="" \
+LIBFUSE_INSTALL_STAGING = YES
+LIBFUSE_LIBTOOL_PATCH = NO
+LIBFUSE_CONF_OPT= --program-prefix="" \
--enable-shared \
--enable-static \
--disable-nls \
--disable-example \
--disable-kernel-module \
--enable-lib \
- --enable-util \
- );
- touch $@
-
-$(LIBFUSE_DIR)/.compiled: $(LIBFUSE_DIR)/.configured
- $(MAKE) CC=$(TARGET_CC) -C $(LIBFUSE_DIR)
- touch $@
+ --enable-util
-$(STAGING_DIR)/usr/lib/libfuse.so: $(LIBFUSE_DIR)/.compiled
- $(MAKE) -C $(LIBFUSE_DIR) DESTDIR=$(STAGING_DIR)/ install
- touch -c $@
-
-$(TARGET_DIR)/usr/lib/libfuse.so: $(STAGING_DIR)/usr/lib/libfuse.so
- mkdir -p $(TARGET_DIR)/usr/lib
- mkdir -p $(TARGET_DIR)/usr/bin
+define LIBFUSE_INSTALL_TARGET_CMDS
cp -dpf $(STAGING_DIR)/usr/bin/fusermount $(TARGET_DIR)/usr/bin/
- $(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/usr/bin/fusermount
cp -dpf $(STAGING_DIR)/usr/lib/libfuse.so* $(TARGET_DIR)/usr/lib/
- $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libfuse.so
- touch -c $@
-
-libfuse: $(TARGET_DIR)/usr/lib/libfuse.so
-
-libfuse-source: $(DL_DIR)/$(LIBFUSE_SOURCE)
+endef
-libfuse-clean:
- -$(MAKE) -C $(LIBFUSE_DIR) DESTDIR=$(STAGING_DIR) uninstall
- -$(MAKE) -C $(LIBFUSE_DIR) clean
+define LIBFUSE_CLEAN_CMDS
+ -$(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) uninstall
+ -$(MAKE) -C $(@D) clean
rm -f $(TARGET_DIR)/usr/bin/fusermount $(TARGET_DIR)/usr/lib/libfuse.so*
+endef
-libfuse-dirclean:
- rm -rf $(LIBFUSE_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_LIBFUSE),y)
-TARGETS+=libfuse
-endif
+$(eval $(call AUTOTARGETS,package,libfuse))