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 20:24:41
Branch: HEAD Handle:
2007073119243902
Modified files:
openssl Configure Makefile.shared TABLE
config
openssl/apps Makefile
openssl/test Makefile
Log:
Proper support for shared build under MacOS X.
Summary:
Revision Changes Path
1.564 +8 -2 openssl/Configure
1.65 +1 -3 openssl/Makefile.shared
1.227 +16 -16 openssl/TABLE
1.26 +1 -5 openssl/apps/Makefile
1.161 +11 -1 openssl/config
1.28 +1 -5 openssl/test/Makefile
____________________________________________________________
________________
patch -p0 <<' .'
Index: openssl/Configure
============================================================
================
$ cvs diff -u -r1.563 -r1.564 Configure
--- openssl/Configure 24 Jul 2007 14:41:20 -0000 1.563
+++ openssl/Configure 31 Jul 2007 18:24:39 -0000 1.564
-510,8 +510,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:ppccpuid_osx32.o:osx_ppc32.o
osx_ppc32-mont.o:::::sha1-ppc_osx32.o
sha256-ppc_osx32.o::::::dlfcn:darwin-shared:-fPIC
-fno-common:-dynamiclib:.$(SHLIB_MAJOR).$(SHLIB_MINOR).dyl
ib",
-"darwin64-ppc-cc","cc:-m64 -O3
-DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first:SIXT
Y_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL
BF_PTR:ppccpuid_osx64.o:osx_ppc64.o
osx_ppc64-mont.o:::::sha1-ppc_osx64.o sha256-ppc_osx64.o
sha512-ppc_osx64.o::::::dlfcn:darwin-shared:-fPIC
-fno-common:-m64
-dynamiclib:.$(SHLIB_MAJOR).$(SHLIB_MINOR).dylib",
+"darwin-ppc-cc","cc:-O3
-DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_
LLONG RC4_CHAR RC4_CHUNK DES_UNROLL
BF_PTR:ppccpuid_osx32.o:osx_ppc32.o
osx_ppc32-mont.o:::::sha1-ppc_osx32.o
sha256-ppc_osx32.o::::::dlfcn:darwin-shared:-fPIC
-fno-common:-dynamiclib:.$(SHLIB_MAJOR).$(SHLIB_MINOR).dyl
ib",
+"darwin64-ppc-cc","cc:-m64 -O3
-DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIX
TY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL
BF_PTR:ppccpuid_osx64.o:osx_ppc64.o
osx_ppc64-mont.o:::::sha1-ppc_osx64.o sha256-ppc_osx64.o
sha512-ppc_osx64.o::::::dlfcn:darwin-shared:-fPIC
-fno-common:-m64
-dynamiclib:.$(SHLIB_MAJOR).$(SHLIB_MINOR).dylib",
"darwin-i386-cc","cc:-O3
-fomit-frame-pointer
-DL_ENDIAN::-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",
"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
osx_ppc32-mont.o:::::sha1-ppc_osx32.o::::::dlfcn:darwin-shar
ed:-fPIC:-dynamiclib:.$(SHLIB_MAJOR).$(SHLIB_MINOR).dylib&
quot;,
-987,6 +987,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;
-1334,6 +1339,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/Makefile.shared
============================================================
================
$ cvs diff -u -r1.64 -r1.65 Makefile.shared
--- openssl/Makefile.shared 19 May 2007 19:40:15
-0000 1.64
+++ openssl/Makefile.shared 31 Jul 2007 18:24:39
-0000 1.65
-103,15 +103,13
LIBDEPS="$${LIBDEPS (LIBDEPS)}&q
uot;;
SHAREDCMD="$${SHAREDCMD(CC)}";
SHAREDFLAGS="$${SHAREDFLAGS(CFLAGS)
$(SHARED_LDFLAGS)}";
- $(NM) -Pg $$SHOBJECTS | grep ' [BDT] ' | cut -f1 -d'
' > lib$(LIBNAME).exp;
LIBPATH=`for x in $$LIBDEPS; do if echo $$x | grep '^
*-L' > /dev/null 2>&1; then echo $$x | sed -e 's/^
*-L//'; fi; done | uniq`;
LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`;
LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH
$$ $$
-o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX
$$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS
- ) && $(SYMLINK_SO);
- ( $(SET_X); rm -f lib$(LIBNAME).exp )
+ ) && $(SYMLINK_SO)
SYMLINK_SO=
if [ -n "$$INHIBIT_SYMLINKS" ]; then :; else
.
patch -p0 <<' .'
Index: openssl/TABLE
============================================================
================
$ cvs diff -u -r1.226 -r1.227 TABLE
--- openssl/TABLE 28 May 2007 16:30:17 -0000 1.226
+++ openssl/TABLE 31 Jul 2007 18:24:39 -0000 1.227
-1070,7 +1070,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 = ppccpuid_osx32.o
$bn_obj = osx_ppc32.o osx_ppc32-mont.o
-1098,7 +1098,7
$unistd =
$thread_cflag = -D_REENTRANT
$sys_id = MACOSX
-$lflags = -Wl,-search_paths_first
+$lflags = -Wl,-search_paths_first%
$bn_ops = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK
DES_UNROLL BF_PTR
$cpuid_obj = ppccpuid_osx64.o
$bn_obj = osx_ppc64.o osx_ppc64-mont.o
-1822,24 +1822,24
*** 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 -g
-pedantic -Wno-long-long -Wall -Werror -Wshadow -pipe
$unistd =
$thread_cflag = -D_REENTRANT
$sys_id =
$lflags = -rdynamic -ldl
-$bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL
RC4_INDEX MD2_INT
-$cpuid_obj = x86cpuid-elf.o
-$bn_obj = bn86-elf.o co86-elf.o mo86-elf.o
-$des_obj = dx86-elf.o yx86-elf.o
-$aes_obj = ax86-elf.o
-$bf_obj = bx86-elf.o
-$md5_obj = mx86-elf.o
-$sha1_obj = sx86-elf.o s512sse2-elf.o
-$cast_obj = cx86-elf.o
-$rc4_obj = rx86-elf.o
-$rmd160_obj = rm86-elf.o
-$rc5_obj = r586-elf.o
-$wp_obj = wp_block.o w86mmx-elf.o
+$bn_ops = SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2
DES_INT DES_UNROLL
+$cpuid_obj = x86_64cpuid.o
+$bn_obj = x86_64-gcc.o x86_64-mont.o
+$des_obj =
+$aes_obj = aes-x86_64.o
+$bf_obj =
+$md5_obj = md5-x86_64.o
+$sha1_obj = sha1-x86_64.o sha256-x86_64.o
sha512-x86_64.o
+$cast_obj =
+$rc4_obj = rc4-x86_64.o
+$rmd160_obj =
+$rc5_obj =
+$wp_obj = wp-x86_64.o
$dso_scheme = dlfcn
$shared_target= linux-shared
$shared_cflag =
.
patch -p0 <<' .'
Index: openssl/apps/Makefile
============================================================
================
$ cvs diff -u -r1.25 -r1.26 Makefile
--- openssl/apps/Makefile 23 Apr 2007 23:48:16 -0000 1.25
+++ openssl/apps/Makefile 31 Jul 2007 18:24:40 -0000 1.26
-154,11 +154,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/config
============================================================
================
$ cvs diff -u -r1.160 -r1.161 config
--- openssl/config 19 Jun 2007 15:43:48 -0000 1.160
+++ openssl/config 31 Jul 2007 18:24:39 -0000 1.161
-525,7 +525,17
OUT="irix-mips3-$CC"
;;
ppc-apple-rhapsody) OUT="rhapsody-ppc-cc" ;;
- ppc-apple-darwin*) OUT="darwin-ppc-cc" ;;
+ ppc-apple-darwin*)
+ ISA64=`(sysctl -n hw.optional.64bitops) 2>/dev/null`
+ if [ "$ISA64" = "1" ]; then
+ echo "WARNING! If you wish to build 64-bit
library, then you have to"
+ echo " invoke './Configure
darwin64-ppc-cc' *manually*."
+ if [ "$TEST" = "false" -a -t 1
]; then
+ echo " You have about 5 seconds to
press Ctrl-C to abort."
+ (trap "stty `stty -g`" 2 0; stty -icanon
min 0 time 50; read waste) <&1
+ fi
+ fi
+ OUT="darwin-ppc-cc" ;;
i386-apple-darwin*) OUT="darwin-i386-cc" ;;
alpha-*-linux2)
ISA=`awk '/cpu model/{print$4;exit(0);}'
/proc/cpuinfo`
.
patch -p0 <<' .'
Index: openssl/test/Makefile
============================================================
================
$ cvs diff -u -r1.27 -r1.28 Makefile
--- openssl/test/Makefile 4 Apr 2007 13:21:15 -0000 1.27
+++ openssl/test/Makefile 31 Jul 2007 18:24:41 -0000 1.28
-326,11 +326,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-cvsopenssl.org
Automated List Manager
majordomoopenssl.org
|
