SF.net SVN: gar:[23553] csw/mgar/pkg/flex/trunk

[dmichelsen at users.sourceforge.net]

Revision: 23553
          http://sourceforge.net/p/gar/code/23553
Author:   dmichelsen
Date:     2014-05-05 13:56:19 +0000 (Mon, 05 May 2014)
Log Message:
-----------
flex/trunk: Update to 2.5.39

Modified Paths:
--------------
    csw/mgar/pkg/flex/trunk/Makefile
    csw/mgar/pkg/flex/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/flex/trunk/files/0001-Allow-undefined-symbols-in-shared-libs.patch

Modified: csw/mgar/pkg/flex/trunk/Makefile
===================================================================
--- csw/mgar/pkg/flex/trunk/Makefile	2014-05-05 13:51:51 UTC (rev 23552)
+++ csw/mgar/pkg/flex/trunk/Makefile	2014-05-05 13:56:19 UTC (rev 23553)
@@ -1,7 +1,7 @@
 # $Id$
 
 NAME = flex
-VERSION = 2.5.37
+VERSION = 2.5.39
 GARTYPE = v2
 
 DESCRIPTION = A tool for generating text-scanning programs
@@ -14,13 +14,19 @@
 endef
 
 MASTER_SITES += $(SF_MIRRORS)
-DISTFILES += $(DISTNAME).tar.bz2
+DISTFILES += $(DISTNAME).tar.xz
 
+# This is probably the same cause as the bug reported here:
+#   https://sourceforge.net/p/flex/bugs/170/
+PATCHFILES += 0001-Allow-undefined-symbols-in-shared-libs.patch
+
 VENDOR_URL = http://flex.sourceforge.net/
 
 PACKAGES += CSWflex
 SPKG_DESC_CSWflex = A tool for generating text-scanning programs
 # PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWflex += CSWlibfl-pic2
+RUNTIME_DEP_PKGS_CSWflex += CSWlibfl2
 RUNTIME_DEP_PKGS_CSWflex += CSWlibintl8
 
 # Previously the default flex was 2.5.4a and 2.5.35 was in /opt/csw/libexec/flex-2.5.35/bin
@@ -28,9 +34,27 @@
 CATALOGNAME_CSWflex-new += flex_new_stub
 PKGFILES_CSWflex-new += $(bindir)/newflex
 
+PACKAGES += CSWlibfl2
+SPKG_DESC_CSWlibfl2 = Library for Flex, libfl.so.2
+PKGFILES_CSWlibfl2 += $(call pkgfiles_lib,libfl.so.2)
+
+PACKAGES += CSWlibfl-pic2
+SPKG_DESC_CSWlibfl-pic2 = Library for Flex, libfl_pic.so.2
+PKGFILES_CSWlibfl-pic2 += $(call pkgfiles_lib,libfl_pic.so.2)
+
 # Must use GNU diff for option '-q' or two tests fail due to bailing out Sun diff
 TEST_ENV_PATH = $(prefix)/gnu:$(PATH)
 
+# There are two tests failing, this is a known issue:
+#    Executing test test-bison-yylloc
+#   Test test-bison-yylloc FAILED. See test-bison-yylloc/OUTPUT for details.
+#   Executing test test-bison-yylval
+#   Test test-bison-yylval FAILED. See test-bison-yylval/OUTPUT for details.
+# See for details
+#   https://sourceforge.net/p/flex/bugs/144/
+
+SKIPTEST ?= 1
+
 include gar/category.mk
 
 post-install:

Modified: csw/mgar/pkg/flex/trunk/checksums
===================================================================
--- csw/mgar/pkg/flex/trunk/checksums	2014-05-05 13:51:51 UTC (rev 23552)
+++ csw/mgar/pkg/flex/trunk/checksums	2014-05-05 13:56:19 UTC (rev 23553)
@@ -1 +1 @@
-c75940e1fc25108f2a7b3ef42abdae06  flex-2.5.37.tar.bz2
+477679c37ff8b28248a9b05f1da29a82  flex-2.5.39.tar.xz

Added: csw/mgar/pkg/flex/trunk/files/0001-Allow-undefined-symbols-in-shared-libs.patch
===================================================================
--- csw/mgar/pkg/flex/trunk/files/0001-Allow-undefined-symbols-in-shared-libs.patch	                        (rev 0)
+++ csw/mgar/pkg/flex/trunk/files/0001-Allow-undefined-symbols-in-shared-libs.patch	2014-05-05 13:56:19 UTC (rev 23553)
@@ -0,0 +1,31 @@
+From a7dde1d6fa77d36ce1b6f87f48f5d0ed731a12be Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Mon, 5 May 2014 15:36:28 +0200
+Subject: [PATCH] Allow undefined symbols in shared libs
+
+---
+ Makefile.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 86e31c1..ec16e01 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -435,12 +435,12 @@ libfl_la_SOURCES = \
+ 	libmain.c \
+ 	libyywrap.c
+ 
+-libfl_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@
++libfl_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
+ libfl_pic_la_SOURCES = \
+ 	libmain.c \
+ 	libyywrap.c
+ 
+-libfl_pic_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@
++libfl_pic_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
+ noinst_HEADERS = \
+ 	flexdef.h \
+ 	flexint.h \
+-- 
+1.8.4.1
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.