OpenSSL: openssl/crypto/ Makefile openssl/util/ mk1mf.pl

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

  Server: cvs.openssl.org                  Name:   Dr.
Stephen Henson
  Root:   /v/openssl/cvs                   Email:  steveopenssl.org
  Module: openssl                          Date:  
13-Aug-2007 04:24:27
  Branch: HEAD                             Handle:
2007081303242501

  Modified files:
    openssl/crypto          Makefile
    openssl/util            mk1mf.pl

  Log:
    Fix for asm/no-asm on WIN32.

  Summary:
    Revision    Changes     Path
    1.22        +1  -0      openssl/crypto/Makefile
    1.83        +1  -1      openssl/util/mk1mf.pl
 
____________________________________________________________
________________

  patch -p0 <<' .'
  Index: openssl/crypto/Makefile
 
============================================================
================
  $ cvs diff -u -r1.21 -r1.22 Makefile
  --- openssl/crypto/Makefile	30 Jul 2007 08:47:32
-0000	1.21
  +++ openssl/crypto/Makefile	13 Aug 2007 02:24:25
-0000	1.22
   -26,6 +26,7 
   CFLAGS= $(INCLUDE) $(CFLAG)
   ASFLAGS= $(INCLUDE) $(ASFLAG)
   AFLAGS=$(ASFLAGS)
  +CPUID_OBJ=mem_clr.o
   
   LIBS=
   
   .
  patch -p0 <<' .'
  Index: openssl/util/mk1mf.pl
 
============================================================
================
  $ cvs diff -u -r1.82 -r1.83 mk1mf.pl
  --- openssl/util/mk1mf.pl	12 Aug 2007 23:59:04 -0000	1.82
  +++ openssl/util/mk1mf.pl	13 Aug 2007 02:24:26 -0000	1.83
   -677,7 +677,7 
   		}
   	if (($cpuid_asm_obj ne "") && ($_ eq
"CRYPTO"))
   		{
  -		$lib_obj =~ s/s(S*/cversionS*)/ $1
$(CPUID_ASM_OBJ)/;
  +		$lib_obj =~ s/sS*/mem_clrS*/ $(CPUID_ASM_OBJ)/;
  
		$rules.=&do_asm_rule($cpuid_asm_obj,$cpuid_asm_src);
   		}
  
	$defs.=&do_defs($."OBJ",$lib_obj,"$(
OBJ_D)",$obj);
   .
____________________________________________________________
__________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                    
openssl-cvsopenssl.org
Automated List Manager                          
majordomoopenssl.org