aboutsummaryrefslogtreecommitdiffstats
path: root/misc
diff options
context:
space:
mode:
Diffstat (limited to 'misc')
-rw-r--r--misc/e2fsprogs-libblkid/Makefile4
-rw-r--r--misc/e2fsprogs-libuuid/Makefile2
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