r1675

[stsp at user.in-berlin.de]

Author: stsp
Date: 2007-01-12 20:16:39 +0100 (Fri, 12 Jan 2007)
New Revision: 1675

Log:
Use proper CFLAGS when compiling OpenSSL.

I don't know why I came up with the idea of renaming the CFLAG
variable in this script to CFLAGS, it seemed like the right
thing to do at the time :-)

Well, back then the Makefile was static so proper CFLAGS
were hardcoded in it anyway. But now that the Makefile is
created dynamically by the configure script this bit us in
the buttocks. I apologise for being so stupid, in hindsight.

Also, fix the dslinux platform description wrt asm code and -fPIC.


Modified: trunk/lib/libssl/src/Configure
===================================================================
--- trunk/lib/libssl/src/Configure	2007-01-12 15:08:47 UTC (rev 1674)
+++ trunk/lib/libssl/src/Configure	2007-01-12 19:16:39 UTC (rev 1675)
@@ -355,7 +355,7 @@
 "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${no_asm}",
 
 # DSLinux
-"dslinux","$ENV{'CC'}:$ENV{'CFLAGS'} -DL_ENDIAN -DTERMIO -Wall:::::::::-fPIC::",
+"dslinux","$ENV{'CC'}:$ENV{'CFLAGS'}:::::BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn::::",
 
 #### *BSD [do see comment about ${BSDthreads} above!]
 "BSD-generic32","gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
@@ -1292,7 +1292,7 @@
 	s/^CONFIGURE_ARGS=.*$/CONFIGURE_ARGS=$argvstring/;
 	s/^CC=.*$/CC= $cc/;
 	s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $cc eq "gcc";
-	s/^CFLAGS=.*$/CFLAGS= $cflags/;
+	s/^CFLAG=.*$/CFLAG= $cflags/;
 	s/^DEPFLAG=.*$/DEPFLAG= $depflags/;
 	s/^EX_LIBS=.*$/EX_LIBS= $lflags/;
 	s/^EXE_EXT=.*$/EXE_EXT= $exe_ext/;
@@ -1345,7 +1345,7 @@
 rename("$Makefile.new",$Makefile) || die "unable to rename $Makefile.new\n";
 
 print "CC            =$cc\n";
-print "CFLAGS        =$cflags\n";
+print "CFLAG         =$cflags\n";
 print "EX_LIBS       =$lflags\n";
 print "CPUID_OBJ     =$cpuid_obj\n";
 print "BN_ASM        =$bn_obj\n";