summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorMatthias Andree <mandree@FreeBSD.org>2012-06-13 19:54:22 +0000
committerMatthias Andree <mandree@FreeBSD.org>2012-06-13 19:54:22 +0000
commit244afaceb997f5d736c9269685dbe919d6a5bac2 (patch)
tree8dcafd53f9a23d7f9e56c93d65a00f82b8978524 /misc
parentUpdate to new upstream release 1.42.4. (diff)
Dispose of OPTIONSFILE for the nonce, to fix the build.
There are no dialog(1)-based options for now. This isn't the final solution, but works until the proper fix becomes known. The problem is that OPTIONS_EXCLUDE=NLS does not work, it gets overridden when the options.mk file reads e2fsprogs's $OPTIONSFILE.
Notes
Notes: svn path=/head/; revision=299209
Diffstat (limited to 'misc')
-rw-r--r--misc/e2fsprogs-libuuid/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/misc/e2fsprogs-libuuid/Makefile b/misc/e2fsprogs-libuuid/Makefile
index f6def15ff773..d6e4d2eb1bbe 100644
--- a/misc/e2fsprogs-libuuid/Makefile
+++ b/misc/e2fsprogs-libuuid/Makefile
@@ -16,6 +16,7 @@ CONFLICTS= ossp-uuid-[0-9]*
CONFIGURE_ARGS= --enable-elf-shlibs
WITHOUT_NLS= yes
+OPTIONSFILE= # works around optionsNG trouble
MASTERDIR= ${.CURDIR}/../../sysutils/e2fsprogs
MAKE_ARGS= LIB_SUBDIRS=lib/uuid
USE_GMAKE= yes