[csw-devel] SF.net SVN: gar:[8054] csw/mgar/pkg/freehdl/trunk

[trygvis at users.sourceforge.net]

Revision: 8054
          http://gar.svn.sourceforge.net/gar/?rev=8054&view=rev
Author:   trygvis
Date:     2010-01-17 21:24:00 +0000 (Sun, 17 Jan 2010)

Log Message:
-----------
freehdl: wip.

Modified Paths:
--------------
    csw/mgar/pkg/freehdl/trunk/Makefile
    csw/mgar/pkg/freehdl/trunk/checksums
    csw/mgar/pkg/freehdl/trunk/files/0001-Use-OpenCSW-pkg-config.patch

Added Paths:
-----------
    csw/mgar/pkg/freehdl/trunk/files/fix_seg_fault_2-1.patch

Modified: csw/mgar/pkg/freehdl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/freehdl/trunk/Makefile	2010-01-17 21:21:48 UTC (rev 8053)
+++ csw/mgar/pkg/freehdl/trunk/Makefile	2010-01-17 21:24:00 UTC (rev 8054)
@@ -1,3 +1,6 @@
+#
+# TODO: Consider adding this patch: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=549484
+
 GARNAME = freehdl
 GARVERSION = 0.0.7
 CATEGORIES = devel
@@ -2,3 +5,3 @@
 
-DESCRIPTION = A project to develop a free, open source, GPL'ed VHDL simulator for Linux!
+DESCRIPTION = A free, open source, GPL'ed VHDL simulator
 define BLURB
@@ -16,6 +19,7 @@
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
 PATCHFILES  = 0000-Mirring-strings.h-include.patch
 PATCHFILES += 0001-Use-OpenCSW-pkg-config.patch
+PATCHFILES += fix_seg_fault_2-1.patch
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
@@ -26,11 +30,17 @@
 
 GARCOMPILER = GNU
 
-CONFIGURE_ARGS = $(DIRPATHS)
+#GARFLAVOR           = DBG
+CONFIGURE_ARGS      = $(DIRPATHS)
+CONFIGURE_ARGS     += $(CONFIGURE_ARGS_$(GARFLAVOR))
+CONFIGURE_ARGS_DBG  = --enable-trace --enable-warnings
 
 TEST_SCRIPTS =
 
-REQUIRED_PKGS = CSWgcc4corert CSWgcc4g++ CSWgcc4g++rt CSWpkgconfig
+REQUIRED_PKGS = CSWlibtool CSWgcc4corert CSWgcc4g++ CSWgcc4g++rt CSWpkgconfig
 #CSWgcc3core CSWgcc3corert CSWgcc3g++ CSWgcc3g++rt
 
 include gar/category.mk
+
+# We want the .la files, freehdl is based around those
+MERGE_EXCLUDE_LIBTOOL =

Modified: csw/mgar/pkg/freehdl/trunk/checksums
===================================================================
--- csw/mgar/pkg/freehdl/trunk/checksums	2010-01-17 21:21:48 UTC (rev 8053)
+++ csw/mgar/pkg/freehdl/trunk/checksums	2010-01-17 21:24:00 UTC (rev 8054)
@@ -1,3 +1,4 @@
 75dd38573b84d23a93a10c028051305d  0000-Mirring-strings.h-include.patch
-2950515cac5a87c43c97b264195ff5f7  0001-Use-OpenCSW-pkg-config.patch
+6a6e16025feda49ecfc4b5b22e0ad70d  0001-Use-OpenCSW-pkg-config.patch
+4193d606cf4445811e78a79865d9485e  fix_seg_fault_2-1.patch
 6d702aa188fb2c62f8cfca5a2f66d956  freehdl-0.0.7.tar.gz

Modified: csw/mgar/pkg/freehdl/trunk/files/0001-Use-OpenCSW-pkg-config.patch
===================================================================
--- csw/mgar/pkg/freehdl/trunk/files/0001-Use-OpenCSW-pkg-config.patch	2010-01-17 21:21:48 UTC (rev 8053)
+++ csw/mgar/pkg/freehdl/trunk/files/0001-Use-OpenCSW-pkg-config.patch	2010-01-17 21:24:00 UTC (rev 8054)
@@ -19,7 +19,7 @@
 +version=`/opt/csw/bin/pkg-config --modversion freehdl`
 +cxxflags=`/opt/csw/bin/pkg-config --variable cxxflags freehdl`
 +cxx=`/opt/csw/bin/pkg-config --variable cxx freehdl`
-+linker=`/opt/csw/bin/pkg-config --variable libtool freehdl`
++linker=/opt/csw/bin/libtool
  
  case "$option" in
  

Added: csw/mgar/pkg/freehdl/trunk/files/fix_seg_fault_2-1.patch
===================================================================
--- csw/mgar/pkg/freehdl/trunk/files/fix_seg_fault_2-1.patch	                        (rev 0)
+++ csw/mgar/pkg/freehdl/trunk/files/fix_seg_fault_2-1.patch	2010-01-17 21:24:00 UTC (rev 8054)
@@ -0,0 +1,39 @@
+diff -rupN freehdl-0.0.6.old/v2cc/v2cc-decl.cc freehdl-0.0.6/v2cc/v2cc-decl.cc
+--- freehdl-0.0.6.old/v2cc/v2cc-decl.cc	2007-10-23 22:14:26.000000000 +0200
++++ freehdl-0.0.6/v2cc/v2cc-decl.cc	2009-10-04 12:41:50.000000000 +0200
+@@ -865,7 +865,8 @@ m_emit_hdr (pIIR_ArchitectureDeclaration
+   emit_decls (extended_declarations(a), str, rstack, 2);				// emit signal decls
+   str += "};\n";										
+   
+-  emit_hdr(a->architecture_statement_part, str, rstack, 2);		// emit process hdrs
++  if (a->architecture_statement_part != NULL)
++    emit_hdr(a->architecture_statement_part, str, rstack, 2);		// emit process hdrs
+ }
+ 
+ void							// ConcStat headers
+diff -rupN freehdl-0.0.6.old/v2cc/v2cc-explore.cc freehdl-0.0.6/v2cc/v2cc-explore.cc
+--- freehdl-0.0.6.old/v2cc/v2cc-explore.cc	2008-02-15 19:12:30.000000000 +0100
++++ freehdl-0.0.6/v2cc/v2cc-explore.cc	2009-10-04 12:28:28.000000000 +0200
+@@ -1108,7 +1108,8 @@ m_explore_and_check (pIIR_ArchitectureDe
+   }
+ 
+   // Explore concurrent statements of entity
+-  error_count += explore_and_check(a->architecture_statement_part, rstack, collect_access_info);
++  if(a->architecture_statement_part != NULL)
++    error_count += explore_and_check(a->architecture_statement_part, rstack, collect_access_info);
+ 
+   // Collect all external declarations into 
+   merge (external_decls_list, a->external_decls, rstack);
+diff -rupN freehdl-0.0.6.old/v2cc/v2cc-impl.cc freehdl-0.0.6/v2cc/v2cc-impl.cc
+--- freehdl-0.0.6.old/v2cc/v2cc-impl.cc	2007-10-23 22:23:22.000000000 +0200
++++ freehdl-0.0.6/v2cc/v2cc-impl.cc	2009-10-04 12:39:48.000000000 +0200
+@@ -1134,7 +1134,8 @@ emit_handle (pIIR_ArchitectureDeclaratio
+ void
+ m_emit_impl (pIIR_ArchitectureDeclaration a, string &str, RegionStack &rstack, int l)
+ {
+-  emit_impl (a->architecture_statement_part, str, rstack, 2);		// process impls
++  if (a->architecture_statement_part != NULL)
++    emit_impl (a->architecture_statement_part, str, rstack, 2);		// process impls
+   emit_handle (a, str, rstack);					// handle for sim
+   emit_constructor(a, str, rstack);					// arch constructor
+ }


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