Commit d16e3759 authored by Richard Levitte's avatar Richard Levitte
Browse files

Patches to make OpenSSL compilable on MacOS/X. 

Submitted by Pier Fumagalli <pier@betaversion.org>
parent 31961f73

Configure

+1 −1
Original line number Diff line number Diff line
@@ -478,7 +478,7 @@ my %table=( 


##### MacOS X (a.k.a. Rhapsody or Darwin) setup

"rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown)::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::",

"darwin-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown)::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::",

"darwin-ppc-cc","cc:-O3 -D_DARWIN -DB_ENDIAN::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::::::::::darwin-shared:-fPIC:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",



##### Sony NEWS-OS 4.x

"newsos4-gcc","gcc:-O -DB_ENDIAN -DNEWS4::(unknown):-lmld -liberty:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::",

Makefile.org

+11 −0
Original line number Diff line number Diff line
@@ -271,6 +271,17 @@ DETECT_GNU_LD=${CC} -v 2>&1 | grep '^gcc' >/dev/null 2>&1 && \ 
	[ -n "$$my_ld" ] && \

	$$my_ld -v 2>&1 | grep 'GNU ld' >/dev/null 2>&1



# For Darwin AKA Mac OS/X (dyld)

do_darwin-shared: 

	libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \

	( set -x ; ${CC} --verbose -dynamiclib -o lib$$i${SHLIB_EXT} \

		lib$$i.a $$libs -all_load -current_version ${SHLIB_MAJOR}.${SHLIB_MINOR} \

		-compatibility_version ${SHLIB_MAJOR}.`echo ${SHLIB_MINOR} | cut -d. -f1` \

		-install_name ${INSTALLTOP}/lib/lib$$i${SHLIB_EXT} ) || exit 1; \

	libs="$$libs -l`basename $$i${SHLIB_EXT} .dylib`"; \

	echo "" ; \

	done



# This assumes that GNU utilities are *not* used

do_alpha-osf1-shared:

	if ${DETECT_GNU_LD}; then \

apps/s_time.c

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ 
#include "wintext.h"

#endif



#if !defined(MSDOS) && (!defined(VMS) || defined(__DECC))

#if !defined(MSDOS) && (!defined(VMS) || defined(__DECC)) || defined (_DARWIN)

#define TIMES

#endif

apps/speed.c

+2 −2
Original line number Diff line number Diff line
@@ -84,10 +84,10 @@ 


#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)

# define USE_TOD

#elif !defined(MSDOS) && (!defined(VMS) || defined(__DECC))

#elif !defined(MSDOS) && (!defined(VMS) || defined(__DECC)) || defined(_DARWIN)

# define TIMES

#endif

#if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) && !defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) && !defined(_AIX) && !defined(MPE) && !defined(__NetBSD__)

#if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) && !defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) && !defined(_AIX) && !defined(MPE) && !defined(__NetBSD__) && !defined(_DARWIN)

# define TIMEB

#endif

crypto/asn1/a_gentm.c

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_set(ASN1_GENERALIZEDTIME *s, 
	if (s == NULL)

		return(NULL);



#if defined(THREADS) && !defined(WIN32)

#if defined(THREADS) && !defined(WIN32) && ! defined(_DARWIN)

	gmtime_r(&t,&data); /* should return &data, but doesn't on some systems, so we don't even look at the return value */

	ts=&data;

#else