From f1de5cd0088faac5c320a0a1f828583ab7606379 Mon Sep 17 00:00:00 2001
From: Vladimir Glazounov <vg@openoffice.org>
Date: Thu, 1 Oct 2009 09:16:17 +0000
Subject: CWS-TOOLING: integrate CWS cmcfixes62 2009-09-22 21:19:24 +0200 cmc 
 r276365 : #i100000# that's the most plausible explanation, -D$(CVER) is
 needed by scp2 under windows 2009-09-19 16:10:36 +0200 cmc  r276303 :
 #i100000# revert this for no partically good reason 2009-09-18 14:16:47 +0200
 cmc  r276279 : remove extra build depend 2009-09-18 08:56:15 +0200 cmc 
 r276265 : #i100000# rerun autoconf 2009-09-17 14:59:38 +0200 cmc  r276245 :
 CWS-TOOLING: rebase CWS cmcfixes62 to trunk@276192 (milestone: DEV300:m59)
 2009-09-10 16:40:49 +0200 pl  r276041 : fix warning 2009-09-10 11:34:55 +0200
 pl  r276026 : disable warning from system header 2009-09-09 19:30:45 +0200 pl
  r276013 : use osl_getAsciiFunctionSymbol instead of strange cast 2009-09-09
 19:25:32 +0200 pl  r276012 : add some casting hacks to make compile on
 solaris cc 2009-09-09 19:10:48 +0200 pl  r276009 : add missing Configure
 option for solaris sparce 32bit 2009-09-09 18:37:05 +0200 pl  r276008 : merge
 fix for #i104525# into moved code 2009-09-07 13:28:08 +0200 cmc  r275894 :
 CWS-TOOLING: rebase CWS cmcfixes62 to trunk@275801 (milestone: DEV300:m57)
 2009-08-28 12:36:27 +0200 cmc  r275523 : CWS-TOOLING: rebase CWS cmcfixes62
 to trunk@275331 (milestone: DEV300:m56) 2009-08-26 12:56:18 +0200 cmc 
 r275413 : #i104088# use the right headers in the right place 2009-08-25
 17:07:50 +0200 cmc  r275372 : #i104500# make openssl build on linux that
 isn't x86 or x86_64 2009-08-25 13:08:48 +0200 cmc  r275347 : #i89237# pretty
 picswitch up 2009-08-25 10:58:09 +0200 cmc  r275342 : #i104489# remove last
 unused code in starmath 2009-08-25 10:23:33 +0200 cmc  r275338 : #i104088#
 clean up the define post-move 2009-08-24 13:46:57 +0200 cmc  r275310 :
 #i104088# 64bit odbc api changes 2009-08-24 13:42:52 +0200 cmc  r275309 :
 #i89237# unify linux platform mks under a generic parent 2009-08-24 13:19:52
 +0200 cmc  r275307 : #i104455# remove unused code 2009-08-24 13:10:56 +0200
 cmc  r275306 : #i104088# 64bit odbc api changes 2009-08-24 10:07:50 +0200 cmc
  r275293 : #i104306# move recent-used to vcl 2009-08-24 09:32:08 +0200 cmc 
 r275291 : #i104306# move recent-used to vcl 2009-08-23 22:01:07 +0200 cmc 
 r275286 : #i104306# move recently-used to vcl 2009-08-22 15:25:25 +0200 cmc 
 r275285 : #i104088# 64bit odbc api changes 2009-08-21 17:52:40 +0200 cmc 
 r275268 : #i104306# move recently-used to vcl 2009-08-21 14:38:26 +0200 cmc 
 r275257 : #i104408 make these headers ready for c++0x 2009-08-21 14:20:19
 +0200 cmc  r275251 : #i104406# avoid overlapping strcpy to avoid bustage on
 recent toolchains 2009-08-21 14:14:25 +0200 cmc  r275250 : #i104385# silence
 64bit warnings

---
 openssl/makefile.mk | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'openssl')

diff --git a/openssl/makefile.mk b/openssl/makefile.mk
index 10f720662e38..2e154bad0ad6 100644
--- a/openssl/makefile.mk
+++ b/openssl/makefile.mk
@@ -70,10 +70,14 @@ OUT2INC += include/openssl/*
     ADDITIONAL_FILES:= \
         libcrypto_OOo_0_9_8k.map \
         libssl_OOo_0_9_8k.map
-    .IF "$(CPU)" == "X"
+    .IF "$(CPU)" == "I"
+        CONFIGURE_ACTION=Configure linux-elf
+    .ELIF "$(CPU)" == "X"
+        CONFIGURE_ACTION=Configure linux-x86_64
+    .ELIF "$(BUILD64)" == "1"
         CONFIGURE_ACTION=Configure linux-generic64
     .ELSE
-        CONFIGURE_ACTION=Configure linux-elf
+        CONFIGURE_ACTION=Configure linux-generic32
     .ENDIF
     # if you build openssl as shared library you have to patch the Makefile.Shared "LD_LIBRARY_PATH=$$LD_LIBRARY_PATH \"
     #BUILD_ACTION=make 'SHARED_LDFLAGS=-Wl,--version-script=./lib$$(SHLIBDIRS)_OOo_0_9_8e.map'
@@ -86,23 +90,19 @@ OUT2INC += include/openssl/*
         libssl_OOo_0_9_8k.map
     #BUILD_ACTION=make 'SHARED_LDFLAGS=-G -dy -z text -M./lib$$$$$$$$(SHLIBDIRS)_OOo_0_9_8e.map'
 
-    # We need a 64 BIT switch (currently I disable 64 Bit by default). 
-    # Please replace this with a global switch if available
-    #USE_64 = 1
+    # Use BUILD64 when 1 to select new specific 64bit Configurations if necessary
 
-    # Solaris INTEL
-    .IF "$(CPUNAME)" == "INTEL" 
+    .IF "$(CPUNAME)" == "INTEL" # Solaris INTEL
         .IF "$(CPU)" == "X"
            CONFIGURE_ACTION=Configure solaris64-x86_64-cc
         .ELSE
            CONFIGURE_ACTION=Configure solaris-x86-cc
         .ENDIF
+    .ELIF "$(CPU)" == "U" # Solaris SPARC
+       CONFIGURE_ACTION=Configure solaris64-sparcv9-cc
     .ELSE
-    # Solaris SPARC
-        .IF "$(CPU)" == "U"
-           CONFIGURE_ACTION=Configure solaris64-sparcv9-cc
-        .ENDIF
-.ENDIF
+       CONFIGURE_ACTION=Configure solaris-sparcv9-cc
+    .ENDIF
 .ENDIF
 
 .IF "$(OS)" == "WNT"
-- 
cgit