OpenSSL: OpenSSL_0_9_8-stable: openssl/ Makefile.shared

  OpenSSL CVS Repository
  http://cvs.openssl.org/
 
____________________________________________________________
________________

  Server: cvs.openssl.org                  Name:   Andy
Polyakov
  Root:   /v/openssl/cvs                   Email:  approopenssl.org
  Module: openssl                          Date:  
19-May-2007 21:41:05
  Branch: OpenSSL_0_9_8-stable             Handle:
2007051920410500

  Modified files:           (Branch: OpenSSL_0_9_8-stable)
    openssl                 Makefile.shared

  Log:
    cygwin shared rules update [from HEAD].
    PR: 1517

  Summary:
    Revision    Changes     Path
    1.47.2.13   +10 -4      openssl/Makefile.shared
 
____________________________________________________________
________________

  patch -p0 <<' .'
  Index: openssl/Makefile.shared
 
============================================================
================
  $ cvs diff -u -r1.47.2.12 -r1.47.2.13 Makefile.shared
  --- openssl/Makefile.shared	25 Mar 2007 15:34:42
-0000	1.47.2.12
  +++ openssl/Makefile.shared	19 May 2007 19:41:05
-0000	1.47.2.13
   -236,24 +236,30 
   	
$(CALC_VERSIONS); 
   	INHIBIT_SYMLINKS=yes; 
   	SHLIB=cyg$(LIBNAME); 
  -	expr $(PLATFORM) : 'mingw' > /dev/null &&
SHLIB=$(LIBNAME)eay32; 
  +	base=-Wl,--enable-auto-image-base; 
  +	if expr $(PLATFORM) : 'mingw' > /dev/null; then 
  +		SHLIB=$(LIBNAME)eay32; base=; 
  +	fi; 
   	SHLIB_SUFFIX=.dll; 
   	LIBVERSION="$(LIBVERSION)"; 
   	SHLIB_SOVER=${LIBVERSION:+"-$(LIBVERSION)"};

   	ALLSYMSFLAGS='-Wl,--whole-archive'; 
   	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; 
  -	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared
-Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a";

  +	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared
$$base -Wl,-Bsymbolic
-Wl,--out-implib,lib$(LIBNAME).dll.a"; 
   	$(LINK_SO_O)
   link_a.cygwin:
   	
$(CALC_VERSIONS); 
   	INHIBIT_SYMLINKS=yes; 
   	SHLIB=cyg$(LIBNAME); 
  -	expr $(PLATFORM) : 'mingw' > /dev/null &&
SHLIB=$(LIBNAME)eay32; 
  +	base=-Wl,--enable-auto-image-base; 
  +	if expr $(PLATFORM) : 'mingw' > /dev/null; then 
  +		SHLIB=$(LIBNAME)eay32; 
  +		base=;  [ $(LIBNAME) = "crypto" ] &&
base=-Wl,--image-base,0x63000000; 
  +	fi; 
   	SHLIB_SUFFIX=.dll; 
   	SHLIB_SOVER=-$(LIBVERSION); 
   	ALLSYMSFLAGS='-Wl,--whole-archive'; 
   	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; 
  -	base=;  [ $(LIBNAME) = "crypto" ] &&
base=-Wl,--image-base,0x63000000; 
   	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared
$$base -Wl,-Bsymbolic
-Wl,--out-implib,lib$(LIBNAME).dll.a"; 
   	[ -f apps/$$SHLIB$$SHLIB_SUFFIX ] && rm
apps/$$SHLIB$$SHLIB_SUFFIX; 
   	[ -f test/$$SHLIB$$SHLIB_SUFFIX ] && rm
test/$$SHLIB$$SHLIB_SUFFIX; 
   .
____________________________________________________________
__________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                    
openssl-cvsopenssl.org
Automated List Manager                          
majordomoopenssl.org