Commit 07c08ed4 authored by Richard Levitte's avatar Richard Levitte
Browse files

Correct darwin shared library support. 

PR: 39
parent 17b226a6

Configure

+10 −2
Original line number Original line Diff line number Diff line
@@ -534,7 +534,7 @@ my %table=( 
##### MacOS X (a.k.a. Rhapsody or Darwin) setup

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

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

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

"darwin-ppc-cc","cc:-O3 -nostdinc -I/System/Library/Frameworks/System.framework/Headers -I/System/Library/Frameworks/System.frameworks/Headers/bsd -I/usr/include -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown):MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::::::::::darwin-shared:-fPIC::.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",

"darwin-ppc-cc","cc:-O3 -nostdinc -I/System/Library/Frameworks/System.framework/Headers -I/System/Library/Frameworks/System.frameworks/Headers/bsd -I/usr/include -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown):MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::::::::::darwin-shared:-fPIC::.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",

"darwin-i386-cc","cc:-O3 -nostdinc -I/System/Library/Frameworks/System.framework/Headers -I/System/Library/Frameworks/System.frameworks/Headers/bsd -I/usr/include -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown):MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::::::::-fPIC::.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",

"darwin-i386-cc","cc:-O3 -nostdinc -I/System/Library/Frameworks/System.framework/Headers -I/System/Library/Frameworks/System.frameworks/Headers/bsd -I/usr/include -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown):MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::::::::::darwin-shared:-fPIC::.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",





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

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

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

"newsos4-gcc","gcc:-O -DB_ENDIAN::(unknown):NEWS4:-lmld -liberty:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::",
@@ -1208,13 +1208,21 @@ while (<IN>) 
	if ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*$/)

	if ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*$/)

		{

		{

		my $sotmp = $1;

		my $sotmp = $1;

		s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp/

		s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp/;

		}

	elsif ($shared_extension ne "" && $shared_extension =~ /^\.[^\.]*\.dylib$/)

		{

		s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.dylib/;

		}

		}

	elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/)

	elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/)

		{

		{

		my $sotmp = $1;

		my $sotmp = $1;

		s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/;

		s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/;

		}

		}

	elsif ($shared_extension ne "" && $shared_extension =~ /^\.[^\.]*\.[^\.]*\.dylib$/)

		{

		s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.\$(SHLIB_MAJOR).dylib .dylib/;

		}

	s/^SHARED_LDFLAGS=.*/SHARED_LDFLAGS=$shared_ldflag/;

	s/^SHARED_LDFLAGS=.*/SHARED_LDFLAGS=$shared_ldflag/;

	print OUT $_."\n";

	print OUT $_."\n";

	}

	}

TABLE

+1 −1
Original line number Original line Diff line number Diff line
@@ -1290,7 +1290,7 @@ $rc4_obj = 
$rmd160_obj   = 

$rmd160_obj   = 

$rc5_obj      = 

$rc5_obj      = 

$dso_scheme   = 

$dso_scheme   = 

$shared_target= 

$shared_target= darwin-shared

$shared_cflag = -fPIC

$shared_cflag = -fPIC

$shared_ldflag = 

$shared_ldflag = 

$shared_extension = .$(SHLIB_MAJOR).$(SHLIB_MINOR).dylib

$shared_extension = .$(SHLIB_MAJOR).$(SHLIB_MINOR).dylib