From owner-svn-ports-all@freebsd.org Sun Sep 24 22:38:27 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 947EFE02EF7; Sun, 24 Sep 2017 22:38:27 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6309864BC5; Sun, 24 Sep 2017 22:38:27 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8OMcQiO080670; Sun, 24 Sep 2017 22:38:26 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8OMcQek080668; Sun, 24 Sep 2017 22:38:26 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <201709242238.v8OMcQek080668@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Sun, 24 Sep 2017 22:38:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r450553 - head/sysutils/e2fsprogs X-SVN-Group: ports-head X-SVN-Commit-Author: mandree X-SVN-Commit-Paths: head/sysutils/e2fsprogs X-SVN-Commit-Revision: 450553 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Sep 2017 22:38:27 -0000 Author: mandree Date: Sun Sep 24 22:38:26 2017 New Revision: 450553 URL: https://svnweb.freebsd.org/changeset/ports/450553 Log: Add FUSEFS option. Assorted fixes. This adds a FUSEFS option based on earlier work by Fedor Uporov (fsu@) and Pedro Giffuni (pfg@). While here, repair DOCS/NLS options, broken since r418578 (1.43.1). Leverage OPTIONS_SUB to replace NLS and FUSEFS in pkg-plist. Add --enable-libuuid to avoid picking up a dynamic system libuuid.so from /usr/local which would break the static /sbin/e2fsck (by including a lib below /usr). Bump PORTREVISION. Reported by: pfg@ Modified: head/sysutils/e2fsprogs/Makefile head/sysutils/e2fsprogs/pkg-plist Modified: head/sysutils/e2fsprogs/Makefile ============================================================================== --- head/sysutils/e2fsprogs/Makefile Sun Sep 24 22:16:45 2017 (r450552) +++ head/sysutils/e2fsprogs/Makefile Sun Sep 24 22:38:26 2017 (r450553) @@ -3,7 +3,7 @@ PORTNAME= e2fsprogs PORTVERSION= 1.43.6 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= sysutils MASTER_SITES= KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION} @@ -18,40 +18,39 @@ LICENSE_DISTFILES_GPLv2= ${DISTNAME}${EXTRACT_SUFX} PORTSCOUT= ignore # cannot handle the version in the directory +BROKEN_aarch64= fails to link: missing sbrk + USES= cpe gmake pkgconfig tar:xz CPE_VENDOR= e2fsprogs_project USE_CSTD= gnu99 USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--disable-fsck --disable-e2initrd-helper \ +CONFIGURE_ARGS+=--disable-fsck \ + --disable-e2initrd-helper \ + --enable-libuuid \ --with-root-prefix='${PREFIX}' CPPFLAGS+= -I${WRKSRC}/lib -I${LOCALBASE}/include # -D_EXT2_USE_C_VERSIONS MAKE_ARGS+= LDFLAGS='${LDFLAGS} -L${LOCALBASE}/lib' pkgconfigdir='${PREFIX}/libdata/pkgconfig' MAKE_ENV+= CHECK_CMD=@true .if !defined(MASTERDIR) -OPTIONS_DEFINE= DOCS NLS +OPTIONS_DEFINE= DOCS NLS FUSEFS PARALLELTESTS OPTIONS_EXCLUDE+= EXAMPLES +OPTIONS_SUB= yes -BUILD_DEPENDS+= gdd:sysutils/coreutils - -BROKEN_aarch64= fails to link: missing sbrk -#BROKEN_armv6= fails self-tests: Running e2fsprogs test suite...failed: f_pre_1970_date_encoding -#BROKEN_mips= fails self-tests: Running e2fsprogs test suite...failed: f_pre_1970_date_encoding -#BROKEN_mips64= fails self-tests: Running e2fsprogs test suite...failed: f_pre_1970_date_encoding -#BROKEN_powerpc64= fails self-tests: Running e2fsprogs test suite...Signal (11) SIGSEGV - -PORTDOCS= NOTICE README RELEASE-NOTES SUBMITTING-PATCHES - -OPTIONS_DEFINE= PARALLELTESTS OPTIONS_SINGLE= SELFTEST OPTIONS_SINGLE_SELFTEST= NOTESTS SMALLTESTS ALLTESTS OPTIONS_DEFAULT= SMALLTESTS +FUSEFS_DESC= Build user-land ext2/3/4 FUSE module (slow!) SELFTEST_DESC= Choose which set of self-tests to run -NOTESTS_DESC= Do not run any self-tests (only Tier-1 & DISCOURAGED) -SMALLTESTS_DESC=Run tests that fit into 500 MB disk space (DEFAULT) -ALLTESTS_DESC= Run most self-tests (requires more RAM & disk space) -PARALLELTESTS_DESC= Run self-tests in parallel (requires more disk space) +NOTESTS_DESC= Do not run any self-tests (Tier-1, DISCOURAGED) +SMALLTESTS_DESC=Run tests that need <500 MB disk space (DEFAULT) +ALLTESTS_DESC= Run most self-tests (needs more RAM/disk space) +PARALLELTESTS_DESC= Parallelize self-tests (needs more disk space) + +BUILD_DEPENDS+= gdd:sysutils/coreutils + +PORTDOCS= NOTICE README RELEASE-NOTES SUBMITTING-PATCHES .endif PKGDEINSTALL= ${PKGINSTALL} @@ -60,6 +59,12 @@ MAKE_ARGS+= V=1 .include +.if ${PORT_OPTIONS:MFUSEFS} +USES+= fuse +CONFIGURE_ARGS+=--enable-fuse2fs +LDFLAGS+= -L${LOCALBASE}/lib +.endif + .if ${PORT_OPTIONS:MNLS} USES+= gettext iconv:build .endif @@ -72,7 +77,6 @@ USE_PERL5= build .include .if ${PORT_OPTIONS:MNLS} -PLIST_SUB= NLS="" . if empty(ICONV_LIB) libintl= "${LOCALBASE}/lib/libintl.a" . else @@ -80,7 +84,6 @@ libintl= "${LOCALBASE}/lib/libintl.a ${LOCALBASE}/lib/ . endif .else CONFIGURE_ARGS+=--disable-nls -PLIST_SUB= NLS="@comment " libintl= .endif @@ -162,9 +165,9 @@ post-build: # else we're in trouble if e2fsck is needed for boot: # (we don't use e2fsck.static, since we can link libc.so dynamically) cd ${WRKSRC}/e2fsck && ${RM} e2fsck \ - && ${MAKE_CMD} e2fsck \ + && ${MAKE_CMD} e2fsck V=1 \ STATIC_LIBS="../lib/libext2fs.a ../lib/libcom_err.a \ - ../lib/libblkid.a ../lib/libuuid.a" \ + ../lib/libblkid.a ../lib/libuuid.a" \ LIBINTL=${libintl} LIBMAGIC=/usr/lib/libmagic.a\ -lz # Regression check: avoid a port (not upstream!) regression from 1.40.5, # check that e2fsck isn't dynalinked against anything but libc.so: Modified: head/sysutils/e2fsprogs/pkg-plist ============================================================================== --- head/sysutils/e2fsprogs/pkg-plist Sun Sep 24 22:16:45 2017 (r450552) +++ head/sysutils/e2fsprogs/pkg-plist Sun Sep 24 22:38:26 2017 (r450553) @@ -2,6 +2,7 @@ bin/chattr bin/lsattr etc/mke2fs.conf.dist man/man1/chattr.1.gz +%%FUSEFS%%man/man1/fuse2fs.1.gz man/man1/lsattr.1.gz man/man5/e2fsck.conf.5.gz man/man5/mke2fs.conf.5.gz @@ -44,6 +45,7 @@ sbin/fsck.ext2 sbin/fsck.ext3 sbin/fsck.ext4 sbin/fsck_ext2fs +%%FUSEFS%%sbin/fuse2fs sbin/logsave sbin/mke2fs sbin/mkfs.ext2