Alexander Pyhalov
2017-03-14 2de614955bff808e2cbd9a6008617104e2c0485f
flex: update to 2.6.3 (upstream fix)
6 files deleted
4 files added
2 files renamed
518 ■■■■■ changed files
components/developer/flex/Makefile 70 ●●●●● patch | view | raw | blame | history
components/developer/flex/flex.p5m 40 ●●●●● patch | view | raw | blame | history
components/developer/flex/flexruntime.p5m 42 ●●●●● patch | view | raw | blame | history
components/developer/flex/manifests/sample-manifest.p5m 24 ●●●●● patch | view | raw | blame | history
components/developer/flex/patches/01-gnu-m4.patch 27 ●●●●● patch | view | raw | blame | history
components/developer/flex/test/results-all.master 124 ●●●●● patch | view | raw | blame | history
components/flex/Makefile 70 ●●●●● patch | view | raw | blame | history
components/flex/flex.license 42 ●●●●● patch | view | raw | blame | history
components/flex/flexruntime.p5m 44 ●●●●● patch | view | raw | blame | history
components/flex/patches/000-flex-2.5.35.Makefile.in.patch 21 ●●●●● patch | view | raw | blame | history
components/flex/patches/001-flex-2.5.35.test-pthread.Makefile.in.patch 11 ●●●●● patch | view | raw | blame | history
components/flex/resolve.deps 3 ●●●●● patch | view | raw | blame | history
components/developer/flex/Makefile
New file
@@ -0,0 +1,70 @@
#
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
# Common Development and Distribution License (the "License").
# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
# If applicable, add the following below this CDDL HEADER, with the
# fields enclosed by brackets "[]" replaced with your own identifying
# information: Portions Copyright [yyyy] [name of copyright owner]
#
# CDDL HEADER END
#
#
# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME=        flex
COMPONENT_VERSION=    2.6.3
COMPONENT_PROJECT_URL=    https://github.com/westes/flex/releases
COMPONENT_SRC=        $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=    $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH=    \
    sha256:68b2742233e747c462f781462a2a1e299dc6207401dac8f0bbb316f48565c2aa
COMPONENT_ARCHIVE_URL=    https://github.com/westes/flex/releases/download/v$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
LDFLAGS += $(CC_BITS)
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/configure.mk
include $(WS_MAKE_RULES)/ips.mk
COMPONENT_PRE_CONFIGURE_ACTION += ($(CLONEY) $(SOURCE_DIR) $(@D))
CONFIGURE_OPTIONS  +=        --infodir=$(CONFIGURE_INFODIR)
CONFIGURE_OPTIONS  +=        M4="$(GNUBIN)/m4"
COMPONENT_TEST_ENV +=        PATH=$(GNUBIN):$(USRBINDIR)
COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master
COMPONENT_TEST_TRANSFORMS += \
    '-n ' \
    '-e "/=====/p" ' \
    '-e "/TOTAL/p" ' \
    '-e "/SKIP/p" ' \
    '-e "/PASS/p" ' \
    '-e "/FAIL/p" ' \
    '-e "/ERROR/p" '
# common targets
build:        $(BUILD_32_and_64)
install:    $(INSTALL_32_and_64)
test:        $(TEST_32_and_64)
REQUIRED_PACKAGES += developer/macro/gnu-m4
REQUIRED_PACKAGES += developer/build/help2man
REQUIRED_PACKAGES += system/library
REQUIRED_PACKAGES += system/library/math
components/developer/flex/flex.p5m
File was renamed from components/flex/flex.p5m
@@ -18,48 +18,52 @@
#
# CDDL HEADER END
#
# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/developer/lexer/flex@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
<transform file path=usr.*/man/.+ -> default mangler.man.stability "pass-through volatile">
set name=pkg.fmri \
    value=pkg:/developer/lexer/flex@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Flex Lexer"
set name=com.oracle.info.description value="the flex lexer utility"
set name=info.classification value="org.opensolaris.category.2008:Development/Other Languages"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.classification \
    value="org.opensolaris.category.2008:Development/Other Languages"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=org.opensolaris.arc-caseid value=PSARC/2007/289 value=PSARC/2016/309
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
set name=org.opensolaris.arc-caseid value=PSARC/2007/289
license flex.license license='BSD'
file path=usr/bin/flex
file path=usr/bin/$(MACH64)/flex
link path=usr/bin/flex++ target=flex
file path=usr/include/FlexLexer.h
link path=usr/sfw/bin/flex target=../../bin/flex
file path=usr/share/info/flex.info
file path=usr/share/info/flex.info-1
file path=usr/share/info/flex.info-2
file path=usr/share/locale/ca/LC_MESSAGES/flex.mo
file path=usr/share/locale/da/LC_MESSAGES/flex.mo
file path=usr/share/locale/de/LC_MESSAGES/flex.mo
file path=usr/share/locale/en@boldquot/LC_MESSAGES/flex.mo
file path=usr/share/locale/en@quot/LC_MESSAGES/flex.mo
file path=usr/share/locale/eo/LC_MESSAGES/flex.mo
file path=usr/share/locale/es/LC_MESSAGES/flex.mo
file path=usr/share/locale/fi/LC_MESSAGES/flex.mo
file path=usr/share/locale/fr/LC_MESSAGES/flex.mo
file path=usr/share/locale/ga/LC_MESSAGES/flex.mo
file path=usr/share/locale/hr/LC_MESSAGES/flex.mo
file path=usr/share/locale/ko/LC_MESSAGES/flex.mo
file path=usr/share/locale/nl/LC_MESSAGES/flex.mo
file path=usr/share/locale/pl/LC_MESSAGES/flex.mo
file path=usr/share/locale/pt_BR/LC_MESSAGES/flex.mo
file path=usr/share/locale/ro/LC_MESSAGES/flex.mo
file path=usr/share/locale/ru/LC_MESSAGES/flex.mo
file path=usr/share/locale/sr/LC_MESSAGES/flex.mo
file path=usr/share/locale/sv/LC_MESSAGES/flex.mo
file path=usr/share/locale/tr/LC_MESSAGES/flex.mo
file path=usr/share/locale/vi/LC_MESSAGES/flex.mo
file path=usr/share/locale/zh_CN/LC_MESSAGES/flex.mo
file path=usr/share/man/man1/flex.1 mangler.man.stability=volatile
link path=usr/sfw/bin/flex target=../../bin/flex
link path=usr/sfw/bin/$(MACH64)/flex target=../../../bin/$(MACH64)/flex
depend fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/m4 type=require
legacy pkg=SUNWflexlex \
    name="Flex Lexer" \
    desc="The Flex Lexer - A lex replacement/substitute"
file path=usr/share/locale/zh_TW/LC_MESSAGES/flex.mo
file path=usr/share/man/man1/flex.1
legacy pkg=SUNWflexlex desc="The Flex Lexer - A lex replacement/substitute" \
    name="Flex Lexer"
license COPYING license=BSD
depend type=require fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/m4
components/developer/flex/flexruntime.p5m
New file
@@ -0,0 +1,42 @@
#
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
# Common Development and Distribution License (the "License").
# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
# If applicable, add the following below this CDDL HEADER, with the
# fields enclosed by brackets "[]" replaced with your own identifying
# information: Portions Copyright [yyyy] [name of copyright owner]
#
# CDDL HEADER END
#
# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
    value=pkg:/system/library/flex-runtime@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Flex Lexer (Runtime)"
set name=com.oracle.info.description value="the flex lexer runtime"
set name=info.classification \
    value="org.opensolaris.category.2008:Development/Other Languages"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=org.opensolaris.arc-caseid value=PSARC/2007/289 value=PSARC/2016/309
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
link path=usr/lib/$(MACH64)/libfl.so target=libfl.so.2.0.0
link path=usr/lib/$(MACH64)/libfl.so.1 target=libfl.so.2.0.0
link path=usr/lib/$(MACH64)/libfl.so.2 target=libfl.so.2.0.0
file path=usr/lib/$(MACH64)/libfl.so.2.0.0
link path=usr/lib/libfl.so target=libfl.so.2.0.0
link path=usr/lib/libfl.so.1 target=libfl.so.2.0.0
link path=usr/lib/libfl.so.2 target=libfl.so.2.0.0
file path=usr/lib/libfl.so.2.0.0
license COPYING license=BSD
components/developer/flex/manifests/sample-manifest.p5m
File was renamed from components/flex/manifests/sample-manifest.p5m
@@ -23,10 +23,23 @@
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
file path=usr/bin/$(MACH64)/flex
link path=usr/bin/$(MACH64)/flex++ target=flex
file path=usr/bin/flex
link path=usr/bin/flex++ target=flex
file path=usr/include/FlexLexer.h
file path=usr/lib/$(MACH64)/libfl.so.1
file path=usr/lib/libfl.so.1
file path=usr/lib/$(MACH64)/libfl.a
link path=usr/lib/$(MACH64)/libfl.so target=libfl.so.2.0.0
link path=usr/lib/$(MACH64)/libfl.so.2 target=libfl.so.2.0.0
file path=usr/lib/$(MACH64)/libfl.so.2.0.0
file path=usr/lib/libfl.a
link path=usr/lib/libfl.so target=libfl.so.2.0.0
link path=usr/lib/libfl.so.2 target=libfl.so.2.0.0
file path=usr/lib/libfl.so.2.0.0
file path=usr/share/doc/flex/AUTHORS
file path=usr/share/doc/flex/COPYING
file path=usr/share/doc/flex/NEWS
file path=usr/share/doc/flex/ONEWS
file path=usr/share/doc/flex/README.md
file path=usr/share/info/dir
file path=usr/share/info/flex.info
file path=usr/share/info/flex.info-1
@@ -34,17 +47,24 @@
file path=usr/share/locale/ca/LC_MESSAGES/flex.mo
file path=usr/share/locale/da/LC_MESSAGES/flex.mo
file path=usr/share/locale/de/LC_MESSAGES/flex.mo
file path=usr/share/locale/en@boldquot/LC_MESSAGES/flex.mo
file path=usr/share/locale/en@quot/LC_MESSAGES/flex.mo
file path=usr/share/locale/eo/LC_MESSAGES/flex.mo
file path=usr/share/locale/es/LC_MESSAGES/flex.mo
file path=usr/share/locale/fi/LC_MESSAGES/flex.mo
file path=usr/share/locale/fr/LC_MESSAGES/flex.mo
file path=usr/share/locale/ga/LC_MESSAGES/flex.mo
file path=usr/share/locale/hr/LC_MESSAGES/flex.mo
file path=usr/share/locale/ko/LC_MESSAGES/flex.mo
file path=usr/share/locale/nl/LC_MESSAGES/flex.mo
file path=usr/share/locale/pl/LC_MESSAGES/flex.mo
file path=usr/share/locale/pt_BR/LC_MESSAGES/flex.mo
file path=usr/share/locale/ro/LC_MESSAGES/flex.mo
file path=usr/share/locale/ru/LC_MESSAGES/flex.mo
file path=usr/share/locale/sr/LC_MESSAGES/flex.mo
file path=usr/share/locale/sv/LC_MESSAGES/flex.mo
file path=usr/share/locale/tr/LC_MESSAGES/flex.mo
file path=usr/share/locale/vi/LC_MESSAGES/flex.mo
file path=usr/share/locale/zh_CN/LC_MESSAGES/flex.mo
file path=usr/share/locale/zh_TW/LC_MESSAGES/flex.mo
file path=usr/share/man/man1/flex.1
components/developer/flex/patches/01-gnu-m4.patch
New file
@@ -0,0 +1,27 @@
Make sure that we always use /usr/gnu/bin/m4 rather than what is available
via the M4 environment variable or what's in the PATH environment variable.
These changes have been sent upstream. See email thread starting at:
  https://sourceforge.net/p/flex/mailman/message/35103749/
--- flex-2.6.3/src/main.c.~1~    2016-12-29 23:03:14.000000000 +0300
+++ flex-2.6.3/src/main.c    2017-03-14 19:31:53.967243261 +0300
@@ -341,6 +341,7 @@
     /* Setup the filter chain. */
     output_chain = filter_create_int(NULL, filter_tee_header, headerfilename);
+#ifndef __sun
     if ( !(m4 = getenv("M4"))) {
         char *slash;
         m4 = M4;
@@ -380,6 +381,9 @@
         }
     }
     filter_create_ext(output_chain, m4, "-P", 0);
+#else
+    filter_create_ext(output_chain, "/usr/gnu/bin/m4", "-P", 0);
+#endif
     filter_create_int(output_chain, filter_fix_linedirs, NULL);
     /* For debugging, only run the requested number of filters. */
components/developer/flex/test/results-all.master
New file
@@ -0,0 +1,124 @@
PASS: alloc_extra
PASS: array_nr
PASS: array_r
PASS: basic_nr
PASS: basic_r
PASS: bison_nr
PASS: bison_yylloc
PASS: bison_yylval
PASS: c_cxx_nr
PASS: c_cxx_r
PASS: ccl
PASS: cxx_basic
PASS: cxx_multiple_scanners
PASS: cxx_restart
PASS: debug_nr
PASS: debug_r
PASS: extended
PASS: header_nr
PASS: header_r
PASS: mem_nr
PASS: mem_r
PASS: multiple_scanners_nr
PASS: multiple_scanners_r
PASS: posix
PASS: posixly_correct
PASS: prefix_nr
PASS: prefix_r
PASS: quote_in_comment
PASS: quotes
PASS: string_nr
PASS: string_r
PASS: top
PASS: yyextra
PASS: reject_nr.reject
PASS: reject_r.reject
PASS: reject_ver.table
PASS: reject_ser.table
PASS: include_by_buffer.direct
PASS: include_by_push.direct
PASS: include_by_reentrant.direct
PASS: rescan_nr.direct
PASS: rescan_r.direct
PASS: cxx_yywrap.i3
PASS: pthread.pthread
PASS: lineno_nr.one
PASS: lineno_r.one
PASS: lineno_trailing.one
PASS: tableopts_opt_nr-Ca.opt
PASS: tableopts_opt_nr-Ce.opt
PASS: tableopts_opt_nr-Cf.opt
PASS: tableopts_opt_nr-CF.opt
PASS: tableopts_opt_nr-Cm.opt
PASS: tableopts_opt_nr-Cem.opt
PASS: tableopts_opt_nr-Cae.opt
PASS: tableopts_opt_nr-Caef.opt
PASS: tableopts_opt_nr-CaeF.opt
PASS: tableopts_opt_nr-Cam.opt
PASS: tableopts_opt_nr-Caem.opt
PASS: tableopts_opt_r-Ca.opt
PASS: tableopts_opt_r-Ce.opt
PASS: tableopts_opt_r-Cf.opt
PASS: tableopts_opt_r-CF.opt
PASS: tableopts_opt_r-Cm.opt
PASS: tableopts_opt_r-Cem.opt
PASS: tableopts_opt_r-Cae.opt
PASS: tableopts_opt_r-Caef.opt
PASS: tableopts_opt_r-CaeF.opt
PASS: tableopts_opt_r-Cam.opt
PASS: tableopts_opt_r-Caem.opt
PASS: tableopts_ser_nr-Ca.ser
PASS: tableopts_ser_nr-Ce.ser
PASS: tableopts_ser_nr-Cf.ser
PASS: tableopts_ser_nr-CF.ser
PASS: tableopts_ser_nr-Cm.ser
PASS: tableopts_ser_nr-Cem.ser
PASS: tableopts_ser_nr-Cae.ser
PASS: tableopts_ser_nr-Caef.ser
PASS: tableopts_ser_nr-CaeF.ser
PASS: tableopts_ser_nr-Cam.ser
PASS: tableopts_ser_nr-Caem.ser
PASS: tableopts_ser_r-Ca.ser
PASS: tableopts_ser_r-Ce.ser
PASS: tableopts_ser_r-Cf.ser
PASS: tableopts_ser_r-CF.ser
PASS: tableopts_ser_r-Cm.ser
PASS: tableopts_ser_r-Cem.ser
PASS: tableopts_ser_r-Cae.ser
PASS: tableopts_ser_r-Caef.ser
PASS: tableopts_ser_r-CaeF.ser
PASS: tableopts_ser_r-Cam.ser
PASS: tableopts_ser_r-Caem.ser
PASS: tableopts_ver_nr-Ca.ver
PASS: tableopts_ver_nr-Ce.ver
PASS: tableopts_ver_nr-Cf.ver
PASS: tableopts_ver_nr-CF.ver
PASS: tableopts_ver_nr-Cm.ver
PASS: tableopts_ver_nr-Cem.ver
PASS: tableopts_ver_nr-Cae.ver
PASS: tableopts_ver_nr-Caef.ver
PASS: tableopts_ver_nr-CaeF.ver
PASS: tableopts_ver_nr-Cam.ver
PASS: tableopts_ver_nr-Caem.ver
PASS: tableopts_ver_r-Ca.ver
PASS: tableopts_ver_r-Ce.ver
PASS: tableopts_ver_r-Cf.ver
PASS: tableopts_ver_r-CF.ver
PASS: tableopts_ver_r-Cm.ver
PASS: tableopts_ver_r-Cem.ver
PASS: tableopts_ver_r-Cae.ver
PASS: tableopts_ver_r-Caef.ver
PASS: tableopts_ver_r-CaeF.ver
PASS: tableopts_ver_r-Cam.ver
PASS: tableopts_ver_r-Caem.ver
PASS: options.cn
============================================================================
============================================================================
# TOTAL: 114
# PASS:  114
# SKIP:  0
# XFAIL: 0
# FAIL:  0
# XPASS: 0
# ERROR: 0
============================================================================
components/flex/Makefile
File was deleted
components/flex/flex.license
File was deleted
components/flex/flexruntime.p5m
File was deleted
components/flex/patches/000-flex-2.5.35.Makefile.in.patch
File was deleted
components/flex/patches/001-flex-2.5.35.test-pthread.Makefile.in.patch
File was deleted
components/flex/resolve.deps
File was deleted