[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openssl-cvs
Subject:    [CVS] OpenSSL: openssl/ Makefile.org Makefile.shared
From:       "Andy Polyakov" <appro () openssl ! org>
Date:       2005-04-30 23:45:54
Message-ID: 20050430234554.218DC20364C () master ! openssl ! org
[Download RAW message or body]

  OpenSSL CVS Repository
  http://cvs.openssl.org/
  ____________________________________________________________________________

  Server: cvs.openssl.org                  Name:   Andy Polyakov
  Root:   /e/openssl/cvs                   Email:  appro@openssl.org
  Module: openssl                          Date:   01-May-2005 01:45:54
  Branch: HEAD                             Handle: 2005050100455300

  Modified files:
    openssl                 Makefile.org Makefile.shared

  Log:
    Cygwin/mingw sync with stable.

  Summary:
    Revision    Changes     Path
    1.252       +1  -1      openssl/Makefile.org
    1.44        +7  -2      openssl/Makefile.shared
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openssl/Makefile.org
  ============================================================================
  $ cvs diff -u -r1.251 -r1.252 Makefile.org
  --- openssl/Makefile.org	30 Apr 2005 21:39:38 -0000	1.251
  +++ openssl/Makefile.org	30 Apr 2005 23:45:53 -0000	1.252
  @@ -501,7 +501,7 @@
   	@pod2man="`cd util; ./pod2mantest $(PERL)`"; \
   	here="`pwd`"; \
   	filecase=; \
  -	if [ "$(PLATFORM)" = "DJGPP" -o "$(PLATFORM)" = "Cygwin" ]; then \
  +	if [ "$(PLATFORM)" = "DJGPP" -o "$(PLATFORM)" = "Cygwin" -o "$(PLATFORM)" = "mingw" ]; then \
   		filecase=-i; \
   	fi; \
   	set -e; for i in doc/apps/*.pod; do \
  @@ .
  patch -p0 <<'@@ .'
  Index: openssl/Makefile.shared
  ============================================================================
  $ cvs diff -u -r1.43 -r1.44 Makefile.shared
  --- openssl/Makefile.shared	13 Apr 2005 07:22:41 -0000	1.43
  +++ openssl/Makefile.shared	30 Apr 2005 23:45:53 -0000	1.44
  @@ -260,9 +260,14 @@
   	SHLIB_SOVER=; \
   	ALLSYMSFLAGS='-Wl,--whole-archive'; \
   	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
  -	SHAREDFLAGS="$(CFLAGS) -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \
  +	base=;  [ $(LIBNAME) = "crypto" ] && base=-Wl,--image-base,0x61200000; \
  +	SHAREDFLAGS="$(CFLAGS) $$base -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \
   	SHAREDCMD='${CC}'; \
  -	$(LINK_SO_A)
  +	[ -f apps/$$SHLIB$$SHLIB_SUFFIX ] && rm apps/$$SHLIB$$SHLIB_SUFFIX; \
  +	[ -f test/$$SHLIB$$SHLIB_SUFFIX ] && rm test/$$SHLIB$$SHLIB_SUFFIX; \
  +	$(LINK_SO_A) || exit 1; \
  +	cp -p $$SHLIB$$SHLIB_SUFFIX apps/; \
  +	cp -p $$SHLIB$$SHLIB_SUFFIX test/
   link_app.cygwin:
   	LDCMD=$(CC);\
   	LDFLAGS="$(CFLAGS)"; \
  @@ .
______________________________________________________________________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                     openssl-cvs@openssl.org
Automated List Manager                           majordomo@openssl.org
[prev in list] [next in list] [prev in thread] [next in thread]