[csw-devel] SF.net SVN: gar:[19763] csw/mgar/pkg/erlang/trunk

[dmichelsen at users.sourceforge.net]

Revision: 19763
          http://gar.svn.sourceforge.net/gar/?rev=19763&view=rev
Author:   dmichelsen
Date:     2012-11-29 08:11:51 +0000 (Thu, 29 Nov 2012)
Log Message:
-----------
erlang/trunk: Update to R15B02, successfull build 32 and 64

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

Modified: csw/mgar/pkg/erlang/trunk/Makefile
===================================================================
--- csw/mgar/pkg/erlang/trunk/Makefile	2012-11-28 22:26:11 UTC (rev 19762)
+++ csw/mgar/pkg/erlang/trunk/Makefile	2012-11-29 08:11:51 UTC (rev 19763)
@@ -1,6 +1,6 @@
 # $Id$
 NAME = erlang
-VERSION = R15B01
+VERSION = R15B02
 GARTYPE = v2
 
 DESCRIPTION = A functional programming language from Ericsson
@@ -15,6 +15,10 @@
 DISTNAME = otp_src_$(VERSION)
 DISTFILES  = $(DISTNAME).tar.gz
 
+# TBD:
+# - Solaris 10 x86 needs a libdlpi.so symlink:
+#     ln -s /lib/libdlpi.so.1 /lib/libdlpi.so
+
 # We want DTrace
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
 
@@ -39,16 +43,36 @@
 CATALOGNAME_CSWerlangdoc = erlang_doc_stub
 
 GARCOMPILER = GCC4
+# $(ARCHFLAGS_$(GARCOMPILER)_$(ISA))
 
+BUILD64 = 1
+
+# [8:23pm] aurora: LDFLAGS="-L/opt/csw/lib/64" CFLAGS="-I/opt/csw/include" CXXFLAGS="-I/opt/csw/include" AR=gar ./configure --with-ssl=/opt/csw --disable-dynamic-ssl-lib --enable-m64-build --with-odbc=/opt/csw --without-wx
+
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-ssl=$(prefix)
-CONFIGURE_ARGS += --enable-threads
-CONFIGURE_ARGS += --enable-smp-support
-CONFIGURE_ARGS += --enable-kernel-poll
-CONFIGURE_ARGS += --enable-hipe
-CONFIGURE_ARGS += --with-dynamic-trace=dtrace
-#  CONFIGURE_ARGS += --without-odbc
+  CONFIGURE_ARGS += --disable-dynamic-ssl-lib
+  CONFIGURE_ARGS += --without-wx
+#CONFIGURE_ARGS += --enable-threads
+#CONFIGURE_ARGS += --enable-smp-support
+#CONFIGURE_ARGS += --enable-kernel-poll
+##CONFIGURE_ARGS += --enable-hipe
+#CONFIGURE_ARGS += --disable-hipe
+#CONFIGURE_ARGS += --with-dynamic-trace=dtrace
+##  CONFIGURE_ARGS += --without-odbc
 
+CONFIGURE_ARGS-32 += --enable-m32-build
+CONFIGURE_ARGS-64 += --enable-m64-build
+CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL))
+
+EXTRA_CONFIGURE_ENV += AR=$(bindir)/gar
+
+# On Solaris 10 i386 enabling hipe leads to 
+#   Undefined                       first referenced
+#    symbol                             in file
+#   hipe_emulate_fpe                    obj/i386-pc-solaris2.10/opt/smp/hipe_x86_bifs.o
+CONFIGURE_ARGS += --disable-hipe
+
 # There doesn't seem to be a testsuite
 TEST_SCRIPTS =
 
@@ -58,3 +82,7 @@
 #	@$(MAKECOOKIE)
 
 include gar/category.mk
+
+# The -m32 -march=pentium_pro disturbs ld which just takes -32
+ARCHFLAGS_GCC4_pentium_pro :=
+

Modified: csw/mgar/pkg/erlang/trunk/checksums
===================================================================
--- csw/mgar/pkg/erlang/trunk/checksums	2012-11-28 22:26:11 UTC (rev 19762)
+++ csw/mgar/pkg/erlang/trunk/checksums	2012-11-29 08:11:51 UTC (rev 19763)
@@ -1 +1 @@
-f12d00f6e62b36ad027d6c0c08905fad  otp_src_R15B01.tar.gz
+ccbe5e032a2afe2390de8913bfe737a1  otp_src_R15B02.tar.gz

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