diff options
| author | mandree <mandree@FreeBSD.org> | 2017-10-29 17:10:56 +0800 |
|---|---|---|
| committer | mandree <mandree@FreeBSD.org> | 2017-10-29 17:10:56 +0800 |
| commit | 8d40e0f8653e8b8076561f3ec3ffe8cf45cb9df9 (patch) | |
| tree | 0345d6f3364b2276223d3d8adcb10a4f1bce5dc1 /misc | |
| parent | 0250c3d286fdefd9dc190148653721d35c3df1ee (diff) | |
| download | freebsd-ports-gnome-8d40e0f8653e8b8076561f3ec3ffe8cf45cb9df9.tar.gz freebsd-ports-gnome-8d40e0f8653e8b8076561f3ec3ffe8cf45cb9df9.tar.zst freebsd-ports-gnome-8d40e0f8653e8b8076561f3ec3ffe8cf45cb9df9.zip | |
Update to new upstream 1.43.7, install libext2fs.so [1].
Install shared libraries, and use them (except for e2fsck, which links it
statically so it can be used from /sbin), requested by pgf@ and fsu@.
To that end, we need to add LIB_DEPENDS and tweak CONFIGURE_ARGS (notably
LDFLAGS need to be passed there already, not in MAKE_ARGS, so that we can find
libuuid/libblkid).
Use @comment trick in pkg-plist to ignore not-to-install libraries (libss,
libblkid - these have their own ports) while shutting up make check-plist and
poudriere checks at the same time.
Reported by: pgf@, fsu@ [1]
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/e2fsprogs-libblkid/Makefile | 4 | ||||
| -rw-r--r-- | misc/e2fsprogs-libuuid/Makefile | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/misc/e2fsprogs-libblkid/Makefile b/misc/e2fsprogs-libblkid/Makefile index b47705c6be2b..b915e7812c7b 100644 --- a/misc/e2fsprogs-libblkid/Makefile +++ b/misc/e2fsprogs-libblkid/Makefile @@ -12,12 +12,13 @@ _no_license_file= sorry LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid -CONFIGURE_ARGS= --enable-elf-shlibs +CONFIGURE_ARGS= --enable-elf-shlibs --disable-libuuid --enable-libblkid MASTERDIR= ${.CURDIR}/../../sysutils/e2fsprogs MAKE_ARGS= LIB_SUBDIRS=lib/blkid LDFLAGS_SHLIB=-L${LOCALBASE}/lib USE_LDCONFIG= yes ALL_TARGET= libs +LDFLAGS+= -L${LOCALBASE}/lib INSTALL_TARGET= install install-shlibs INSTALL_WRKSRC= ${WRKSRC}/lib/blkid @@ -28,7 +29,6 @@ pre-build: cd ${WRKSRC}/util && ${MAKE_CMD} subst post-build: - cd ${WRKSRC}/lib/uuid && ${MAKE_CMD} cd ${INSTALL_WRKSRC} && ${MAKE_CMD} check .include "${MASTERDIR}/Makefile" diff --git a/misc/e2fsprogs-libuuid/Makefile b/misc/e2fsprogs-libuuid/Makefile index 9cc53c269774..0dfb20ca4120 100644 --- a/misc/e2fsprogs-libuuid/Makefile +++ b/misc/e2fsprogs-libuuid/Makefile @@ -10,7 +10,7 @@ COMMENT= UUID library from e2fsprogs package LICENSE= BSD3CLAUSE LICENSE_FILE= ${INSTALL_WRKSRC}/COPYING -CONFIGURE_ARGS= --enable-elf-shlibs +CONFIGURE_ARGS= --enable-elf-shlibs --enable-libuuid OPTIONS_EXCLUDE= NLS MASTERDIR= ${.CURDIR}/../../sysutils/e2fsprogs |