diff options
| author | wiz <wiz@pkgsrc.org> | 2016-01-08 11:59:36 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2016-01-08 11:59:36 +0000 |
| commit | 6377c2bbd12be6fc555b67175c0df64d71e5a144 (patch) | |
| tree | 28bc926f0ff41a84f0d9b0e0f7fe7a5a74bbfdb5 /devel/flex | |
| parent | d173c6f82b521c3b2986a0c103e51c87d086c825 (diff) | |
| download | pkgsrc-6377c2bbd12be6fc555b67175c0df64d71e5a144.tar.gz | |
Disable bison tests to avoid bison dependency, since bison
depends on flex.
Diffstat (limited to 'devel/flex')
| -rw-r--r-- | devel/flex/Makefile | 4 | ||||
| -rw-r--r-- | devel/flex/distinfo | 3 | ||||
| -rw-r--r-- | devel/flex/patches/patch-tests_Makefile.in | 31 |
3 files changed, 35 insertions, 3 deletions
diff --git a/devel/flex/Makefile b/devel/flex/Makefile index eed2f2112b8..4b593b09692 100644 --- a/devel/flex/Makefile +++ b/devel/flex/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2016/01/07 12:05:30 wiz Exp $ +# $NetBSD: Makefile,v 1.45 2016/01/08 11:59:36 wiz Exp $ DISTNAME= flex-2.6.0 CATEGORIES= lang @@ -12,7 +12,7 @@ LICENSE= 2-clause-bsd USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes -USE_TOOLS+= gm4:run bison +USE_TOOLS+= gm4:run GNU_CONFIGURE= yes INFO_FILES= yes diff --git a/devel/flex/distinfo b/devel/flex/distinfo index 120152d0f26..b66af86c2e5 100644 --- a/devel/flex/distinfo +++ b/devel/flex/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.21 2016/01/07 12:05:30 wiz Exp $ +$NetBSD: distinfo,v 1.22 2016/01/08 11:59:36 wiz Exp $ SHA1 (flex-2.6.0.tar.xz) = 684c927c9f1b170e9627338de12e99cf2c224b91 RMD160 (flex-2.6.0.tar.xz) = 07c8ffa268fc4a9a117e9c12736f8b58a583dde8 @@ -7,3 +7,4 @@ Size (flex-2.6.0.tar.xz) = 1369552 bytes SHA1 (patch-src_Makefile.am) = b50c07da46385500c1a220967c84bea1027b4081 SHA1 (patch-src_Makefile.in) = 8d36fbd12918986715c53c772df549a5057325b7 SHA1 (patch-src_filter.c) = 377be93afefeca93efa1f8eae0407374bd006ab3 +SHA1 (patch-tests_Makefile.in) = cff98017e0cc0046b57d3b50c9d07ca43d7ce4f7 diff --git a/devel/flex/patches/patch-tests_Makefile.in b/devel/flex/patches/patch-tests_Makefile.in new file mode 100644 index 00000000000..d3d43b6dbb3 --- /dev/null +++ b/devel/flex/patches/patch-tests_Makefile.in @@ -0,0 +1,31 @@ +$NetBSD: patch-tests_Makefile.in,v 1.1 2016/01/08 11:59:36 wiz Exp $ + +Disable bison tests since we don't want to build with bison +to avoid a dependency cycle, since bison depends on flex. + +--- tests/Makefile.in.orig 2015-11-17 16:19:46.000000000 +0000 ++++ tests/Makefile.in +@@ -131,8 +131,8 @@ CONFIG_HEADER = $(top_builddir)/src/conf + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + am__EXEEXT_1 = alloc_extra$(EXEEXT) array_nr$(EXEEXT) array_r$(EXEEXT) \ +- basic_nr$(EXEEXT) basic_r$(EXEEXT) bison_nr$(EXEEXT) \ +- bison_yylloc$(EXEEXT) bison_yylval$(EXEEXT) c_cxx_nr$(EXEEXT) \ ++ basic_nr$(EXEEXT) basic_r$(EXEEXT) \ ++ c_cxx_nr$(EXEEXT) \ + c_cxx_r$(EXEEXT) ccl$(EXEEXT) cxx_basic$(EXEEXT) \ + cxx_multiple_scanners$(EXEEXT) debug_nr$(EXEEXT) \ + debug_r$(EXEEXT) extended$(EXEEXT) header_nr$(EXEEXT) \ +@@ -1440,12 +1440,6 @@ string_r_SOURCES = string_r.l + top_SOURCES = top.l top_main.c + yyextra_SOURCES = yyextra.l + BUILT_SOURCES = \ +- bison_nr_parser.h \ +- bison_nr_scanner.h \ +- bison_yylloc_parser.h \ +- bison_yylloc_scanner.h \ +- bison_yylval_parser.h \ +- bison_yylval_scanner.h \ + header_nr_scanner.h \ + header_r_scanner.h \ + multiple_scanners_nr_1.h \ |