diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mesa/Makefile.bsd-wrapper | 3 | ||||
| -rwxr-xr-x | lib/mesa/configure | 13 | ||||
| -rw-r--r-- | lib/mesa/configure.ac | 9 |
3 files changed, 22 insertions, 3 deletions
diff --git a/lib/mesa/Makefile.bsd-wrapper b/lib/mesa/Makefile.bsd-wrapper index 0a4abf340..3c1f1d104 100644 --- a/lib/mesa/Makefile.bsd-wrapper +++ b/lib/mesa/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.11 2017/08/14 09:57:57 jsg Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.12 2017/08/26 05:58:10 jsg Exp $ .include <bsd.own.mk> @@ -24,6 +24,7 @@ CONFIGURE_ARGS= --with-dri-drivers=${DRI_DRIVERS} \ --disable-silent-rules \ --disable-llvm \ --disable-glx-tls \ + --disable-regen-sources \ --enable-gles1 --enable-gles2 \ --enable-shared-glapi \ --enable-osmesa \ diff --git a/lib/mesa/configure b/lib/mesa/configure index 9a04838f6..ae2e4c2e5 100755 --- a/lib/mesa/configure +++ b/lib/mesa/configure @@ -1131,6 +1131,7 @@ enable_fast_install with_gnu_ld with_sysroot enable_libtool_lock +enable_regen_sources enable_pwr8 enable_debug enable_profile @@ -1909,6 +1910,8 @@ Optional Features: --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) + --disable-regen-sources disable regenerating source with python and yacc + [default=enabled] --disable-pwr8-inst disable POWER8-specific instructions --enable-debug use debug compiler flags and macros [default=disabled] @@ -18017,7 +18020,15 @@ else fi fi - if test -n "$PYTHON2"; then +# Check whether --enable-regen-sources was given. +if test "${enable_regen_sources+set}" = set; then : + enableval=$enable_regen_sources; regen_sources="$enableval" +else + regen_sources=yes +fi + + + if test "x$regen_sources" = xyes; then REGEN_SOURCES_TRUE= REGEN_SOURCES_FALSE='#' else diff --git a/lib/mesa/configure.ac b/lib/mesa/configure.ac index 8d70655eb..5cc47013f 100644 --- a/lib/mesa/configure.ac +++ b/lib/mesa/configure.ac @@ -159,7 +159,14 @@ else fi fi -AM_CONDITIONAL(REGEN_SOURCES, test -n "$PYTHON2") +dnl Avoid attempting to rebuild files with python and yacc +AC_ARG_ENABLE([regen-sources], + [AS_HELP_STRING([--disable-regen-sources], + [disable regenerating source with python and yacc @<:@default=enabled@:>@])], + [regen_sources="$enableval"], + [regen_sources=yes]) + +AM_CONDITIONAL(REGEN_SOURCES, test "x$regen_sources" = xyes) AC_PROG_INSTALL |