[csw-devel] SF.net SVN: gar:[20520] csw/mgar/pkg/openssl1/trunk

[chninkel at users.sourceforge.net]

Revision: 20520
          http://gar.svn.sourceforge.net/gar/?rev=20520&view=rev
Author:   chninkel
Date:     2013-03-25 20:21:03 +0000 (Mon, 25 Mar 2013)
Log Message:
-----------
openssl1/trunk: added 64 bits binaries

Modified Paths:
--------------
    csw/mgar/pkg/openssl1/trunk/Makefile
    csw/mgar/pkg/openssl1/trunk/files/changelog.CSW

Modified: csw/mgar/pkg/openssl1/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssl1/trunk/Makefile	2013-03-25 07:40:00 UTC (rev 20519)
+++ csw/mgar/pkg/openssl1/trunk/Makefile	2013-03-25 20:21:03 UTC (rev 20520)
@@ -41,7 +41,8 @@
 
 RUNTIME_DEP_PKGS_CSWopenssl-utils = CSWlibssl1-0-0
 SPKG_DESC_CSWopenssl-utils = Openssl 1.0 binaries and related tools
-PKGFILES_CSWopenssl-utils = $(bindir)/[^/]* $(mandir)/man1/.* $(mandir)/man5/.* $(mandir)/man7/.* 
+PKGFILES_CSWopenssl-utils = $(bindir)/[^/]* $(bindir)/.*/openssl 
+PKGFILES_CSWopenssl-utils += $(mandir)/man1/.* $(mandir)/man5/.* $(mandir)/man7/.* 
 PKGFILES_CSWopenssl-utils += $(prefix)/ssl/misc/.* 
 PKGFILES_CSWopenssl-utils += $(prefix)/ssl/openssl\.cnf.*
 PKGFILES_CSWopenssl-utils += $(sysconfdir)/ssl/openssl\.cnf.*
@@ -152,11 +153,13 @@
 EXTRA_BUILD_ISAS_i386 = pentium_pro amd64
 EXTRA_BUILD_ISAS_sparc = sparcv8plus+vis sparcv9
 
-# we include *.a files in the devel package so we don't want them excluded
-#MERGE_EXCLUDE_STATICLIBS = 
+# the openssl build system doesn't honor bindir
+# aso it doesn't install 64 bits binaries in bin/amd64
+# we fix at the merge step 
+EXTRA_MERGE_DIRS_isa-extra = $(bindir_install)
 
-# No .so files in libraries
-#EXTRA_MERGE_EXCLUDE_FILES = .*/libcrypto.so .*/libssl.so
+# c_rehash is shell script: no isaexec please
+EXTRA_ISAEXEC_EXCLUDE_FILES = /opt/csw/bin/c_rehash
 
 # We use Studio 12.3 to have the "-Qoption cg" option
 # but this version is not available under Solaris 9

Modified: csw/mgar/pkg/openssl1/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/changelog.CSW	2013-03-25 07:40:00 UTC (rev 20519)
+++ csw/mgar/pkg/openssl1/trunk/files/changelog.CSW	2013-03-25 20:21:03 UTC (rev 20520)
@@ -1,6 +1,7 @@
 openssl (1.0.1e,rev=2013.03.22) unstable
 
   * Fixed missing 64 bits libraries bug
+  * Added 64 bits binaries (Closes: #5028)
 
    -- Yann Rouillard <yann at opencsw.org>  Fri, 22 Mar 2013 23:07:58 +0100
 

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