diff options
| author | Kurt Zenker <kz@openoffice.org> | 2009-06-03 16:42:24 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2009-06-03 16:42:24 +0000 |
| commit | dfe1f92e6904847162f6a7a2d9fb5fccd2f05f3f (patch) | |
| tree | 502c87444b8dd8a32d208777dd3d47ba35239d0a /openssl | |
| parent | 4c6037466b5a380b28f95b9739fb8e0ac8b5ca9f (diff) | |
CWS-TOOLING: integrate CWS tkr20
2009-05-08 08:31:10 +0200 tkr r271700 : ##i97329# fixed merge conflict during rebase
2009-05-07 08:30:15 +0200 tkr r271622 : CWS-TOOLING: rebase CWS tkr20 to trunk@271427 (milestone: DEV300:m47)
2009-04-17 14:36:42 +0200 tkr r270947 : #i73893# implemented the XCommandProcessor:Abort method
2009-03-20 14:08:15 +0100 tkr r269806 : #i96392# use $(CPU) variable to determine if openssl should build with 64 bit
2009-03-19 16:15:26 +0100 tkr r269754 : #i96392# use $(CPU) variable to determine if openssl should build with 64 bit
2009-03-19 16:09:04 +0100 tkr r269753 : #i96392# use $(CPU) variable to determine if openssl should build with 64 bit
2009-03-19 15:57:05 +0100 tkr r269752 : #i97003# Ask password container if persistent storage should be used
2009-03-19 15:53:18 +0100 tkr r269751 : #i97003# ask if password container should use the persistent storage
2009-03-19 09:08:18 +0100 tkr r269726 : #i99774# ucb: patch to silence warnings in gcc 4.4
2009-03-19 09:05:38 +0100 tkr r269725 : #i99046# remove mime-type
2009-03-19 09:04:56 +0100 tkr r269724 : #i97329# fixed truncated text on buttons
2009-03-19 09:03:50 +0100 tkr r269723 : #i97542# Warning errors in uui / empty bodys in for loops
Diffstat (limited to 'openssl')
| -rw-r--r-- | openssl/makefile.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/openssl/makefile.mk b/openssl/makefile.mk index 2f4eff086944..22920c296b98 100644 --- a/openssl/makefile.mk +++ b/openssl/makefile.mk @@ -70,6 +70,11 @@ OUT2INC += include/openssl/* ADDITIONAL_FILES:= \ libcrypto_OOo_0_9_8k.map \ libssl_OOo_0_9_8k.map + .IF "$(CPU)" == "X" + CONFIGURE_ACTION=Configure linux-generic64 + .ELSE + CONFIGURE_ACTION=Configure linux-elf + .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' .ENDIF @@ -87,7 +92,7 @@ OUT2INC += include/openssl/* # Solaris INTEL .IF "$(CPUNAME)" == "INTEL" - .IF "$(USE_64)" == "1" + .IF "$(CPU)" == "X" CONFIGURE_ACTION=Configure solaris64-x86_64-cc .ELSE CONFIGURE_ACTION=Configure solaris-x86-cc |