diff options
Diffstat (limited to 'package/fuse')
| -rw-r--r-- | package/fuse/Makefile | 30 | ||||
| -rw-r--r-- | package/fuse/patches/patch-fuse_pc_in | 9 | ||||
| -rw-r--r-- | package/fuse/patches/patch-include_config_h_in | 25 | ||||
| -rw-r--r-- | package/fuse/patches/patch-ltmain_sh | 11 |
4 files changed, 12 insertions, 63 deletions
diff --git a/package/fuse/Makefile b/package/fuse/Makefile index 84e6474c9..5515ae209 100644 --- a/package/fuse/Makefile +++ b/package/fuse/Makefile @@ -4,26 +4,30 @@ include ${TOPDIR}/rules.mk PKG_NAME:= fuse -PKG_VERSION:= 2.7.4 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 4879f06570d2225667534c37fea04213 +PKG_VERSION:= 2.9.3 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 33cae22ca50311446400daf8a6255c6a PKG_DESCR:= Filesystem in Userspace (utilities) PKG_SECTION:= fs PKG_DEPENDS:= kmod-fuse-fs libfuse +PKG_BUILDDEP:= libiconv-tiny PKG_URL:= http://fuse.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/} +PKG_LIBNAME:= libfuse +PKG_OPTS:= dev -PKG_SUBPKGS:= FUSE_UTILS LIBFUSE LIBFUSE_DEV +PKG_SUBPKGS:= FUSE_UTILS LIBFUSE PKGSD_LIBFUSE:= FUSE library PKGSC_LIBFUSE:= libs -PKGSD_LIBFUSE_DEV:= FUSE headers -PKGSC_LIBFUSE_DEV:= devel + +ifeq ($(ADK_STATIC),y) +PKG_OPTS+= libmix +endif include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,FUSE_UTILS,fuse-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIBFUSE,libfuse,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBFUSE},${PKGSC_LIBFUSE})) -$(eval $(call PKG_template,LIBFUSE_DEV,libfuse-dev,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBFUSE_DEV},${PKGSC_LIBFUSE_DEV})) +$(eval $(call PKG_template,LIBFUSE,libfuse,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBFUSE},${PKGSC_LIBFUSE},${PKG_OPTS})) CONFIGURE_ARGS+= --enable-lib \ --enable-util \ @@ -44,14 +48,4 @@ libfuse-install: ${CP} ${WRKINST}/usr/lib/libulockmgr.so* \ ${IDIR_LIBFUSE}/usr/lib -libfuse-dev-install: - ${INSTALL_DIR} ${IDIR_LIBFUSE_DEV}/usr/lib/pkgconfig - ${INSTALL_DIR} ${IDIR_LIBFUSE_DEV}/usr/include/fuse - ${INSTALL_DATA} ${WRKINST}/usr/include/*.h \ - ${IDIR_LIBFUSE_DEV}/usr/include - ${INSTALL_DATA} ${WRKINST}/usr/include/fuse/*.h \ - ${IDIR_LIBFUSE_DEV}/usr/include/fuse - ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/fuse.pc \ - ${IDIR_LIBFUSE_DEV}/usr/lib/pkgconfig - include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/fuse/patches/patch-fuse_pc_in b/package/fuse/patches/patch-fuse_pc_in deleted file mode 100644 index 9f21cd567..000000000 --- a/package/fuse/patches/patch-fuse_pc_in +++ /dev/null @@ -1,9 +0,0 @@ ---- fuse-2.7.4.orig/fuse.pc.in 2008-02-19 20:51:21.000000000 +0100 -+++ fuse-2.7.4/fuse.pc.in 2011-04-25 18:02:20.087672599 +0200 -@@ -6,5 +6,5 @@ includedir=@includedir@ - Name: fuse - Description: Filesystem in Userspace - Version: @VERSION@ --Libs: -L${libdir} -lfuse @libfuse_libs@ -+Libs: -L${libdir} -lfuse - Cflags: -I${includedir}/fuse -D_FILE_OFFSET_BITS=64 diff --git a/package/fuse/patches/patch-include_config_h_in b/package/fuse/patches/patch-include_config_h_in deleted file mode 100644 index ea12b31d2..000000000 --- a/package/fuse/patches/patch-include_config_h_in +++ /dev/null @@ -1,25 +0,0 @@ ---- fuse-2.7.4.orig/include/config.h.in 2008-07-25 20:19:18.000000000 +0200 -+++ fuse-2.7.4/include/config.h.in 2011-03-28 21:38:57.561810080 +0200 -@@ -33,10 +33,10 @@ - /* Define to 1 if you have the <string.h> header file. */ - #undef HAVE_STRING_H - --/* Define to 1 if `st_atim' is member of `struct stat'. */ -+/* Define to 1 if `st_atim' is a member of `struct stat'. */ - #undef HAVE_STRUCT_STAT_ST_ATIM - --/* Define to 1 if `st_atimespec' is member of `struct stat'. */ -+/* Define to 1 if `st_atimespec' is a member of `struct stat'. */ - #undef HAVE_STRUCT_STAT_ST_ATIMESPEC - - /* Define to 1 if you have the <sys/stat.h> header file. */ -@@ -76,6 +76,9 @@ - /* Define to the one symbol short name of this package. */ - #undef PACKAGE_TARNAME - -+/* Define to the home page for this package. */ -+#undef PACKAGE_URL -+ - /* Define to the version of this package. */ - #undef PACKAGE_VERSION - diff --git a/package/fuse/patches/patch-ltmain_sh b/package/fuse/patches/patch-ltmain_sh deleted file mode 100644 index 52c9d35f2..000000000 --- a/package/fuse/patches/patch-ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- fuse-2.7.4.orig/ltmain.sh 2005-12-26 22:43:10.000000000 +0100 -+++ fuse-2.7.4/ltmain.sh 2011-03-28 21:40:27.271818746 +0200 -@@ -3292,7 +3292,7 @@ func_mode_link () - # compiler args for GCC - # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|@*) -+ -t[45]*|-txscale*|@*|-fstack-protector*|-flto) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - compile_command="$compile_command $arg" |