List Info

Thread: OpenSSL: openssl/ Makefile.org Makefile.shared openssl/apps/ Mak...
OpenSSL: openssl/ Makefile.org Makefile.shared openssl/apps/ Mak...
user name
 2006-10-24 22:14:21 
  OpenSSL CVS Repository
  http://cvs.openssl.org/
 
____________________________________________________________
________________

  Server: cvs.openssl.org                  Name:   Andy
Polyakov
  Root:   /v/openssl/cvs                   Email:  approopenssl.org
  Module: openssl                          Date:  
25-Oct-2006 00:14:21
  Branch: HEAD                             Handle:
2006102423141703

  Added files:
    openssl/util            mkrc.pl
  Modified files:
    openssl                 Makefile.org Makefile.shared
    openssl/apps            Makefile
    openssl/crypto          Makefile
    openssl/test            Makefile

  Log:
    Further mingw build procedure updates.

  Summary:
    Revision    Changes     Path
    1.279       +1  -0      openssl/Makefile.org
    1.61        +19 -10     openssl/Makefile.shared
    1.24        +1  -1      openssl/apps/Makefile
    1.18        +7  -4      openssl/crypto/Makefile
    1.25        +1  -1      openssl/test/Makefile
    1.1         +71 -0      openssl/util/mkrc.pl
 
____________________________________________________________
________________

  patch -p0 <<' .'
  Index: openssl/Makefile.org
 
============================================================
================
  $ cvs diff -u -r1.278 -r1.279 Makefile.org
  --- openssl/Makefile.org	21 Oct 2006 16:28:03 -0000	1.278
  +++ openssl/Makefile.org	24 Oct 2006 22:14:17 -0000	1.279
   -176,6 +176,7 
   		CC='$' CFLAG='$' 			
   		AS='$' ASFLAG='$ -c'			
   		AR='$' NM='$' RANLIB='$'	
  +		CROSS_COMPILE_PREFIX='$'	
   		PERL='$'					
   		SDIRS='$' LIBRPATH='$/lib'	
   		INSTALL_PREFIX='$'		
   .
  patch -p0 <<' .'
  Index: openssl/Makefile.shared
 
============================================================
================
  $ cvs diff -u -r1.60 -r1.61 Makefile.shared
  --- openssl/Makefile.shared	23 Oct 2006 11:54:18
-0000	1.60
  +++ openssl/Makefile.shared	24 Oct 2006 22:14:17
-0000	1.61
   -255,28 +255,37 
   	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
-Wl,-s,-Bsymbolic"; 
   	$(LINK_SO_O)
   link_a.cygwin:
   	
$(CALC_VERSIONS); 
   	INHIBIT_SYMLINKS=yes; 
  -	SHLIB=cyg$(LIBNAME); SHLIB_SOVER=-$(LIBVERSION); def=; 
  +	SHLIB=cyg$(LIBNAME); SHLIB_SOVER=-$(LIBVERSION);
SHLIB_SUFFIX=.dll; 
  +	dll_name=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; extras=; 
   	if expr $(PLATFORM) : 'mingw' > /dev/null; then 
   		SHLIB=$(LIBNAME); SHLIB_SOVER=32; 
  -		def="$(LIBNAME).def"; 
  -		$(PERL) util/mkdef.pl 32 $(LIBNAME) > $$def; 
  +		extras="$(LIBNAME).def"; 
  +		$(PERL) util/mkdef.pl 32 $(LIBNAME) > $$extras; 
   	fi; 
  -	SHLIB_SUFFIX=.dll; 
  +	dll_name=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; 
  +	$(PERL) util/mkrc.pl $$dll_name | 
  +		$(CROSS_COMPILE_PREFIX)windres -o rc.o; 
  +	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,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a
$$def"; 
  -	[ -f apps/$$SHLIB$$SHLIB_SUFFIX ] && rm
apps/$$SHLIB$$SHLIB_SUFFIX; 
  -	[ -f test/$$SHLIB$$SHLIB_SUFFIX ] && rm
test/$$SHLIB$$SHLIB_SUFFIX; 
  +	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; 
   	$(LINK_SO_A) || exit 1; 
  -	cp -p $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX apps/; 
  -	cp -p $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX test/
  +	rm $$extras; 
  +	cp -p $$dll_name apps/; 
  +	cp -p $$dll_name test/
   link_app.cygwin:
  +	if expr "$(CFLAGS)" :
'.*OPENSSL_USE_APPLINK' > /dev/null; then 
  +		LIBDEPS="$(TOP)/crypto/applink.o $${LIBDEPS(LIBDEPS)}&q
uot;; 
  +		export LIBDEPS; 
  +	fi; 
   	$(LINK_APP)
   
   link_o.alpha-osf1:
   .
  patch -p0 <<' .'
  Index: openssl/apps/Makefile
 
============================================================
================
  $ cvs diff -u -r1.23 -r1.24 Makefile
  --- openssl/apps/Makefile	21 Oct 2006 13:38:16 -0000	1.23
  +++ openssl/apps/Makefile	24 Oct 2006 22:14:18 -0000	1.24
   -140,7 +140,7 
   	rm -f CA.pl
   
   clean:
  -	rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak
fluff $(EXE)
  +	rm -f *.o *.obj *.dll lib tags core .pure .nfs* *.old
*.bak fluff $(EXE)
   	rm -f req
   
   $(DLIBSSL):
   .
  patch -p0 <<' .'
  Index: openssl/crypto/Makefile
 
============================================================
================
  $ cvs diff -u -r1.17 -r1.18 Makefile
  --- openssl/crypto/Makefile	11 Apr 2006 20:05:10
-0000	1.17
  +++ openssl/crypto/Makefile	24 Oct 2006 22:14:20
-0000	1.18
   -64,11 +64,14 
   x86cpuid-out.s: x86cpuid.pl perlasm/x86asm.pl
   	$(PERL) x86cpuid.pl a.out $(CFLAGS) $(PROCESSOR) >
$
   
  -uplink.o:	../ms/uplink.c
  -	$(CC) $(CFLAGS) -c -o $ ../ms/uplink.c
  +applink.o:	$(TOP)/ms/applink.c
  +	$(CC) $(CFLAGS) -c -o $ $(TOP)/ms/applink.c
   
  -uplink-cof.s:	../ms/uplink.pl
  -	$(PERL) ../ms/uplink.pl coff > $
  +uplink.o:	$(TOP)/ms/uplink.c applink.o
  +	$(CC) $(CFLAGS) -c -o $ $(TOP)/ms/uplink.c
  +
  +uplink-cof.s:	$(TOP)/ms/uplink.pl
  +	$(PERL) $(TOP)/ms/uplink.pl coff > $
   
   x86_64cpuid.s: x86_64cpuid.pl
   	$(PERL) x86_64cpuid.pl $
   .
  patch -p0 <<' .'
  Index: openssl/test/Makefile
 
============================================================
================
  $ cvs diff -u -r1.24 -r1.25 Makefile
  --- openssl/test/Makefile	18 Sep 2006 19:50:54 -0000	1.24
  +++ openssl/test/Makefile	24 Oct 2006 22:14:18 -0000	1.25
   -315,7 +315,7 
   			testreq.pem
   
   clean:
  -	rm -f .rnd tmp.bntest tmp.bctest *.o *.obj lib tags core
.pure .nfs* *.old *.bak fluff $(EXE) *.ss *.srl log
dummytest
  +	rm -f .rnd tmp.bntest tmp.bctest *.o *.obj *.dll lib
tags core .pure .nfs* *.old *.bak fluff $(EXE) *.ss *.srl
log dummytest
   
   $(DLIBSSL):
   	(cd ..; $(MAKE) DIRS=ssl all)
   .
  patch -p0 <<' .'
  Index: openssl/util/mkrc.pl
 
============================================================
================
  $ cvs diff -u -r0 -r1.1 mkrc.pl
  --- /dev/null	2006-10-25 00:14:11 +0200
  +++ mkrc.pl	2006-10-25 00:14:21 +0200
   -0,0 +1,71 
  +#!/bin/env perl
  +#
  +open FD,"crypto/opensslv.h";
  +while(<FD>) {
  +    if (/OPENSSL_VERSION_NUMBERs+(0x[0-9a-f]+)/i) {
  +	$ver = hex($1);
  +	$v1 = ($ver>>28);
  +	$v2 = ($ver>>20)&0xff;
  +	$v3 = ($ver>>12)&0xff;
  +	$v4 = ($ver>> 4)&0xff;
  +	$beta = $ver&0xf;
  +	$version = "$v1.$v2.$v3";
  +	if ($beta==0xf)	{ $version .= chr(ord('a')+$v4-1) if
($v4);	}
  +	elsif ($beta==0){ $version .= "-dev";				}
  +	else		{ $version .= "-beta$beta";			}
  +	last;
  +    }
  +}
  +close(FD);
  +
  +$filename = $ARGV[0]; $filename =~ /(.*).([^.]+)$/;
  +$basename = $1;
  +$extname  = $2;
  +
  +if ($extname =~ /dll/i)	{ $description = "OpenSSL
shared library"; }
  +else			{ $description = "OpenSSL application"; 
  }
  +
  +print <<___;
  +#include <winver.h>
  +
  +LANGUAGE 0x09,0x01
  +
  +1 VERSIONINFO
  +  FILEVERSION $v1,$v2,$v3,$v4
  +  PRODUCTVERSION $v1,$v2,$v3,$v4
  +  FILEFLAGSMASK 0x3fL
  +#ifdef _DEBUG
  +  FILEFLAGS 0x01L
  +#else
  +  FILEFLAGS 0x00L
  +#endif
  +  FILEOS VOS__WINDOWS32
  +  FILETYPE VFT_DLL
  +  FILESUBTYPE 0x0L
  +BEGIN
  +    BLOCK "StringFileInfo"
  +    BEGIN
  +        BLOCK "040904b0"
  +        BEGIN
  +            // Required:
  +            VALUE "CompanyName", "The
OpenSSL Project, http://www.openssl.org/\
0"
  +            VALUE "FileDescription",
"$description\0"
  +            VALUE "FileVersion",
"$version\0"
  +            VALUE "InternalName",
"$basename\0"
  +            VALUE "OriginalFilename",
"$filename\0"
  +            VALUE "ProductName", "The
OpenSSL Toolkit\0"
  +            VALUE "ProductVersion",
"$version\0"
  +            // Optional:
  +            //VALUE "Comments", "\0"
  +            VALUE "LegalCopyright",
"Copyright © 1998-2006 The OpenSSL Project. Copyright ©
1995-1998 Eric A. Young, Tim J. Hudson. All rights
reserved.\0"
  +            //VALUE "LegalTrademarks",
"\0"
  +            //VALUE "PrivateBuild",
"\0"
  +            //VALUE "SpecialBuild",
"\0"
  +        END
  +    END
  +    BLOCK "VarFileInfo"
  +    BEGIN
  +        VALUE "Translation", 0x409, 0x4b0
  +    END
  +END
  +___
   .
____________________________________________________________
__________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                    
openssl-cvsopenssl.org
Automated List Manager                          
majordomoopenssl.org
[1]

about | contact  Other archives ( Real Estate discussion Medical topics )