OpenSSL: 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:40:17
  Branch: HEAD                             Handle:
2007051920401500

  Modified files:
    openssl                 Makefile.shared

  Log:
    --enable-auto-image-base in cygwin build.
    PR: 1517
    Submitted by: vinschenredhat.com

  Summary:
    Revision    Changes     Path
    1.64        +7  -3      openssl/Makefile.shared
 
____________________________________________________________
________________

  patch -p0 <<' .'
  Index: openssl/Makefile.shared
 
============================================================
================
  $ cvs diff -u -r1.63 -r1.64 Makefile.shared
  --- openssl/Makefile.shared	25 Mar 2007 15:20:35
-0000	1.63
  +++ openssl/Makefile.shared	19 May 2007 19:40:15
-0000	1.64
   -249,23 +249,28 
   	
$(CALC_VERSIONS); 
   	INHIBIT_SYMLINKS=yes; 
   	SHLIB=cyg$(LIBNAME); 
  -	expr $(PLATFORM) : 'mingw' > /dev/null &&
SHLIB=$(LIBNAME); 
  +	base=-Wl,--enable-auto-image-base; 
  +	if expr $(PLATFORM) : 'mingw' > /dev/null; then 
  +		 SHLIB=$(LIBNAME); 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,-s,-Bsymbolic"; 
  +	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared
$$base -Wl,-s,-Bsymbolic"; 
   	$(LINK_SO_O)
   link_a.cygwin:
   	
$(CALC_VERSIONS); 
   	INHIBIT_SYMLINKS=yes; 
   	SHLIB=cyg$(LIBNAME); SHLIB_SOVER=-$(LIBVERSION);
SHLIB_SUFFIX=.dll; 
   	dll_name=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; extras=; 
  +	base=-Wl,--enable-auto-image-base; 
   	if expr $(PLATFORM) : 'mingw' > /dev/null; then 
   		SHLIB=$(LIBNAME); SHLIB_SOVER=32; 
   		extras="$(LIBNAME).def"; 
   		$(PERL) util/mkdef.pl 32 $(LIBNAME) > $$extras; 
  +		base=; [ $(LIBNAME) = "crypto" ] &&
base=-Wl,--image-base,0x63000000; 
   	fi; 
   	dll_name=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; 
   	$(PERL) util/mkrc.pl $$dll_name | 
   -273,7 +278,6 
   	extras="$$extras rc.o"; 
   	ALLSYMSFLAGS='-Wl,--whole-archive'; 
   	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; 
  -	base=;  [ $(LIBNAME) = "crypto" ] &&
base=-Wl,--image-base,0x63000000; 
   	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared
$$base -Wl,-s,-Bsymbolic
-Wl,--out-implib,lib$(LIBNAME).dll.a $$extras"; 
   	[ -f apps/$$dll_name ] && rm apps/$$dll_name; 
   	[ -f test/$$dll_name ] && rm test/$$dll_name; 
   .
____________________________________________________________
__________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                    
openssl-cvsopenssl.org
Automated List Manager                          
majordomoopenssl.org