Mon Nov 6 19:01:45 2017 UTC ()
Pullup ticket #5605 - requested by sevan
devel/flex: Linux build fix

Revisions pulled up:
- devel/flex/Makefile                                           1.61

---
   Module Name:    pkgsrc
   Committed By:   triaxx
   Date:           Fri Oct 20 06:22:24 UTC 2017

   Modified Files:
           pkgsrc/devel/flex: Makefile

   Log Message:
   Add workaround for fixing build on Linux

   See https://github.com/westes/flex/issues/241
   The problem is fixed in master branch and the workaround could be removed
   in the next version update.


(bsiegert)
diff -r1.60 -r1.60.4.1 pkgsrc/devel/flex/Makefile
cvs diff -r1.60 -r1.60.4.1 pkgsrc/devel/flex/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/flex/Makefile 2017/07/24 14:34:49 1.60
+++ pkgsrc/devel/flex/Makefile 2017/11/06 19:01:44 1.60.4.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.60 2017/07/24 14:34:49 maya Exp $ 1# $NetBSD: Makefile,v 1.60.4.1 2017/11/06 19:01:44 bsiegert 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
@@ -22,22 +22,25 @@ TEST_TARGET= check @@ -22,22 +22,25 @@ TEST_TARGET= check
22LIBS.SunOS+= -lm 22LIBS.SunOS+= -lm
23 23
24.include "../../mk/bsd.prefs.mk" 24.include "../../mk/bsd.prefs.mk"
25 25
26CFLAGS.AIX+= -D_LINUX_SOURCE_COMPAT 26CFLAGS.AIX+= -D_LINUX_SOURCE_COMPAT
27 27
28.if ${OS_VARIANT} == "SCOOSR5" 28.if ${OS_VARIANT} == "SCOOSR5"
29LDFLAGS.SCO_SV+= -lsocket 29LDFLAGS.SCO_SV+= -lsocket
30.endif 30.endif
31 31
32# https://github.com/westes/flex/issues/219 32# https://github.com/westes/flex/issues/219
33CONFIGURE_ENV.NetBSD+= ac_cv_func_reallocarray=no 33CONFIGURE_ENV.NetBSD+= ac_cv_func_reallocarray=no
34 34
 35# https://github.com/westes/flex/issues/241
 36CFLAGS.Linux+= -D_GNU_SOURCE
 37
35#.if !empty(PKGSRC_RUN_TEST:M[Yy][Ee][Ss]) 38#.if !empty(PKGSRC_RUN_TEST:M[Yy][Ee][Ss])
36USE_LANGUAGES= c c++ 39USE_LANGUAGES= c c++
37USE_TOOLS+= bash:build 40USE_TOOLS+= bash:build
38REPLACE_BASH= tests/testwrapper.sh tests/options.cn 41REPLACE_BASH= tests/testwrapper.sh tests/options.cn
39USE_TOOLS+= gmake # bmake has problems with the test suite 42USE_TOOLS+= gmake # bmake has problems with the test suite
40#.endif 43#.endif
41 44
42.include "../../devel/gettext-lib/buildlink3.mk" 45.include "../../devel/gettext-lib/buildlink3.mk"
43.include "../../mk/bsd.pkg.mk" 46.include "../../mk/bsd.pkg.mk"