OpenSSL CVS Repository
http://cvs.openssl.org/
____________________________________________________________
________________
Server: cvs.openssl.org Name: Andy
Polyakov
Root: /v/openssl/cvs Email: appro openssl.org
Module: openssl Date:
31-Jul-2007 22:03:27
Branch: OpenSSL_0_9_8-stable Handle:
2007073121032303
Modified files: (Branch: OpenSSL_0_9_8-stable)
openssl Configure TABLE
openssl/apps Makefile
openssl/test Makefile
Log:
MacOS X update [from HEAD].
Summary:
Revision Changes Path
1.488.2.40 +8 -2 openssl/Configure
1.184.2.17 +3 -3 openssl/TABLE
1.9.2.9 +1 -5 openssl/apps/Makefile
1.12.2.12 +1 -5 openssl/test/Makefile
____________________________________________________________
________________
patch -p0 <<' .'
Index: openssl/Configure
============================================================
================
$ cvs diff -u -r1.488.2.39 -r1.488.2.40 Configure
--- openssl/Configure 24 Jul 2007 14:40:26
-0000 1.488.2.39
+++ openssl/Configure 31 Jul 2007 20:03:23
-0000 1.488.2.40
 -499,8 +499,8 
##### MacOS X (a.k.a. Rhapsody or Darwin) setup
"rhapsody-ppc-cc","cc:-O3
-DB_ENDIAN::(unknown):MACOSX_RHAPSODY::BN_LLONG RC4_CHAR
RC4_CHUNK DES_UNROLL BF_PTR:$::",
-"darwin-ppc-cc","cc:-O3
-DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first:BN_L
LONG RC4_CHAR RC4_CHUNK DES_UNROLL
BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC
-fno-common:-dynamiclib:.$(SHLIB_MAJOR).$(SHLIB_MINOR).dyl
ib",
-"darwin-i386-cc","cc:-O3
-fomit-frame-pointer
-fno-common::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR
RC4_CHUNK DES_UNROLL
BF_PTR:$:dlfcn:darwin-shared:-fPIC
-fno-common:-dynamiclib:.$(SHLIB_MAJOR).$(SHLIB_MINOR).dyl
ib",
+"darwin-ppc-cc","cc:-O3
-DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_
LLONG RC4_CHAR RC4_CHUNK DES_UNROLL
BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC
-fno-common:-dynamiclib:.$(SHLIB_MAJOR).$(SHLIB_MINOR).dyl
ib",
+"darwin-i386-cc","cc:-O3
-fomit-frame-pointer
-fno-common::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN
_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL
BF_PTR:$:dlfcn:darwin-shared:-fPIC
-fno-common:-dynamiclib:.$(SHLIB_MAJOR).$(SHLIB_MINOR).dyl
ib",
"debug-darwin-ppc-cc","cc:-DBN_DEBUG
-DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall
-O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK
DES_UNROLL
BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC
-fno-common:-dynamiclib:.$(SHLIB_MAJOR).$(SHLIB_MINOR).dyl
ib",
##### A/UX
 -968,6 +968,11 
my $ranlib = $fields[$idx_ranlib];
my $arflags = $fields[$idx_arflags];
+# '%' in $lflags is used to split flags to
"pre-" and post-flags
+my ($prelflags,$postlflags)=split('%',$lflags);
+if (defined($postlflags)) { $lflags=$postlflags; }
+else { $lflags=$prelflags; undef $prelflags; }
+
my $no_shared_warn=0;
my $no_user_cflags=0;
 -1294,6 +1299,7 
s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $cc eq
"gcc";
s/^CFLAG=.*$/CFLAG= $cflags/;
s/^DEPFLAG=.*$/DEPFLAG= $depflags/;
+ s/^PEX_LIBS=.*$/PEX_LIBS= $prelflags/;
s/^EX_LIBS=.*$/EX_LIBS= $lflags/;
s/^EXE_EXT=.*$/EXE_EXT= $exe_ext/;
s/^CPUID_OBJ=.*$/CPUID_OBJ= $cpuid_obj/;
 .
patch -p0 <<' .'
Index: openssl/TABLE
============================================================
================
$ cvs diff -u -r1.184.2.16 -r1.184.2.17 TABLE
--- openssl/TABLE 25 Mar 2007 15:34:42 -0000 1.184.2.16
+++ openssl/TABLE 31 Jul 2007 20:03:24 -0000 1.184.2.17
 -951,7 +951,7 
$unistd =
$thread_cflag = -D_REENTRANT
$sys_id = MACOSX
-$lflags =
+$lflags = -Wl,-search_paths_first%
$bn_ops = BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL
BF_PTR
$cpuid_obj =
$bn_obj =
 -978,7 +978,7 
$unistd =
$thread_cflag = -D_REENTRANT
$sys_id = MACOSX
-$lflags = -Wl,-search_paths_first
+$lflags = -Wl,-search_paths_first%
$bn_ops = BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL
BF_PTR
$cpuid_obj =
$bn_obj = osx_ppc32.o
 -1649,7 +1649,7 
*** debug-steve
$cc = gcc
-$cflags = -DL_ENDIAN -DREF_CHECK -DCONF_DEBUG
-DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DPEDANTIC -g
-march=i486 -pedantic -Wno-long-long -Wall -Werror -Wshadow
-pipe
+$cflags = -DL_ENDIAN -DREF_CHECK -DCONF_DEBUG
-DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DPEDANTIC -m32 -g
-pedantic -Wno-long-long -Wall -Werror -Wshadow -pipe
$unistd =
$thread_cflag = -D_REENTRANT
$sys_id =
 .
patch -p0 <<' .'
Index: openssl/apps/Makefile
============================================================
================
$ cvs diff -u -r1.9.2.8 -r1.9.2.9 Makefile
--- openssl/apps/Makefile 23 Feb 2007 01:01:03
-0000 1.9.2.8
+++ openssl/apps/Makefile 31 Jul 2007 20:03:25
-0000 1.9.2.9
 -153,11 +153,7 
shlib_target=; if [ -n "$(SHARED_LIBS)" ];
then
shlib_target="$(SHLIB_TARGET)";
fi;
- if [ "$$" =
"darwin-shared" ] ; then
- LIBRARIES="$(DLIBSSL) $(LIBKRB5)
$(DLIBCRYPTO)" ;
- else
- LIBRARIES="$(LIBSSL) $(LIBKRB5)
$(LIBCRYPTO)" ;
- fi;
+ LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)"
;
$(MAKE) -f $(TOP)/Makefile.shared -e
APPNAME=$(EXE) OBJECTS="$(PROGRAM).o
$(E_OBJ)"
LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)"
 .
patch -p0 <<' .'
Index: openssl/test/Makefile
============================================================
================
$ cvs diff -u -r1.12.2.11 -r1.12.2.12 Makefile
--- openssl/test/Makefile 4 Apr 2007 12:50:13
-0000 1.12.2.11
+++ openssl/test/Makefile 31 Jul 2007 20:03:26
-0000 1.12.2.12
 -313,11 +313,7 
BUILD_CMD=shlib_target=; if [ -n
"$(SHARED_LIBS)" ]; then
shlib_target="$(SHLIB_TARGET)";
fi;
- if [ "$$" =
"hpux-shared" -o "$$" =
"darwin-shared" ] ; then
- LIBRARIES="$(DLIBSSL) $(DLIBCRYPTO)
$(LIBKRB5)";
- else
- LIBRARIES="$(LIBSSL) $(LIBCRYPTO)
$(LIBKRB5)";
- fi;
+ LIBRARIES="$(LIBSSL) $(LIBCRYPTO) $(LIBKRB5)";
$(MAKE) -f $(TOP)/Makefile.shared -e
APPNAME=$$target$(EXE_EXT)
OBJECTS="$$target.o"
LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)"
 .
____________________________________________________________
__________
OpenSSL Project http://www.openssl.org
CVS Repository Commit List
openssl-cvs openssl.org
Automated List Manager
majordomo openssl.org
|