From 2e1f095c12d3da6b738c6355daa57ca3b303909d Mon Sep 17 00:00:00 2001
From: Oliver Bolte <obo@openoffice.org>
Date: Thu, 19 Feb 2009 11:42:47 +0000
Subject: CWS-TOOLING: integrate CWS sb104 2009-01-27 13:09:06 +0100 sb 
 r266986 : #i97992# cws rebase: merged cws/sb104/config_office/set_soenv.in
 with moved tags/DEV300_m40/set_soenv.in 2009-01-27 10:56:40 +0100 sb  r266966
 : CWS-TOOLING: rebase CWS sb104 to trunk@266944 (milestone: DEV300:m40)
 2009-01-20 14:37:00 +0100 sb  r266581 : #i97992# missing treatment of
 Solaris-only adjustvisibility as build-internal tool 2009-01-20 09:32:38
 +0100 sb  r266554 : CWS-TOOLING: rebase CWS sb104 to trunk@266428 (milestone:
 DEV300:m39) 2009-01-14 13:40:45 +0100 sb  r266296 : #i97992# do not pass
 comment lines to shell 2009-01-14 12:50:34 +0100 sb  r266290 : #i97992# avoid
 problems with checkdll not finding AWTLIB and its dependents 2009-01-14
 12:49:20 +0100 sb  r266289 : #i97992# on Linux and Solaris, regxpcom
 apparently needs to be called with the libxpcom.so directory on the
 LD_LIBRARY_PATH 2009-01-13 09:41:37 +0100 sb  r266196 : #i97992# fixed
 AUGMENT_LIBRARY_PATH definitions 2009-01-12 18:02:03 +0100 sb  r266177 :
 #i97992# get rid of LD_LIBRARY_PATH in build environment

---
 openssl/opensslsol.patch | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'openssl')

diff --git a/openssl/opensslsol.patch b/openssl/opensslsol.patch
index 2e456230e842..a6578a8e65ea 100644
--- a/openssl/opensslsol.patch
+++ b/openssl/opensslsol.patch
@@ -13,21 +13,19 @@
  "solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 --- misc/openssl-0.9.8g/Makefile.shared	Sun Sep 16 16:11:51 2007
 +++ misc/build/openssl-0.9.8g/Makefile.shared	Tue Jan 27 19:51:03 2009
-@@ -93,7 +93,7 @@
+@@ -93,7 +93,6 @@
      LDCMD="$${LDCMD:-$(CC)}"; LDFLAGS="$${LDFLAGS:-$(CFLAGS)}"; \
      LIBPATH=`for x in $$LIBDEPS; do if echo $$x | grep '^ *-L' > /dev/null 2>&1; then echo $$x | sed -e 's/^ *-L//'; fi; done | uniq`; \
      LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
 -    LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
-+    LD_LIBRARY_PATH=$$LD_LIBRARY_PATH \
      $${LDCMD} $${LDFLAGS} -o $${APPNAME:=$(APPNAME)} $(OBJECTS) $${LIBDEPS} )
  
  LINK_SO=	\
-@@ -104,7 +104,7 @@
+@@ -104,7 +104,6 @@
      nm -Pg $$SHOBJECTS | grep ' [BDT] ' | cut -f1 -d' ' > lib$(LIBNAME).exp; \
      LIBPATH=`for x in $$LIBDEPS; do if echo $$x | grep '^ *-L' > /dev/null 2>&1; then echo $$x | sed -e 's/^ *-L//'; fi; done | uniq`; \
      LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
 -    LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
-+    LD_LIBRARY_PATH=$$LD_LIBRARY_PATH \
      $${SHAREDCMD} $${SHAREDFLAGS} \
  	-o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
  	$$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS \
-- 
cgit