Browse Source

Use correct CFLAG definition for makefile.one builds.

master
Bodo Möller 23 years ago
parent
commit
2e0fc87599
6 changed files with 51 additions and 6 deletions
  1. +4
    -3
      CHANGES
  2. +2
    -0
      Configure
  3. +1
    -0
      crypto/.cvsignore
  4. +2
    -2
      crypto/Makefile.ssl
  5. +6
    -1
      crypto/cversion.c
  6. +36
    -0
      util/mk1mf.pl

+ 4
- 3
CHANGES View File

@ -30,9 +30,10 @@
*) The -DPLATFORM="\"$(PLATFORM)\"" definition and the similar -DCFLAGS=...
(both in crypto/Makefile.ssl for use by crypto/cversion.c) caused
problems not only on Windows, but also on some Unix platforms.
To avoid problematic command lines, these definitions are now made
in auto-generated file crypto/buildinf.h, which also defines DATE
and thus replaces crypto/date.h.
To avoid problematic command lines, these definitions are now in an
auto-generated file, which also defines DATE and thus replaces
crypto/date.h. Standard "make" builds use crypto/buildinf.h,
mk1mf.pl builds use crypto/mk1mfinf.h (created by mk1mf.pl).
[Bodo Moeller]
*) MIPS III/IV assembler module is reimplemented.


+ 2
- 0
Configure View File

@ -710,11 +710,13 @@ if($IsWindows) {
printf OUT <<EOF;
/* auto-generated by Configure for crypto/cversion.c */
/* (Unix builds: auto-generated by crypto/Makefile.ssl) */
/* mk1mf builds use mk1mfinf.h instead, so this file is probably never needed */
#define CFLAGS "$cc $cflags"
#define PLATFORM "$target"
EOF
printf OUT "#define DATE \"%s\"\n", scalar gmtime();
close(OUT);
system "perl crypto/objects/obj_dat.pl <crypto/objects/objects.h >crypto/objects/obj_dat.h";
} else {
(system "make -f Makefile.ssl PERL=\'$perl\' links") == 0 or exit $?;


+ 1
- 0
crypto/.cvsignore View File

@ -1,4 +1,5 @@
lib
buildinf.h
mk1mfinf.h
opensslconf.h
Makefile.save

+ 2
- 2
crypto/Makefile.ssl View File

@ -51,7 +51,7 @@ all: buildinf.h lib subdirs
buildinf.h: ../Makefile.ssl
( echo "/* auto-generated by crypto/Makefile.ssl for crypto/cversion.c */"; \
echo "/* (Windows builds: auto-generated by Configure) */"; \
echo "/* (mk1mf builds use mk1mfinf.h instead) */"; \
echo "#define CFLAGS \"$(CC) $(CFLAG)\""; \
echo "#define PLATFORM \"$(PLATFORM)\""; \
echo "#define DATE \"`date`\"" ) >buildinf.h
@ -129,7 +129,7 @@ depend:
done;
clean:
rm -f buildinf.h *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
rm -f buildinf.h mk1mfinf.h *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
@for i in $(SDIRS) ;\
do \
(cd $$i; echo "making clean in crypto/$$i..."; \


+ 6
- 1
crypto/cversion.c View File

@ -60,7 +60,12 @@
#include <string.h>
#include "cryptlib.h"
#include <openssl/crypto.h>
#include "buildinf.h"
#ifdef MK1MF_BUILD
# include "mk1mfinf.h"
#else
# include "buildinf.h"
#endif
const char *SSLeay_version(int t)
{


+ 36
- 0
util/mk1mf.pl View File

@ -401,6 +401,41 @@ vclean:
\$(RM) \$(OUT_D)$o*.*
EOF
my $platform_cpp_symbol = "MK1MF_PLATFORM_$platform";
$platform_cpp_symbol =~ s/-/_/;
if (open(IN,"crypto/mk1mfinf.h"))
{
# Remove entry for this platform in existing file mk1mfinf.h.
my $old_mk1mfinf_h = "";
while (<IN>)
{
if (/^\#ifdef $platform_cpp_symbol$/)
{
while (<IN>) { last if (/^\#endif/); }
}
else
{
$old_mk1mfinf_h .= $_;
}
}
open(OUT,">crypto/mk1mfinf.h") || die "Can't open mk1mfinf.h";
print OUT $old_mk1mfinf_h;
}
open (OUT,">>crypto/mk1mfinf.h") || die "Can't open mk1mfinf.h";
printf OUT <<EOF;
#ifdef $platform_cpp_symbol
/* auto-generated and updated by util/mk1mf.pl for crypto/cversion.c */
/* (used in place of crypto/buildinf.h by mk1mf builds) */
#define CFLAGS "$cc $cflags"
#define PLATFORM "$platform"
EOF
printf OUT " #define DATE \"%s\"\n", scalar gmtime();
printf OUT "#endif\n";
close(OUT);
#############################################
# We parse in input file and 'store' info for later printing.
@ -730,6 +765,7 @@ sub cc_compile_target
local($target,$source,$ex_flags)=@_;
local($ret);
$ex_flags.=" -DMK1MF_BUILD -D$platform_cpp_symbol" if ($source =~ /cversion/);
$target =~ s/\//$o/g if $o ne "/";
$source =~ s/\//$o/g if $o ne "/";
$ret ="$target: \$(SRC_D)$o$source\n\t";


Loading…
Cancel
Save