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

[dmichelsen at users.sourceforge.net]

Revision: 21189
          http://gar.svn.sourceforge.net/gar/?rev=21189&view=rev
Author:   dmichelsen
Date:     2013-05-24 14:22:36 +0000 (Fri, 24 May 2013)
Log Message:
-----------
erlang/trunk: More fixes

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

Added Paths:
-----------
    csw/mgar/pkg/erlang/trunk/files/0001-Do-not-use-ssl-standard-locations.patch

Modified: csw/mgar/pkg/erlang/trunk/Makefile
===================================================================
--- csw/mgar/pkg/erlang/trunk/Makefile	2013-05-24 14:19:42 UTC (rev 21188)
+++ csw/mgar/pkg/erlang/trunk/Makefile	2013-05-24 14:22:36 UTC (rev 21189)
@@ -17,6 +17,8 @@
 
 PATCHFILES += 0001-Fix-main-signature.patch
 
+PATCHFILES += 0001-Do-not-use-ssl-standard-locations.patch
+
 # TBD:
 # - Solaris 10 x86 needs a libdlpi.so symlink:
 #     ln -s /lib/libdlpi.so.1 /lib/libdlpi.so
@@ -32,16 +34,28 @@
 RUNTIME_DEP_PKGS_CSWerlang += CSWlibncurses5
 RUNTIME_DEP_PKGS_CSWerlang += CSWlibssl1-0-0
 
+# These are just examples
+CHECKPKG_OVERRIDES_CSWerlang += file-with-bad-content
+
+# This is just for the emacs style
+CHECKPKG_OVERRIDES_CSWerlang += missing-dependency|CSWemacs-common
+
+
 PACKAGES += CSWerlang-dev
 SPKG_DESC_CSWerlang-dev = Ericson Erlang OTP library sources and headers
-PKGFILES_CSWerlang-dev += $(PKGFILES_DEVEL)
+PKGFILES_CSWerlang-dev += .*/src/.*
+PKGFILES_CSWerlang-dev += .*/include/.*
+PKGFILES_CSWerlang-dev += $(mandir)/man3erl/.*
 OBSOLETED_BY_CSWerlang-dev = CSWerlangdevel
 CATALOGNAME_CSWerlangdevel = erlang_devel_stub
 
+CHECKPKG_OVERRIDES_CSWerlang-dev += file-with-bad-content
+
 PACKAGES += CSWerlang-doc
 SPKG_DESC_CSWerlang-doc = Erlang manual and documentation
 # This is empty right now, make sure docs are build later...
-PKGFILES_CSWerlang-doc += $(docdir)/.*
+PKGFILES_CSWerlang-doc += .*/doc/.*
+PKGFILES_CSWerlang-doc += .*/info
 OBSOLETED_BY_CSWerlang-doc = CSWerlangdoc
 CATALOGNAME_CSWerlangdoc = erlang_doc_stub
 
@@ -49,13 +63,16 @@
 # $(ARCHFLAGS_$(GARCOMPILER)_$(ISA))
 
 BUILD64 = 1
+ISAEXEC = 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 += --disable-dynamic-ssl-lib
-  CONFIGURE_ARGS += --without-wx
+#CONFIGURE_ARGS += --disable-dynamic-ssl-lib
+
+CONFIGURE_ARGS += --without-wx
 #CONFIGURE_ARGS += --enable-threads
 #CONFIGURE_ARGS += --enable-smp-support
 #CONFIGURE_ARGS += --enable-kernel-poll
@@ -68,6 +85,9 @@
 CONFIGURE_ARGS-64 += --enable-m64-build
 CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL))
 
+# We need to override this or we pollute RUNPATH with lots of invalid dirs like /usr/local etc.
+CONFIGURE_ARGS += std_ssl_locations=
+
 EXTRA_CONFIGURE_ENV += AR=$(bindir)/gar
 
 # On Solaris 10 i386 enabling hipe leads to 

Added: csw/mgar/pkg/erlang/trunk/files/0001-Do-not-use-ssl-standard-locations.patch
===================================================================
--- csw/mgar/pkg/erlang/trunk/files/0001-Do-not-use-ssl-standard-locations.patch	                        (rev 0)
+++ csw/mgar/pkg/erlang/trunk/files/0001-Do-not-use-ssl-standard-locations.patch	2013-05-24 14:22:36 UTC (rev 21189)
@@ -0,0 +1,25 @@
+From 91bfc9c834ca9222ddde8f4c48dca6d8384cbf4c Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 24 May 2013 11:49:59 +0200
+Subject: [PATCH] Do not use ssl standard locations
+
+---
+ erts/configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/erts/configure b/erts/configure
+index b6ec8ae..29223a4 100755
+--- a/erts/configure
++++ b/erts/configure
+@@ -36959,7 +36959,7 @@ fi
+ 
+ 
+ 
+-std_ssl_locations="/usr/local /usr/sfw /usr /opt/local /usr/pkg /usr/local/openssl /usr/lib/openssl /usr/openssl /usr/local/ssl /usr/lib/ssl /usr/ssl"
++#std_ssl_locations="/usr/local /usr/sfw /usr /opt/local /usr/pkg /usr/local/openssl /usr/lib/openssl /usr/openssl /usr/local/ssl /usr/lib/ssl /usr/ssl"
+ 
+ 
+ # Check whether --with-ssl-zlib or --without-ssl-zlib was given.
+-- 
+1.8.1.4
+

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