Tue Sep 8 11:21:17 2020 UTC ()
flex: Remove bash dependency.

This was hidden behind a broken test section, and causing circular dependency
problems on some OS with bash -> bison -> flex -> bash.  The GNU make
requirement is still valid, but the test suite no longer requires bash.

Reported by Alver on IRC.


(jperkin)
diff -r1.61 -r1.62 pkgsrc/devel/flex/Makefile
cvs diff -r1.61 -r1.62 pkgsrc/devel/flex/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/flex/Makefile 2017/10/20 06:22:24 1.61
+++ pkgsrc/devel/flex/Makefile 2020/09/08 11:21:17 1.62
@@ -1,46 +1,40 @@ @@ -1,46 +1,40 @@
1# $NetBSD: Makefile,v 1.61 2017/10/20 06:22:24 triaxx Exp $ 1# $NetBSD: Makefile,v 1.62 2020/09/08 11:21:17 jperkin Exp $
2 2
3DISTNAME= flex-2.6.4 3DISTNAME= flex-2.6.4
4CATEGORIES= devel lang 4CATEGORIES= devel lang
5MASTER_SITES= ${MASTER_SITE_GITHUB:=westes/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=westes/}
6GITHUB_RELEASE= v${PKGVERSION_NOREV} 6GITHUB_RELEASE= v${PKGVERSION_NOREV}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://github.com/westes/flex 9HOMEPAGE= https://github.com/westes/flex
10COMMENT= Fast clone of lex(1), the lexical scanner generator 10COMMENT= Fast clone of lex(1), the lexical scanner generator
11LICENSE= 2-clause-bsd 11LICENSE= 2-clause-bsd
12 12
13BUILD_DEPENDS+= help2man-[0-9]*:../../converters/help2man 13BUILD_DEPENDS+= help2man-[0-9]*:../../converters/help2man
14 14
 15USE_LANGUAGES= c c++
15USE_LIBTOOL= yes 16USE_LIBTOOL= yes
16USE_PKGLOCALEDIR= yes 17USE_PKGLOCALEDIR= yes
17USE_TOOLS+= gm4:run makeinfo gettext 18USE_TOOLS+= gm4:run gmake makeinfo gettext
18GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
19INFO_FILES= yes 20INFO_FILES= yes
20 21
21TEST_TARGET= check 22TEST_TARGET= check
22LIBS.SunOS+= -lm 23LIBS.SunOS+= -lm
23 24
24.include "../../mk/bsd.prefs.mk" 25.include "../../mk/bsd.prefs.mk"
25 26
26CFLAGS.AIX+= -D_LINUX_SOURCE_COMPAT 27CFLAGS.AIX+= -D_LINUX_SOURCE_COMPAT
27 28
28.if ${OS_VARIANT} == "SCOOSR5" 29.if ${OS_VARIANT} == "SCOOSR5"
29LDFLAGS.SCO_SV+= -lsocket 30LDFLAGS.SCO_SV+= -lsocket
30.endif 31.endif
31 32
32# https://github.com/westes/flex/issues/219 33# https://github.com/westes/flex/issues/219
33CONFIGURE_ENV.NetBSD+= ac_cv_func_reallocarray=no 34CONFIGURE_ENV.NetBSD+= ac_cv_func_reallocarray=no
34 35
35# https://github.com/westes/flex/issues/241 36# https://github.com/westes/flex/issues/241
36CFLAGS.Linux+= -D_GNU_SOURCE 37CFLAGS.Linux+= -D_GNU_SOURCE
37 38
38#.if !empty(PKGSRC_RUN_TEST:M[Yy][Ee][Ss]) 
39USE_LANGUAGES= c c++ 
40USE_TOOLS+= bash:build 
41REPLACE_BASH= tests/testwrapper.sh tests/options.cn 
42USE_TOOLS+= gmake # bmake has problems with the test suite 
43#.endif 
44 
45.include "../../devel/gettext-lib/buildlink3.mk" 39.include "../../devel/gettext-lib/buildlink3.mk"
46.include "../../mk/bsd.pkg.mk" 40.include "../../mk/bsd.pkg.mk"