2015-11-24 13:06:45 +00:00
|
|
|
#! /usr/bin/env perl
|
2015-11-24 05:44:58 +00:00
|
|
|
# -*- mode: perl; -*-
|
2015-11-24 13:06:45 +00:00
|
|
|
|
1999-02-25 08:48:52 +00:00
|
|
|
##
|
|
|
|
## Configure -- OpenSSL source tree configuration script
|
2014-09-25 17:18:22 +00:00
|
|
|
## If editing this file, run this command before committing
|
2016-01-12 21:25:30 +00:00
|
|
|
## make -f Makefile.in TABLE
|
1999-02-25 08:48:52 +00:00
|
|
|
##
|
1998-12-28 17:08:48 +00:00
|
|
|
|
1998-12-28 17:37:17 +00:00
|
|
|
require 5.000;
|
1998-12-28 17:08:48 +00:00
|
|
|
use strict;
|
2015-02-24 22:40:22 +00:00
|
|
|
use File::Basename;
|
2016-02-02 18:47:05 +00:00
|
|
|
use File::Spec::Functions qw/:DEFAULT abs2rel rel2abs/;
|
2016-02-08 15:27:15 +00:00
|
|
|
use File::Path qw/mkpath/;
|
1998-12-28 17:08:48 +00:00
|
|
|
|
1999-04-19 13:54:11 +00:00
|
|
|
# see INSTALL for instructions.
|
1999-04-24 22:59:36 +00:00
|
|
|
|
2016-01-21 00:23:43 +00:00
|
|
|
my $usage="Usage: Configure [no-<cipher> ...] [enable-<cipher> ...] [experimental-<cipher> ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [[no-]threads] [[no-]shared] [[no-]zlib|zlib-dynamic] [no-asm] [no-dso] [no-egd] [sctp] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx[=vvv]] [--config=FILE] os/compiler[:flags]\n";
|
1999-04-24 22:59:36 +00:00
|
|
|
|
1999-04-19 15:19:58 +00:00
|
|
|
# Options:
|
1999-04-29 21:52:08 +00:00
|
|
|
#
|
2015-02-24 22:40:22 +00:00
|
|
|
# --config add the given configuration file, which will be read after
|
|
|
|
# any "Configurations*" files that are found in the same
|
|
|
|
# directory as this script.
|
2016-01-20 17:11:51 +00:00
|
|
|
# --prefix prefix for the OpenSSL installation, which includes the
|
|
|
|
# directories bin, lib, include, share/man, share/doc/openssl
|
|
|
|
# This becomes the value of INSTALLTOP in Makefile
|
|
|
|
# (Default: /usr/local)
|
|
|
|
# --openssldir OpenSSL data area, such as openssl.cnf, certificates and keys.
|
|
|
|
# If it's a relative directory, it will be added on the directory
|
|
|
|
# given with --prefix.
|
|
|
|
# This becomes the value of OPENSSLDIR in Makefile and in C.
|
|
|
|
# (Default: PREFIX/ssl)
|
1999-04-29 21:52:08 +00:00
|
|
|
#
|
2006-10-21 13:38:16 +00:00
|
|
|
# --cross-compile-prefix Add specified prefix to binutils components.
|
|
|
|
#
|
2016-01-05 04:00:33 +00:00
|
|
|
# --api One of 0.9.8, 1.0.0 or 1.1.0. Do not compile support for
|
|
|
|
# interfaces deprecated as of the specified OpenSSL version.
|
|
|
|
#
|
2000-10-26 21:07:28 +00:00
|
|
|
# no-hw-xxx do not compile support for specific crypto hardware.
|
|
|
|
# Generic OpenSSL-style methods relating to this support
|
|
|
|
# are always compiled but return NULL if the hardware
|
|
|
|
# support isn't compiled.
|
|
|
|
# no-hw do not compile support for any crypto hardware.
|
1999-04-29 16:10:09 +00:00
|
|
|
# [no-]threads [don't] try to create a library that is suitable for
|
|
|
|
# multithreaded applications (default is "threads" if we
|
|
|
|
# know how to do it)
|
2000-08-02 04:19:50 +00:00
|
|
|
# [no-]shared [don't] try to create shared libraries when supported.
|
1999-04-19 14:55:56 +00:00
|
|
|
# no-asm do not use assembler
|
2000-04-06 07:09:45 +00:00
|
|
|
# no-dso do not compile in any native shared-library methods. This
|
|
|
|
# will ensure that all methods just return NULL.
|
2016-01-13 00:02:16 +00:00
|
|
|
# no-egd do not compile support for the entropy-gathering daemon APIs
|
2001-07-12 09:11:14 +00:00
|
|
|
# [no-]zlib [don't] compile support for zlib compression.
|
|
|
|
# zlib-dynamic Like "zlib", but the zlib library is expected to be a shared
|
|
|
|
# library and will be loaded in run-time by the OpenSSL library.
|
2011-12-25 14:45:15 +00:00
|
|
|
# sctp include SCTP support
|
1999-04-19 13:54:11 +00:00
|
|
|
# 386 generate 80386 code
|
2004-07-18 16:19:34 +00:00
|
|
|
# no-sse2 disables IA-32 SSE2 code, above option implies no-sse2
|
1999-04-27 03:19:12 +00:00
|
|
|
# no-<cipher> build without specified algorithm (rsa, idea, rc5, ...)
|
2014-05-26 16:19:28 +00:00
|
|
|
# -<xxx> +<xxx> compiler options are passed through
|
2000-06-01 05:13:52 +00:00
|
|
|
#
|
|
|
|
# DEBUG_SAFESTACK use type-safe stacks to enforce type-safety on stack items
|
|
|
|
# provided to stack calls. Generates unique stack functions for
|
|
|
|
# each possible stack type.
|
1998-12-21 10:52:47 +00:00
|
|
|
# BN_LLONG use the type 'long long' in crypto/bn/bn.h
|
|
|
|
# RC4_CHAR use 'char' instead of 'int' for RC4_INT in crypto/rc4/rc4.h
|
2004-07-18 16:19:34 +00:00
|
|
|
# Following are set automatically by this script
|
|
|
|
#
|
1998-12-21 10:56:39 +00:00
|
|
|
# MD5_ASM use some extra md5 assember,
|
|
|
|
# SHA1_ASM use some extra sha1 assember, must define L_ENDIAN for x86
|
|
|
|
# RMD160_ASM use some extra ripemd160 assember,
|
2004-07-18 16:19:34 +00:00
|
|
|
# SHA256_ASM sha256_block is implemented in assembler
|
|
|
|
# SHA512_ASM sha512_block is implemented in assembler
|
|
|
|
# AES_ASM ASE_[en|de]crypt is implemented in assembler
|
1998-12-21 10:52:47 +00:00
|
|
|
|
2009-01-11 15:56:32 +00:00
|
|
|
# Minimum warning options... any contributions to OpenSSL should at least get
|
2014-05-26 16:19:28 +00:00
|
|
|
# past these.
|
2009-01-11 15:56:32 +00:00
|
|
|
|
2016-02-13 17:27:11 +00:00
|
|
|
my $gcc_devteam_warn = "-DPEDANTIC -DREF_DEBUG -DDEBUG_UNUSED"
|
|
|
|
. " -pedantic"
|
|
|
|
. " -Wall"
|
|
|
|
. " -Wno-long-long"
|
|
|
|
. " -Wsign-compare"
|
|
|
|
. " -Wmissing-prototypes"
|
|
|
|
. " -Wshadow"
|
|
|
|
. " -Wformat"
|
|
|
|
. " -Wtype-limits"
|
|
|
|
. " -Werror"
|
|
|
|
;
|
2009-01-11 15:56:32 +00:00
|
|
|
|
2015-04-19 13:10:54 +00:00
|
|
|
# These are used in addition to $gcc_devteam_warn when the compiler is clang.
|
|
|
|
# TODO(openssl-team): fix problems and investigate if (at least) the
|
2015-08-02 01:45:44 +00:00
|
|
|
# following warnings can also be enabled:
|
2016-02-13 17:27:11 +00:00
|
|
|
# -Wswitch-enum
|
|
|
|
# -Wunused-macros
|
|
|
|
# -Wcast-align
|
|
|
|
# -Wunreachable-code
|
|
|
|
# -Wlanguage-extension-token
|
|
|
|
# -Wextended-offsetof
|
|
|
|
my $clang_devteam_warn = ""
|
|
|
|
. " -Qunused-arguments"
|
|
|
|
. " -Wextra"
|
|
|
|
. " -Wno-unused-parameter"
|
|
|
|
. " -Wno-missing-field-initializers"
|
|
|
|
. " -Wno-language-extension-token"
|
|
|
|
. " -Wno-extended-offsetof"
|
|
|
|
. " -Wconditional-uninitialized"
|
|
|
|
. " -Wincompatible-pointer-types-discards-qualifiers"
|
|
|
|
. " -Wmissing-variable-declarations"
|
|
|
|
;
|
2015-01-05 12:46:26 +00:00
|
|
|
|
2016-02-14 11:16:52 +00:00
|
|
|
# This adds backtrace information to the memory leak info. Is only used
|
|
|
|
# when crypto-mdebug-backtrace is enabled.
|
|
|
|
my $memleak_devteam_backtrace = "-rdynamic";
|
2015-12-02 17:44:26 +00:00
|
|
|
|
2009-09-09 16:31:32 +00:00
|
|
|
my $strict_warnings = 0;
|
|
|
|
|
2005-01-24 14:38:14 +00:00
|
|
|
# As for $BSDthreads. Idea is to maintain "collective" set of flags,
|
2014-05-26 16:19:28 +00:00
|
|
|
# which would cover all BSD flavors. -pthread applies to them all,
|
2005-01-24 14:38:14 +00:00
|
|
|
# but is treated differently. OpenBSD expands is as -D_POSIX_THREAD
|
|
|
|
# -lc_r, which is sufficient. FreeBSD 4.x expands it as -lc_r,
|
|
|
|
# which has to be accompanied by explicit -D_THREAD_SAFE and
|
|
|
|
# sometimes -D_REENTRANT. FreeBSD 5.x expands it as -lc_r, which
|
|
|
|
# seems to be sufficient?
|
|
|
|
my $BSDthreads="-pthread -D_THREAD_SAFE -D_REENTRANT";
|
1998-12-21 10:52:47 +00:00
|
|
|
|
2016-01-05 04:00:33 +00:00
|
|
|
#
|
|
|
|
# API compability name to version number mapping.
|
|
|
|
#
|
|
|
|
my $maxapi = "1.1.0"; # API for "no-deprecated" builds
|
|
|
|
my $apitable = {
|
|
|
|
"1.1.0" => "0x10100000L",
|
|
|
|
"1.0.0" => "0x10000000L",
|
|
|
|
"0.9.8" => "0x00908000L",
|
|
|
|
};
|
|
|
|
|
2015-05-18 00:54:28 +00:00
|
|
|
my $base_target = "BASE"; # The template that all other inherit from
|
|
|
|
our %table = ();
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
our %config = ();
|
2002-02-14 15:37:38 +00:00
|
|
|
|
2015-05-18 00:57:24 +00:00
|
|
|
# Forward declarations ###############################################
|
2015-03-16 21:33:36 +00:00
|
|
|
|
2015-05-18 00:57:24 +00:00
|
|
|
# read_config(filename)
|
|
|
|
#
|
|
|
|
# Reads a configuration file and populates %table with the contents
|
|
|
|
# (which the configuration file places in %targets).
|
|
|
|
sub read_config;
|
2015-03-06 09:01:08 +00:00
|
|
|
|
2015-05-18 00:57:24 +00:00
|
|
|
# resolve_config(target)
|
|
|
|
#
|
|
|
|
# Resolves all the late evalutations, inheritances and so on for the
|
|
|
|
# chosen target and any target it inherits from.
|
|
|
|
sub resolve_config;
|
2015-03-06 09:01:08 +00:00
|
|
|
|
2009-07-01 11:46:03 +00:00
|
|
|
|
2015-05-20 18:03:20 +00:00
|
|
|
# Information collection #############################################
|
|
|
|
|
2016-01-29 18:45:51 +00:00
|
|
|
# Unified build supports separate build dir
|
2016-02-09 09:15:13 +00:00
|
|
|
my $srcdir = catdir(absolutedir(dirname($0))); # catdir ensures local syntax
|
|
|
|
my $blddir = catdir(absolutedir(".")); # catdir ensures local syntax
|
2016-01-29 18:45:51 +00:00
|
|
|
my $dofile = abs2rel(catfile($srcdir, "util/dofile.pl"));
|
|
|
|
|
|
|
|
$config{sourcedir} = abs2rel($srcdir);
|
|
|
|
$config{builddir} = abs2rel($blddir);
|
|
|
|
|
2015-05-20 18:03:20 +00:00
|
|
|
# Collect version numbers
|
|
|
|
$config{version} = "unknown";
|
|
|
|
$config{version_num} = "unknown";
|
|
|
|
$config{shlib_version_number} = "unknown";
|
|
|
|
$config{shlib_version_history} = "unknown";
|
|
|
|
|
|
|
|
collect_information(
|
2016-01-29 18:45:51 +00:00
|
|
|
collect_from_file(catfile($srcdir,'include/openssl/opensslv.h')),
|
2015-05-20 18:03:20 +00:00
|
|
|
qr/OPENSSL.VERSION.TEXT.*OpenSSL (\S+) / => sub { $config{version} = $1; },
|
|
|
|
qr/OPENSSL.VERSION.NUMBER.*(0x\S+)/ => sub { $config{version_num}=$1 },
|
|
|
|
qr/SHLIB_VERSION_NUMBER *"([^"]+)"/ => sub { $config{shlib_version_number}=$1 },
|
|
|
|
qr/SHLIB_VERSION_HISTORY *"([^"]*)"/ => sub { $config{shlib_version_history}=$1 }
|
|
|
|
);
|
|
|
|
if ($config{shlib_version_history} ne "") { $config{shlib_version_history} .= ":"; }
|
|
|
|
|
|
|
|
($config{major}, $config{minor})
|
|
|
|
= ($config{version} =~ /^([0-9]+)\.([0-9\.]+)/);
|
|
|
|
($config{shlib_major}, $config{shlib_minor})
|
|
|
|
= ($config{shlib_version_number} =~ /^([0-9]+)\.([0-9\.]+)/);
|
|
|
|
die "erroneous version information in opensslv.h: ",
|
|
|
|
"$config{major}, $config{minor}, $config{shlib_major}, $config{shlib_minor}\n"
|
|
|
|
if ($config{major} eq "" || $config{minor} eq ""
|
|
|
|
|| $config{shlib_major} eq "" || $config{shlib_minor} eq "");
|
|
|
|
|
|
|
|
# Collect target configurations
|
|
|
|
|
2016-02-02 18:47:05 +00:00
|
|
|
my $pattern = catfile(dirname($0), "Configurations", "*.conf");
|
Move Configurations* out of the way and rename them.
Configure would load the glob "Configurations*". The problem with
this is that it also loads all kinds of backups of those
configurations that some editors do, like emacs' classic
'Configurations~'. The solution is to give them an extension, such as
'.conf', and make sure to end the glob with that.
Also, because 'Configurations.conf' makes for a silly name, and
because a possibly large number of configurations will become clutter,
move them to a subdirectory 'Configurations/', and rename them to
something more expressive, as well as something that sets up some form
of sorting order. Thus:
Configurations -> Configurations/10-main.conf
Configurations.team -> Configurations/90-team.conf
Finally, make sure that Configure sorts the list of files that 'glob'
produces, and adapt Makefile.org.
Reviewed-by: Rich Salz <rsalz@openssl.org>
2015-03-11 09:22:50 +00:00
|
|
|
foreach (sort glob($pattern) ) {
|
2015-02-24 22:40:22 +00:00
|
|
|
&read_config($_);
|
|
|
|
}
|
1998-12-21 10:52:47 +00:00
|
|
|
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
|
2015-05-20 18:03:20 +00:00
|
|
|
print "Configuring OpenSSL version $config{version} (0x$config{version_num})\n";
|
|
|
|
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
$config{perl};
|
|
|
|
$config{prefix}="";
|
|
|
|
$config{openssldir}="";
|
2015-05-18 23:40:54 +00:00
|
|
|
$config{processor}="";
|
2015-05-20 18:03:20 +00:00
|
|
|
$config{libdir}="";
|
2015-12-27 01:27:30 +00:00
|
|
|
$config{cross_compile_prefix}="";
|
2015-05-20 18:03:20 +00:00
|
|
|
$config{fipslibdir}="/usr/local/ssl/fips-2.0/lib/";
|
2011-01-26 12:31:30 +00:00
|
|
|
my $nofipscanistercheck=0;
|
2015-05-20 18:03:20 +00:00
|
|
|
$config{baseaddr}="0xFB00000";
|
1999-04-29 16:10:09 +00:00
|
|
|
my $no_threads=0;
|
|
|
|
my $threads=0;
|
2016-01-25 14:48:35 +00:00
|
|
|
$config{no_shared}=0; # but "no-shared" is default
|
2005-02-22 10:29:51 +00:00
|
|
|
my $zlib=1; # but "no-zlib" is default
|
2015-07-23 16:30:06 +00:00
|
|
|
my $no_rfc3779=0;
|
1998-12-28 17:08:48 +00:00
|
|
|
my $no_asm=0;
|
2000-04-06 07:09:45 +00:00
|
|
|
my $no_dso=0;
|
2001-03-09 13:04:06 +00:00
|
|
|
my $default_ranlib;
|
2015-05-20 18:03:20 +00:00
|
|
|
$config{fips}=0;
|
|
|
|
|
|
|
|
# Top level directories to build
|
|
|
|
$config{dirs} = [ "crypto", "ssl", "engines", "apps", "test", "tools" ];
|
|
|
|
# crypto/ subdirectories to build
|
|
|
|
$config{sdirs} = [
|
|
|
|
"objects",
|
|
|
|
"md2", "md4", "md5", "sha", "mdc2", "hmac", "ripemd", "whrlpool", "poly1305",
|
|
|
|
"des", "aes", "rc2", "rc4", "rc5", "idea", "bf", "cast", "camellia", "seed", "chacha", "modes",
|
|
|
|
"bn", "ec", "rsa", "dsa", "dh", "dso", "engine",
|
|
|
|
"buffer", "bio", "stack", "lhash", "rand", "err",
|
|
|
|
"evp", "asn1", "pem", "x509", "x509v3", "conf", "txt_db", "pkcs7", "pkcs12", "comp", "ocsp", "ui",
|
2016-02-10 12:52:49 +00:00
|
|
|
"cms", "ts", "jpake", "srp", "cmac", "ct", "async", "kdf"
|
2015-05-20 18:03:20 +00:00
|
|
|
];
|
1999-04-01 12:34:33 +00:00
|
|
|
|
2016-01-18 18:10:21 +00:00
|
|
|
# Known TLS and DTLS protocols
|
|
|
|
my @tls = qw(ssl3 tls1 tls1_1 tls1_2);
|
|
|
|
my @dtls = qw(dtls1 dtls1_2);
|
|
|
|
|
2015-10-22 15:09:14 +00:00
|
|
|
# Explicitelly known options that are possible to disable. They can
|
|
|
|
# be regexps, and will be used like this: /^no-${option}$/
|
|
|
|
# For developers: keep it sorted alphabetically
|
|
|
|
|
|
|
|
my @disablables = (
|
|
|
|
"aes",
|
|
|
|
"asm",
|
2016-02-04 16:41:25 +00:00
|
|
|
"async",
|
2016-02-09 11:26:14 +00:00
|
|
|
"autoalginit",
|
2016-02-09 09:39:07 +00:00
|
|
|
"autoerrinit",
|
2015-10-22 15:09:14 +00:00
|
|
|
"bf",
|
|
|
|
"camellia",
|
|
|
|
"capieng",
|
|
|
|
"cast",
|
2015-12-09 22:02:11 +00:00
|
|
|
"chacha",
|
2015-10-22 15:09:14 +00:00
|
|
|
"cmac",
|
|
|
|
"cms",
|
|
|
|
"comp",
|
2016-01-09 22:55:57 +00:00
|
|
|
"crypto-mdebug",
|
2016-02-14 11:16:52 +00:00
|
|
|
"crypto-mdebug-backtrace",
|
2015-10-22 15:09:14 +00:00
|
|
|
"ct",
|
|
|
|
"deprecated",
|
|
|
|
"des",
|
|
|
|
"dgram",
|
|
|
|
"dh",
|
|
|
|
"dsa",
|
|
|
|
"dso",
|
2015-12-12 10:12:22 +00:00
|
|
|
"dtls",
|
2015-10-22 15:09:14 +00:00
|
|
|
"dynamic[-_]engine",
|
|
|
|
"ec",
|
|
|
|
"ec2m",
|
2016-01-18 18:10:21 +00:00
|
|
|
"ecdh",
|
|
|
|
"ecdsa",
|
2015-10-22 15:09:14 +00:00
|
|
|
"ec_nistp_64_gcc_128",
|
2016-02-03 20:08:17 +00:00
|
|
|
"egd",
|
2015-10-22 15:09:14 +00:00
|
|
|
"engine",
|
|
|
|
"err", # Really???
|
|
|
|
"heartbeats",
|
|
|
|
"hmac",
|
|
|
|
"hw(-.+)?",
|
|
|
|
"idea",
|
|
|
|
"jpake",
|
|
|
|
"locking", # Really???
|
|
|
|
"md2",
|
|
|
|
"md4",
|
|
|
|
"md5",
|
|
|
|
"mdc2",
|
|
|
|
"md[-_]ghost94",
|
|
|
|
"nextprotoneg",
|
|
|
|
"ocb",
|
|
|
|
"ocsp",
|
2015-12-09 22:02:11 +00:00
|
|
|
"poly1305",
|
2015-10-22 15:09:14 +00:00
|
|
|
"posix-io",
|
|
|
|
"psk",
|
|
|
|
"rc2",
|
|
|
|
"rc4",
|
|
|
|
"rc5",
|
|
|
|
"rdrand",
|
|
|
|
"rfc3779",
|
|
|
|
"rijndael", # Old AES name
|
|
|
|
"rmd160",
|
|
|
|
"rsa",
|
|
|
|
"scrypt",
|
|
|
|
"sct",
|
|
|
|
"sctp",
|
|
|
|
"seed",
|
|
|
|
"sha",
|
|
|
|
"shared",
|
|
|
|
"sock",
|
|
|
|
"srp",
|
|
|
|
"srtp",
|
|
|
|
"sse2",
|
|
|
|
"ssl",
|
|
|
|
"ssl-trace",
|
|
|
|
"static-engine",
|
|
|
|
"stdio",
|
|
|
|
"threads",
|
|
|
|
"tls",
|
|
|
|
"unit-test",
|
|
|
|
"whirlpool",
|
|
|
|
"zlib",
|
|
|
|
"zlib-dynamic",
|
|
|
|
);
|
2016-01-18 18:10:21 +00:00
|
|
|
foreach my $proto ((@tls, @dtls))
|
|
|
|
{
|
|
|
|
push(@disablables, $proto);
|
|
|
|
push(@disablables, "$proto-method");
|
|
|
|
}
|
2015-10-22 15:09:14 +00:00
|
|
|
|
2005-02-22 10:29:51 +00:00
|
|
|
# All of the following is disabled by default (RC5 was enabled before 0.9.8):
|
|
|
|
|
2008-12-02 01:21:39 +00:00
|
|
|
my %disabled = ( # "what" => "comment" [or special keyword "experimental"]
|
2011-10-19 09:24:22 +00:00
|
|
|
"ec_nistp_64_gcc_128" => "default",
|
2016-01-13 00:02:16 +00:00
|
|
|
"egd" => "default",
|
2011-10-19 09:24:22 +00:00
|
|
|
"jpake" => "experimental",
|
|
|
|
"md2" => "default",
|
|
|
|
"rc5" => "default",
|
2016-01-10 19:42:10 +00:00
|
|
|
"sctp" => "default",
|
2011-10-19 09:24:22 +00:00
|
|
|
"shared" => "default",
|
2012-06-15 12:46:09 +00:00
|
|
|
"ssl-trace" => "default",
|
2014-07-23 12:18:06 +00:00
|
|
|
"unit-test" => "default",
|
2011-10-19 09:24:22 +00:00
|
|
|
"zlib" => "default",
|
2016-01-10 19:42:10 +00:00
|
|
|
"crypto-mdebug" => "default",
|
2016-01-25 18:30:37 +00:00
|
|
|
"heartbeats" => "default",
|
2011-10-19 09:24:22 +00:00
|
|
|
);
|
2008-12-02 01:21:39 +00:00
|
|
|
my @experimental = ();
|
2005-02-22 10:29:51 +00:00
|
|
|
|
2015-05-18 09:03:47 +00:00
|
|
|
# Note: => pair form used for aesthetics, not to truly make a hash table
|
|
|
|
my @disable_cascades = (
|
|
|
|
# "what" => [ "cascade", ... ]
|
2015-05-18 23:40:54 +00:00
|
|
|
sub { $config{processor} eq "386" }
|
2015-05-18 09:03:47 +00:00
|
|
|
=> [ "sse2" ],
|
|
|
|
"ssl" => [ "ssl3" ],
|
|
|
|
"ssl3-method" => [ "ssl3" ],
|
|
|
|
"zlib" => [ "zlib-dynamic" ],
|
|
|
|
"rijndael" => [ "aes" ],
|
|
|
|
"des" => [ "mdc2" ],
|
2016-01-23 21:58:51 +00:00
|
|
|
"ec" => [ "ecdsa", "ecdh" ],
|
2015-12-31 16:45:00 +00:00
|
|
|
"psk" => [ "jpake" ],
|
2015-05-18 09:03:47 +00:00
|
|
|
|
|
|
|
"dgram" => [ "dtls" ],
|
|
|
|
"dtls" => [ @dtls ],
|
|
|
|
|
|
|
|
# SSL 3.0, (D)TLS 1.0 and TLS 1.1 require MD5 and SHA
|
|
|
|
"md5" => [ "ssl", "tls1", "tls1_1", "dtls1" ],
|
|
|
|
"sha" => [ "ssl", "tls1", "tls1_1", "dtls1" ],
|
|
|
|
|
|
|
|
# Additionally, SSL 3.0 requires either RSA or DSA+DH
|
|
|
|
sub { $disabled{rsa}
|
|
|
|
&& ($disabled{dsa} || $disabled{dh}); }
|
|
|
|
=> [ "ssl" ],
|
|
|
|
|
|
|
|
# (D)TLS 1.0 and TLS 1.1 also require either RSA or DSA+DH
|
|
|
|
# or ECDSA + ECDH. (D)TLS 1.2 has this requirement as well.
|
|
|
|
# (XXX: We don't support PSK-only builds).
|
|
|
|
sub { $disabled{rsa}
|
|
|
|
&& ($disabled{dsa} || $disabled{dh})
|
|
|
|
&& ($disabled{ecdsa} || $disabled{ecdh}); }
|
|
|
|
=> [ "tls1", "tls1_1", "tls1_2",
|
|
|
|
"dtls1", "dtls1_2" ],
|
|
|
|
|
|
|
|
"tls" => [ @tls ],
|
|
|
|
|
|
|
|
# SRP and HEARTBEATS require TLSEXT
|
|
|
|
"tlsext" => [ "srp", "heartbeats" ],
|
2016-02-14 11:16:52 +00:00
|
|
|
|
|
|
|
"crypto-mdebug" => [ "crypto-mdebug-backtrace" ],
|
2015-05-18 09:03:47 +00:00
|
|
|
);
|
|
|
|
|
|
|
|
# Avoid protocol support holes. Also disable all versions below N, if version
|
|
|
|
# N is disabled while N+1 is enabled.
|
|
|
|
#
|
|
|
|
my @list = (reverse @tls);
|
|
|
|
while ((my $first, my $second) = (shift @list, shift @list)) {
|
|
|
|
last unless @list;
|
|
|
|
push @disable_cascades, ( sub { !$disabled{$first} && $disabled{$second} }
|
|
|
|
=> [ @list ] );
|
|
|
|
unshift @list, $second;
|
|
|
|
}
|
|
|
|
my @list = (reverse @dtls);
|
|
|
|
while ((my $first, my $second) = (shift @list, shift @list)) {
|
|
|
|
last unless @list;
|
|
|
|
push @disable_cascades, ( sub { !$disabled{$first} && $disabled{$second} }
|
|
|
|
=> [ @list ] );
|
|
|
|
unshift @list, $second;
|
|
|
|
}
|
|
|
|
|
2016-01-30 01:17:05 +00:00
|
|
|
# Construct the string of what $config{depdefines} should look like with
|
|
|
|
# the defaults from %disabled above. (we need this to see if we should
|
|
|
|
# advise the user to run "make depend"):
|
|
|
|
my @default_depdefines =
|
|
|
|
map { my $x = $_; $x =~ tr{[a-z]-}{[A-Z]_}; "OPENSSL_NO_$x"; }
|
|
|
|
grep { $disabled{$_} !~ /\(no-depdefines\)$/ }
|
|
|
|
sort keys %disabled;
|
2008-12-02 01:21:39 +00:00
|
|
|
|
|
|
|
# Explicit "no-..." options will be collected in %disabled along with the defaults.
|
|
|
|
# To remove something from %disabled, use "enable-foo" (unless it's experimental).
|
|
|
|
# For symmetry, "disable-foo" is a synonym for "no-foo".
|
|
|
|
|
|
|
|
# For features called "experimental" here, a more explicit "experimental-foo" is needed to enable.
|
|
|
|
# We will collect such requests in @experimental.
|
|
|
|
# To avoid accidental use of experimental features, applications will have to use -DOPENSSL_EXPERIMENTAL_FOO.
|
2005-03-13 19:46:58 +00:00
|
|
|
|
2016-02-11 14:22:27 +00:00
|
|
|
my @generated_headers = (
|
|
|
|
"include/openssl/opensslconf.h",
|
|
|
|
"crypto/include/internal/bn_conf.h"
|
|
|
|
);
|
|
|
|
|
|
|
|
my @generated_by_make_headers = (
|
|
|
|
"crypto/buildinf.h"
|
|
|
|
);
|
|
|
|
|
2005-03-13 19:46:58 +00:00
|
|
|
|
2004-07-18 16:19:34 +00:00
|
|
|
my $no_sse2=0;
|
2001-11-27 11:48:30 +00:00
|
|
|
|
1999-04-24 22:59:36 +00:00
|
|
|
&usage if ($#ARGV < 0);
|
1998-12-21 10:52:47 +00:00
|
|
|
|
2016-01-30 01:17:05 +00:00
|
|
|
my $user_cflags="";
|
|
|
|
my @user_defines=();
|
2016-01-30 02:31:52 +00:00
|
|
|
my $unified = 0;
|
2016-01-30 01:17:05 +00:00
|
|
|
$config{depdefines}=[];
|
2015-05-18 23:40:54 +00:00
|
|
|
$config{openssl_experimental_defines}=[];
|
|
|
|
$config{openssl_api_defines}=[];
|
|
|
|
$config{openssl_algorithm_defines}=[];
|
|
|
|
$config{openssl_thread_defines}=[];
|
|
|
|
$config{openssl_sys_defines}=[];
|
|
|
|
$config{openssl_other_defines}=[];
|
2015-05-18 01:33:55 +00:00
|
|
|
my $libs="";
|
|
|
|
my $target="";
|
2016-01-11 23:17:12 +00:00
|
|
|
$config{options}="";
|
2000-11-30 22:53:34 +00:00
|
|
|
my %withargs=();
|
2015-03-17 15:30:54 +00:00
|
|
|
my $build_prefix = "release_";
|
2000-08-17 10:23:45 +00:00
|
|
|
|
|
|
|
my @argvcopy=@ARGV;
|
|
|
|
|
2015-05-18 01:33:55 +00:00
|
|
|
if (grep /^reconf(igure)?$/, @argvcopy) {
|
2015-12-27 01:27:30 +00:00
|
|
|
if (-f "./configdata.pm") {
|
|
|
|
my $file = "./configdata.pm";
|
|
|
|
unless (my $return = do $file) {
|
|
|
|
die "couldn't parse $file: $@" if $@;
|
|
|
|
die "couldn't do $file: $!" unless defined $return;
|
|
|
|
die "couldn't run $file" unless $return;
|
2015-05-18 01:33:55 +00:00
|
|
|
}
|
2015-12-27 01:27:30 +00:00
|
|
|
|
|
|
|
@argvcopy = defined($configdata::config{perlargv}) ?
|
|
|
|
@{$configdata::config{perlargv}} : ();
|
|
|
|
die "Incorrect data to reconfigure, please do a normal configuration\n"
|
|
|
|
if (grep(/^reconf/,@argvcopy));
|
|
|
|
$ENV{CROSS_COMPILE} = $configdata::config{cross_compile_prefix}
|
|
|
|
if defined($configdata::config{cross_compile_prefix});
|
|
|
|
$ENV{CROSS_COMPILE} = $configdata::config{cc}
|
|
|
|
if defined($configdata::config{cc});
|
|
|
|
|
2015-05-18 01:33:55 +00:00
|
|
|
print "Reconfiguring with: ", join(" ",@argvcopy), "\n";
|
|
|
|
print " CROSS_COMPILE = ",$ENV{CROSS_COMPILE},"\n"
|
|
|
|
if $ENV{CROSS_COMPILE};
|
|
|
|
print " CC = ",$ENV{CC},"\n" if $ENV{CC};
|
2015-12-27 01:27:30 +00:00
|
|
|
} elsif (open IN, "<Makefile") {
|
|
|
|
#
|
|
|
|
# THIS SECTION IS TEMPORARY, it helps transitioning from Makefile
|
|
|
|
# centered information gathering the reading configdata.pm
|
|
|
|
#
|
|
|
|
while (<IN>) {
|
2016-02-12 11:10:27 +00:00
|
|
|
s|\R$||;
|
2015-12-27 01:27:30 +00:00
|
|
|
if (/^CONFIGURE_ARGS=\s*(.*)\s*/) {
|
|
|
|
# Older form, we split the string and hope for the best
|
|
|
|
@argvcopy = split /\s+/, $_;
|
|
|
|
die "Incorrect data to reconfigure, please do a normal configuration\n"
|
|
|
|
if (grep(/^reconf/,@argvcopy));
|
|
|
|
} elsif (/^CROSS_COMPILE=\s*(.*)/) {
|
|
|
|
$ENV{CROSS_COMPILE}=$1;
|
|
|
|
} elsif (/^CC=\s*(?:\$\(CROSS_COMPILE\))?(.*?)$/) {
|
|
|
|
$ENV{CC}=$1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#
|
|
|
|
# END OF TEMPORARY SECTION
|
|
|
|
#
|
2015-05-18 01:33:55 +00:00
|
|
|
} else {
|
|
|
|
die "Insufficient data to reconfigure, please do a normal configuration\n";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-12-27 01:27:30 +00:00
|
|
|
$config{perlargv} = [ @argvcopy ];
|
2015-05-18 01:33:55 +00:00
|
|
|
|
|
|
|
my %unsupported_options = ();
|
|
|
|
foreach (@argvcopy)
|
2015-12-02 17:54:15 +00:00
|
|
|
{
|
2015-05-18 01:33:55 +00:00
|
|
|
s /^-no-/no-/; # some people just can't read the instructions
|
2005-02-22 10:29:51 +00:00
|
|
|
|
2015-05-18 01:33:55 +00:00
|
|
|
# rewrite some options in "enable-..." form
|
|
|
|
s /^-?-?shared$/enable-shared/;
|
|
|
|
s /^sctp$/enable-sctp/;
|
|
|
|
s /^threads$/enable-threads/;
|
|
|
|
s /^zlib$/enable-zlib/;
|
|
|
|
s /^zlib-dynamic$/enable-zlib-dynamic/;
|
2005-02-22 10:29:51 +00:00
|
|
|
|
2015-05-18 01:33:55 +00:00
|
|
|
if (/^(no|disable|enable|experimental)-(.+)$/)
|
|
|
|
{
|
|
|
|
my $word = $2;
|
|
|
|
if (!grep { $word =~ /^${_}$/ } @disablables)
|
2015-10-22 15:09:14 +00:00
|
|
|
{
|
2015-05-18 01:33:55 +00:00
|
|
|
$unsupported_options{$_} = 1;
|
|
|
|
next;
|
2015-10-22 15:09:14 +00:00
|
|
|
}
|
2015-05-18 01:33:55 +00:00
|
|
|
}
|
|
|
|
if (/^no-(.+)$/ || /^disable-(.+)$/)
|
|
|
|
{
|
|
|
|
if (!($disabled{$1} eq "experimental"))
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
2015-05-18 01:33:55 +00:00
|
|
|
foreach my $proto ((@tls, @dtls))
|
2002-08-09 08:43:04 +00:00
|
|
|
{
|
2015-05-18 01:33:55 +00:00
|
|
|
if ($1 eq "$proto-method")
|
2014-10-29 12:51:31 +00:00
|
|
|
{
|
2015-05-18 01:33:55 +00:00
|
|
|
$disabled{"$proto"} = "option($proto-method)";
|
|
|
|
last;
|
2014-10-29 12:51:31 +00:00
|
|
|
}
|
2015-05-18 01:33:55 +00:00
|
|
|
}
|
|
|
|
if ($1 eq "dtls")
|
|
|
|
{
|
|
|
|
foreach my $proto (@dtls)
|
2016-01-18 18:10:21 +00:00
|
|
|
{
|
2015-05-18 01:33:55 +00:00
|
|
|
$disabled{$proto} = "option(dtls)";
|
2016-01-18 18:10:21 +00:00
|
|
|
}
|
2015-05-18 01:33:55 +00:00
|
|
|
}
|
|
|
|
elsif ($1 eq "ssl")
|
|
|
|
{
|
|
|
|
# Last one of its kind
|
|
|
|
$disabled{"ssl3"} = "option(ssl)";
|
|
|
|
}
|
|
|
|
elsif ($1 eq "tls")
|
|
|
|
{
|
|
|
|
# XXX: Tests will fail if all SSL/TLS
|
|
|
|
# protocols are disabled.
|
|
|
|
foreach my $proto (@tls)
|
2008-12-02 01:21:39 +00:00
|
|
|
{
|
2015-05-18 01:33:55 +00:00
|
|
|
$disabled{$proto} = "option(tls)";
|
2008-12-02 01:21:39 +00:00
|
|
|
}
|
2014-05-26 16:19:28 +00:00
|
|
|
}
|
2015-05-18 01:33:55 +00:00
|
|
|
else
|
2001-11-27 11:48:30 +00:00
|
|
|
{
|
2015-05-18 01:33:55 +00:00
|
|
|
$disabled{$1} = "option";
|
2001-11-27 11:48:30 +00:00
|
|
|
}
|
2015-05-18 01:33:55 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
elsif (/^enable-(.+)$/ || /^experimental-(.+)$/)
|
|
|
|
{
|
|
|
|
my $algo = $1;
|
|
|
|
if ($disabled{$algo} eq "experimental")
|
|
|
|
{
|
|
|
|
die "You are requesting an experimental feature; please say 'experimental-$algo' if you are sure\n"
|
|
|
|
unless (/^experimental-/);
|
|
|
|
push @experimental, $algo;
|
|
|
|
}
|
|
|
|
delete $disabled{$algo};
|
2005-02-22 10:29:51 +00:00
|
|
|
|
2015-05-18 01:33:55 +00:00
|
|
|
$threads = 1 if ($algo eq "threads");
|
|
|
|
}
|
|
|
|
elsif (/^--strict-warnings$/)
|
|
|
|
{
|
|
|
|
$strict_warnings = 1;
|
|
|
|
}
|
|
|
|
elsif (/^--debug$/)
|
|
|
|
{
|
|
|
|
$build_prefix = "debug_";
|
|
|
|
}
|
|
|
|
elsif (/^--release$/)
|
|
|
|
{
|
|
|
|
$build_prefix = "release_";
|
|
|
|
}
|
|
|
|
elsif (/^386$/)
|
2015-05-18 23:40:54 +00:00
|
|
|
{ $config{processor}=386; }
|
2015-05-18 01:33:55 +00:00
|
|
|
elsif (/^fips$/)
|
|
|
|
{
|
2015-05-20 18:03:20 +00:00
|
|
|
$config{fips}=1;
|
2015-05-18 01:33:55 +00:00
|
|
|
}
|
|
|
|
elsif (/^rsaref$/)
|
|
|
|
{
|
|
|
|
# No RSAref support any more since it's not needed.
|
|
|
|
# The check for the option is there so scripts aren't
|
|
|
|
# broken
|
|
|
|
}
|
|
|
|
elsif (/^nofipscanistercheck$/)
|
|
|
|
{
|
2015-05-20 18:03:20 +00:00
|
|
|
$config{fips} = 1;
|
2015-05-18 01:33:55 +00:00
|
|
|
$nofipscanistercheck = 1;
|
|
|
|
}
|
|
|
|
elsif (/^[-+]/)
|
|
|
|
{
|
2016-01-30 02:31:52 +00:00
|
|
|
if (/^--unified$/)
|
|
|
|
{
|
|
|
|
$unified=1;
|
|
|
|
}
|
|
|
|
elsif (/^--prefix=(.*)$/)
|
2015-05-18 01:33:55 +00:00
|
|
|
{
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
$config{prefix}=$1;
|
2016-01-30 01:57:19 +00:00
|
|
|
die "Directory given with --prefix MUST be absolute\n"
|
|
|
|
unless file_name_is_absolute($config{prefix});
|
2005-02-22 10:29:51 +00:00
|
|
|
}
|
2015-05-18 01:33:55 +00:00
|
|
|
elsif (/^--api=(.*)$/)
|
2009-09-09 16:31:32 +00:00
|
|
|
{
|
2015-05-20 18:03:20 +00:00
|
|
|
$config{api}=$1;
|
2009-09-09 16:31:32 +00:00
|
|
|
}
|
2015-05-18 01:33:55 +00:00
|
|
|
elsif (/^--libdir=(.*)$/)
|
2015-03-17 15:30:54 +00:00
|
|
|
{
|
2015-05-20 18:03:20 +00:00
|
|
|
$config{libdir}=$1;
|
2015-03-17 15:30:54 +00:00
|
|
|
}
|
2015-05-18 01:33:55 +00:00
|
|
|
elsif (/^--openssldir=(.*)$/)
|
2015-03-17 15:30:54 +00:00
|
|
|
{
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
$config{openssldir}=$1;
|
2015-03-17 15:30:54 +00:00
|
|
|
}
|
2015-05-18 01:33:55 +00:00
|
|
|
elsif (/^--with-zlib-lib=(.*)$/)
|
2011-01-30 00:01:09 +00:00
|
|
|
{
|
2016-02-03 16:31:40 +00:00
|
|
|
$withargs{zlib_lib}=$1;
|
2011-10-19 09:24:22 +00:00
|
|
|
}
|
2015-05-18 01:33:55 +00:00
|
|
|
elsif (/^--with-zlib-include=(.*)$/)
|
1999-03-06 14:35:03 +00:00
|
|
|
{
|
2016-02-03 16:31:40 +00:00
|
|
|
$withargs{zlib_include}="-I$1";
|
1999-04-24 22:59:36 +00:00
|
|
|
}
|
2015-05-18 01:33:55 +00:00
|
|
|
elsif (/^--with-fipslibdir=(.*)$/)
|
2011-01-26 12:31:30 +00:00
|
|
|
{
|
2015-05-20 18:03:20 +00:00
|
|
|
$config{fipslibdir}="$1/";
|
2011-01-26 12:31:30 +00:00
|
|
|
}
|
2015-05-18 01:33:55 +00:00
|
|
|
elsif (/^--with-baseaddr=(.*)$/)
|
1999-04-24 22:59:36 +00:00
|
|
|
{
|
2015-05-20 18:03:20 +00:00
|
|
|
$config{baseaddr}="$1";
|
1999-03-06 14:35:03 +00:00
|
|
|
}
|
2015-05-18 01:33:55 +00:00
|
|
|
elsif (/^--cross-compile-prefix=(.*)$/)
|
1999-04-29 21:52:08 +00:00
|
|
|
{
|
2015-12-27 01:27:30 +00:00
|
|
|
$config{cross_compile_prefix}=$1;
|
1999-04-29 21:52:08 +00:00
|
|
|
}
|
2015-05-18 01:33:55 +00:00
|
|
|
elsif (/^--config=(.*)$/)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
2015-05-18 01:33:55 +00:00
|
|
|
read_config $1;
|
2000-08-17 10:23:45 +00:00
|
|
|
}
|
2015-05-18 01:33:55 +00:00
|
|
|
elsif (/^-[lL](.*)$/ or /^-Wl,/)
|
2005-02-22 10:29:51 +00:00
|
|
|
{
|
2015-05-18 01:33:55 +00:00
|
|
|
$libs.=$_." ";
|
1998-12-21 10:52:47 +00:00
|
|
|
}
|
2016-01-30 01:17:05 +00:00
|
|
|
elsif (/^-D(.*)$/)
|
|
|
|
{
|
|
|
|
push @user_defines, $1;
|
|
|
|
}
|
2015-05-18 01:33:55 +00:00
|
|
|
else # common if (/^[-+]/), just pass down...
|
|
|
|
{
|
|
|
|
$_ =~ s/%([0-9a-f]{1,2})/chr(hex($1))/gei;
|
2016-02-12 19:40:33 +00:00
|
|
|
$user_cflags.=" ".$_;
|
2015-05-18 01:33:55 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
elsif ($_ =~ /^([^:]+):(.+)$/)
|
|
|
|
{
|
|
|
|
eval "\$table{\$1} = \"$2\""; # allow $xxx constructs in the string
|
|
|
|
$target=$1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
die "target already defined - $target (offending arg: $_)\n" if ($target ne "");
|
|
|
|
$target=$_;
|
|
|
|
}
|
|
|
|
unless ($_ eq $target || /^no-/ || /^disable-/)
|
|
|
|
{
|
|
|
|
# "no-..." follows later after implied disactivations
|
|
|
|
# have been derived. (Don't take this too seroiusly,
|
|
|
|
# we really only write OPTIONS to the Makefile out of
|
|
|
|
# nostalgia.)
|
|
|
|
|
2016-01-11 23:17:12 +00:00
|
|
|
if ($config{options} eq "")
|
|
|
|
{ $config{options} = $_; }
|
2015-05-18 01:33:55 +00:00
|
|
|
else
|
2016-01-11 23:17:12 +00:00
|
|
|
{ $config{options} .= " ".$_; }
|
1999-07-09 12:00:34 +00:00
|
|
|
}
|
2015-10-22 15:33:47 +00:00
|
|
|
|
2015-05-20 18:03:20 +00:00
|
|
|
if (defined($config{api}) && !exists $apitable->{$config{api}}) {
|
|
|
|
die "***** Unsupported api compatibility level: $config{api}\n",
|
2016-01-05 04:00:33 +00:00
|
|
|
}
|
|
|
|
|
2015-10-22 15:33:47 +00:00
|
|
|
if (keys %unsupported_options)
|
|
|
|
{
|
|
|
|
die "***** Unsupported options: ",
|
|
|
|
join(", ", keys %unsupported_options), "\n";
|
|
|
|
}
|
1999-07-09 12:00:34 +00:00
|
|
|
}
|
2001-11-27 11:48:30 +00:00
|
|
|
|
2015-05-20 18:03:20 +00:00
|
|
|
if ($config{fips})
|
2015-12-16 13:25:07 +00:00
|
|
|
{
|
2015-05-18 09:03:47 +00:00
|
|
|
delete $disabled{"shared"} if ($disabled{"shared"} =~ /^default/);
|
2016-01-18 18:10:21 +00:00
|
|
|
}
|
2015-05-20 18:03:20 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
@{$config{dirs}} = grep !/^fips$/, @{$config{dirs}};
|
|
|
|
}
|
2005-02-22 10:29:51 +00:00
|
|
|
|
2015-05-18 09:03:47 +00:00
|
|
|
my @tocheckfor = (keys %disabled);
|
|
|
|
while (@tocheckfor) {
|
|
|
|
my %new_tocheckfor = ();
|
|
|
|
my @cascade_copy = (@disable_cascades);
|
|
|
|
while (@cascade_copy) {
|
|
|
|
my ($test, $descendents) = (shift @cascade_copy, shift @cascade_copy);
|
|
|
|
if (ref($test) eq "CODE" ? $test->() : defined($disabled{$test})) {
|
|
|
|
map {
|
|
|
|
$new_tocheckfor{$_} => 1; $disabled{$_} = "forced";
|
|
|
|
} grep { !defined($disabled{$_}) } @$descendents;
|
2009-04-23 16:32:42 +00:00
|
|
|
}
|
2015-05-18 09:03:47 +00:00
|
|
|
}
|
|
|
|
@tocheckfor = (keys %new_tocheckfor);
|
|
|
|
}
|
2011-03-12 17:01:19 +00:00
|
|
|
|
1999-05-28 23:18:51 +00:00
|
|
|
if ($target eq "TABLE") {
|
2015-05-18 10:53:38 +00:00
|
|
|
foreach (sort keys %table) {
|
|
|
|
print_table_entry($_, "TABLE");
|
|
|
|
}
|
|
|
|
exit 0;
|
1999-05-28 23:18:51 +00:00
|
|
|
}
|
|
|
|
|
2000-02-21 00:55:45 +00:00
|
|
|
if ($target eq "LIST") {
|
2015-05-18 10:53:38 +00:00
|
|
|
foreach (sort keys %table) {
|
|
|
|
print $_,"\n" unless $table{$_}->{template};
|
|
|
|
}
|
|
|
|
exit 0;
|
2000-02-21 00:55:45 +00:00
|
|
|
}
|
|
|
|
|
2015-03-06 01:00:21 +00:00
|
|
|
if ($target eq "HASH") {
|
2015-05-18 10:53:38 +00:00
|
|
|
print "%table = (\n";
|
|
|
|
foreach (sort keys %table) {
|
|
|
|
print_table_entry($_, "HASH");
|
|
|
|
}
|
|
|
|
exit 0;
|
2015-03-06 01:00:21 +00:00
|
|
|
}
|
|
|
|
|
2015-05-18 10:53:38 +00:00
|
|
|
# Backward compatibility?
|
2002-02-14 12:28:24 +00:00
|
|
|
if ($target =~ m/^CygWin32(-.*)$/) {
|
2015-05-18 10:53:38 +00:00
|
|
|
$target = "Cygwin".$1;
|
2002-02-14 12:28:24 +00:00
|
|
|
}
|
|
|
|
|
2005-02-22 10:29:51 +00:00
|
|
|
foreach (sort (keys %disabled))
|
|
|
|
{
|
2016-01-11 23:17:12 +00:00
|
|
|
$config{options} .= " no-$_";
|
2005-02-22 10:29:51 +00:00
|
|
|
|
|
|
|
printf " no-%-12s %-10s", $_, "[$disabled{$_}]";
|
|
|
|
|
|
|
|
if (/^dso$/)
|
|
|
|
{ $no_dso = 1; }
|
|
|
|
elsif (/^threads$/)
|
|
|
|
{ $no_threads = 1; }
|
|
|
|
elsif (/^shared$/)
|
2016-01-25 14:48:35 +00:00
|
|
|
{ $config{no_shared} = 1; }
|
2005-02-22 10:29:51 +00:00
|
|
|
elsif (/^zlib$/)
|
|
|
|
{ $zlib = 0; }
|
2005-11-06 17:58:26 +00:00
|
|
|
elsif (/^static-engine$/)
|
|
|
|
{ }
|
2005-02-22 10:29:51 +00:00
|
|
|
elsif (/^zlib-dynamic$/)
|
|
|
|
{ }
|
|
|
|
elsif (/^sse2$/)
|
|
|
|
{ $no_sse2 = 1; }
|
2015-05-20 18:03:20 +00:00
|
|
|
elsif (/^engine$/)
|
|
|
|
{ @{$config{dirs}} = grep !/^engine$/, @{$config{dirs}}; }
|
2005-02-22 10:29:51 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
my ($ALGO, $algo);
|
2011-03-25 09:29:46 +00:00
|
|
|
($ALGO = $algo = $_) =~ tr/[\-a-z]/[_A-Z]/;
|
2005-02-22 10:29:51 +00:00
|
|
|
|
2016-02-09 11:26:14 +00:00
|
|
|
if (/^asm$/ || /^err$/ || /^hw$/ || /^hw-/ || /^async$/
|
2016-02-09 09:39:07 +00:00
|
|
|
|| /^autoalginit/ || /^autoerrinit/)
|
2005-02-22 10:29:51 +00:00
|
|
|
{
|
2015-05-18 23:40:54 +00:00
|
|
|
push @{$config{openssl_other_defines}}, "OPENSSL_NO_$ALGO";
|
2005-02-22 10:29:51 +00:00
|
|
|
print " OPENSSL_NO_$ALGO";
|
2014-05-26 16:19:28 +00:00
|
|
|
|
2016-01-30 01:17:05 +00:00
|
|
|
if (/^err$/) { push @user_defines, "OPENSSL_NO_ERR"; }
|
2005-06-22 23:44:44 +00:00
|
|
|
elsif (/^asm$/) { $no_asm = 1; }
|
2005-02-22 10:29:51 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2015-01-24 15:46:54 +00:00
|
|
|
($ALGO,$algo) = ("RMD160","rmd160") if ($algo eq "ripemd");
|
|
|
|
|
2015-05-18 23:40:54 +00:00
|
|
|
push @{$config{openssl_algorithm_defines}}, "OPENSSL_NO_$ALGO";
|
2016-01-30 01:17:05 +00:00
|
|
|
push @{$config{depdefines}}, "OPENSSL_NO_$ALGO";
|
2005-02-22 10:29:51 +00:00
|
|
|
print " OPENSSL_NO_$ALGO";
|
|
|
|
|
2015-05-12 11:14:13 +00:00
|
|
|
# fix-up crypto/directory name(s)
|
2015-05-20 18:03:20 +00:00
|
|
|
$algo="whrlpool" if $algo eq "whirlpool";
|
|
|
|
$algo="ripemd" if $algo eq "rmd160";
|
|
|
|
@{$config{sdirs}} = grep { $_ ne $algo} @{$config{sdirs}};
|
2015-01-24 15:46:54 +00:00
|
|
|
|
2015-05-12 11:14:13 +00:00
|
|
|
print " (skip dir)";
|
2005-02-22 10:29:51 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
print "\n";
|
|
|
|
}
|
|
|
|
|
2008-12-02 01:21:39 +00:00
|
|
|
foreach (sort @experimental)
|
|
|
|
{
|
|
|
|
my $ALGO;
|
|
|
|
($ALGO = $_) =~ tr/[a-z]/[A-Z]/;
|
|
|
|
|
|
|
|
# opensslconf.h will set OPENSSL_NO_... unless OPENSSL_EXPERIMENTAL_... is defined
|
2015-05-18 23:40:54 +00:00
|
|
|
push @{$config{openssl_experimental_defines}}, "OPENSSL_NO_$ALGO";
|
2008-12-02 01:21:39 +00:00
|
|
|
}
|
2005-02-22 10:29:51 +00:00
|
|
|
|
2015-05-18 00:54:28 +00:00
|
|
|
print "Configuring for $target\n";
|
|
|
|
|
|
|
|
# Support for legacy targets having a name starting with 'debug-'
|
|
|
|
my ($d, $t) = $target =~ m/^(debug-)?(.*)$/;
|
|
|
|
if ($d) {
|
|
|
|
$build_prefix = "debug_";
|
|
|
|
|
|
|
|
# If we do not find debug-foo in the table, the target is set to foo.
|
|
|
|
if (!$table{$target}) {
|
|
|
|
$target = $t;
|
|
|
|
}
|
|
|
|
}
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
$config{target} = $target;
|
2015-05-18 00:54:28 +00:00
|
|
|
delete $table{$base_target}->{template}; # or the next test will fail.
|
|
|
|
my %target = ( %{$table{$base_target}}, resolve_config($target) );
|
|
|
|
|
|
|
|
&usage if (!%target || $target{template});
|
|
|
|
|
2015-05-20 18:03:20 +00:00
|
|
|
$target{exe_extension}="";
|
|
|
|
$target{exe_extension}=".exe" if ($config{target} eq "Cygwin" || $config{target} eq "DJGPP" || $config{target} =~ /^mingw/);
|
|
|
|
$target{exe_extension}=".nlm" if ($config{target} =~ /netware/);
|
|
|
|
$target{exe_extension}=".pm" if ($config{target} =~ /vos/);
|
1999-04-24 22:59:36 +00:00
|
|
|
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
$default_ranlib = which("ranlib") || "true";
|
|
|
|
$config{perl} = $ENV{'PERL'} || which("perl5") || which("perl") || "perl";
|
|
|
|
my $make = $ENV{'MAKE'} || "make";
|
2004-06-28 22:01:37 +00:00
|
|
|
|
2015-12-27 01:27:30 +00:00
|
|
|
$config{cross_compile_prefix} = $ENV{'CROSS_COMPILE'}
|
|
|
|
if $config{cross_compile_prefix} eq "";
|
2009-10-07 16:41:14 +00:00
|
|
|
|
2009-01-18 12:06:37 +00:00
|
|
|
# Allow environment CC to override compiler...
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
$target{cc} = $ENV{CC} || $target{cc};
|
2015-03-06 01:00:21 +00:00
|
|
|
|
2016-01-30 01:17:05 +00:00
|
|
|
# For cflags, lflags, plib_lflags, ex_libs and defines, add the debug_
|
|
|
|
# or release_ attributes.
|
2015-03-06 01:00:21 +00:00
|
|
|
# Do it in such a way that no spurious space is appended (hence the grep).
|
2016-01-30 01:17:05 +00:00
|
|
|
$config{defines} = [ @{$target{defines}},
|
|
|
|
@{$target{$build_prefix."defines"}} ];
|
2015-05-20 18:03:20 +00:00
|
|
|
$config{cflags} = join(" ",
|
|
|
|
grep { $_ ne "" } ($target{cflags},
|
|
|
|
$target{$build_prefix."cflags"}));
|
|
|
|
$config{lflags} = join(" ",
|
|
|
|
grep { $_ ne "" } ($target{lflags},
|
|
|
|
$target{$build_prefix."lflags"}));
|
Enhance and clear the support of linker flags
Some time ago, we had a ex_libs configuration setting that could be
divided into lflags and ex_libs. These got divided in two settings,
lflags and ex_libs, and the former was interpreted to be general
linking flags.
Unfortunately, that conclusion wasn't entirely accurate. Most of
those linking were meant to end up in a very precise position on the
linking command line, just before the spec of libraries the linking
depends on.
Back to the drawing board, we're diving things further, now having
lflags, which are linking flags that aren't depending on command line
position, plib_lflags, which are linking flags that should show up just
before the spec of libraries to depend on, and finally ex_libs, which
is the spec of extra libraries to depend on.
Also, documentation is changed in Configurations/README. This was
previously forgotten.
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
2016-02-05 10:47:14 +00:00
|
|
|
$config{plib_lflags} = join(" ",
|
|
|
|
grep { $_ ne "" } ($target{plib_lflags},
|
|
|
|
$target{$build_prefix."plib_lflags"}));
|
2016-01-29 17:07:37 +00:00
|
|
|
$config{ex_libs} = join(" ",
|
|
|
|
grep { $_ ne "" } ($target{ex_libs},
|
|
|
|
$target{$build_prefix."ex_libs"}));
|
2015-05-18 00:57:24 +00:00
|
|
|
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
$target{ranlib} = $ENV{'RANLIB'} || $target{ranlib} || $default_ranlib;
|
|
|
|
$target{ar} = $ENV{'AR'} || "ar";
|
2015-05-20 18:03:20 +00:00
|
|
|
$target{arflags} = "" if !defined($target{arflags});
|
|
|
|
$target{nm} = "nm";
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
# Make sure build_scheme is consistent.
|
|
|
|
$target{build_scheme} = [ $target{build_scheme} ]
|
|
|
|
if ref($target{build_scheme}) ne "ARRAY";
|
|
|
|
|
2016-01-30 02:31:52 +00:00
|
|
|
###### TO BE REMOVED BEFORE FINAL RELEASE
|
|
|
|
######
|
|
|
|
###### If the user has chosen --unified, we give it to them.
|
|
|
|
if ($target{build_file} eq "Makefile"
|
|
|
|
&& $target{build_scheme}->[0] eq "unixmake"
|
|
|
|
&& $unified) {
|
|
|
|
$target{build_scheme} = [ "unified", "unix" ];
|
|
|
|
}
|
|
|
|
|
2016-01-29 23:57:33 +00:00
|
|
|
my ($builder, $builder_platform, @builder_opts) =
|
|
|
|
@{$target{build_scheme}};
|
|
|
|
|
2016-01-30 01:17:05 +00:00
|
|
|
push @{$config{defines}},
|
|
|
|
map { (my $x = $_) =~ s/^OPENSSL_NO_/OPENSSL_EXPERIMENTAL_/; $x }
|
|
|
|
@{$config{openssl_experimental_defines}};
|
2008-12-02 01:21:39 +00:00
|
|
|
|
2016-02-05 14:14:45 +00:00
|
|
|
if ($target =~ /^mingw/ && `$target{cc} --target-help 2>&1` =~ m/-mno-cygwin/m)
|
2010-11-30 22:18:02 +00:00
|
|
|
{
|
2016-02-05 14:14:45 +00:00
|
|
|
$config{cflags} .= " -mno-cygwin";
|
|
|
|
$target{shared_ldflag} .= " -mno-cygwin";
|
2010-11-30 22:18:02 +00:00
|
|
|
}
|
|
|
|
|
2016-01-30 01:17:05 +00:00
|
|
|
if ($target =~ /linux.*-mips/ && !$no_asm && $user_cflags !~ /-m(ips|arch=)/) {
|
2012-09-15 11:21:50 +00:00
|
|
|
# minimally required architecture flags for assembly modules
|
2015-05-20 18:03:20 +00:00
|
|
|
$config{cflags}="-mips2 $config{cflags}" if ($target =~ /mips32/);
|
|
|
|
$config{cflags}="-mips3 $config{cflags}" if ($target =~ /mips64/);
|
2012-09-15 11:21:50 +00:00
|
|
|
}
|
|
|
|
|
2003-01-11 11:40:39 +00:00
|
|
|
my $no_shared_warn=0;
|
2005-01-24 15:58:25 +00:00
|
|
|
my $no_user_cflags=0;
|
2016-01-30 01:17:05 +00:00
|
|
|
my $no_user_defines=0;
|
2003-01-11 11:40:39 +00:00
|
|
|
|
2000-04-06 07:09:45 +00:00
|
|
|
# The DSO code currently always implements all functions so that no
|
|
|
|
# applications will have to worry about that from a compilation point
|
|
|
|
# of view. However, the "method"s may return zero unless that platform
|
|
|
|
# has support compiled in for them. Currently each method is enabled
|
|
|
|
# by a define "DSO_<name>" ... we translate the "dso_scheme" config
|
|
|
|
# string entry into using the following logic;
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
if (!$no_dso && $target{dso_scheme} ne "")
|
2000-04-06 07:09:45 +00:00
|
|
|
{
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
$target{dso_scheme} =~ tr/[a-z]/[A-Z]/;
|
|
|
|
if ($target{dso_scheme} eq "DLFCN")
|
2000-04-06 07:09:45 +00:00
|
|
|
{
|
2016-01-30 01:17:05 +00:00
|
|
|
$config{defines} = [ "DSO_DLFCN", "HAVE_DLFCN_H",
|
|
|
|
@{$config{defines}} ]
|
2000-04-06 07:09:45 +00:00
|
|
|
}
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
elsif ($target{dso_scheme} eq "DLFCN_NO_H")
|
2000-04-06 07:09:45 +00:00
|
|
|
{
|
2016-01-30 01:17:05 +00:00
|
|
|
$config{defines} = [ "DSO_DLFCN", @{$config{defines}} ]
|
2000-04-06 07:09:45 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2016-01-30 01:17:05 +00:00
|
|
|
$config{defines} = [ "DSO_$target{dso_scheme}",
|
|
|
|
@{$config{defines}} ]
|
2000-04-06 07:09:45 +00:00
|
|
|
}
|
|
|
|
}
|
2000-04-04 22:32:19 +00:00
|
|
|
|
2016-01-29 21:30:00 +00:00
|
|
|
my $thread_cflags = "";
|
2015-05-18 23:40:54 +00:00
|
|
|
my @thread_defines;
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
if ($target{thread_cflag} ne "(unknown)" && !$no_threads)
|
1999-04-29 16:10:09 +00:00
|
|
|
{
|
|
|
|
# If we know how to do it, support threads by default.
|
|
|
|
$threads = 1;
|
|
|
|
}
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
if ($target{thread_cflag} eq "(unknown)" && $threads)
|
1999-04-29 16:10:09 +00:00
|
|
|
{
|
2005-01-24 15:58:25 +00:00
|
|
|
# If the user asked for "threads", [s]he is also expected to
|
|
|
|
# provide any system-dependent compiler options that are
|
|
|
|
# necessary.
|
2016-01-30 01:17:05 +00:00
|
|
|
if ($no_user_cflags && $no_user_defines)
|
2005-01-24 15:58:25 +00:00
|
|
|
{
|
|
|
|
print "You asked for multi-threading support, but didn't\n";
|
|
|
|
print "provide any system-specific compiler options\n";
|
|
|
|
exit(1);
|
|
|
|
}
|
2015-05-18 23:40:54 +00:00
|
|
|
push @thread_defines, "OPENSSL_THREADS";
|
1999-04-29 16:10:09 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2016-01-30 01:17:05 +00:00
|
|
|
$thread_cflags=" $target{thread_cflag}";
|
|
|
|
push @thread_defines, @{$target{thread_defines}}, "OPENSSL_THREADS";
|
2014-05-26 16:19:28 +00:00
|
|
|
}
|
1999-04-29 16:10:09 +00:00
|
|
|
|
2016-01-29 17:07:37 +00:00
|
|
|
$config{ex_libs}="$libs$config{ex_libs}" if ($libs ne "");
|
1998-12-21 10:52:47 +00:00
|
|
|
|
1998-12-21 11:00:56 +00:00
|
|
|
if ($no_asm)
|
|
|
|
{
|
2016-01-30 01:17:05 +00:00
|
|
|
@{$config{defines}} = grep !/^[BL]_ENDIAN$/, @{$config{defines}}
|
|
|
|
if ($config{fips});
|
1998-12-21 11:00:56 +00:00
|
|
|
}
|
2002-12-13 17:56:14 +00:00
|
|
|
|
1999-04-29 16:10:09 +00:00
|
|
|
if ($threads)
|
|
|
|
{
|
2016-01-29 21:30:00 +00:00
|
|
|
$config{cflags} = "$thread_cflags $config{cflags}" if $thread_cflags;
|
2016-01-30 01:17:05 +00:00
|
|
|
push @{$config{defines}}, @thread_defines;
|
2015-05-18 23:40:54 +00:00
|
|
|
push @{$config{openssl_thread_defines}}, @thread_defines;
|
2001-07-12 09:11:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if ($zlib)
|
|
|
|
{
|
2016-01-30 01:17:05 +00:00
|
|
|
push @{$config{defines}}, "ZLIB";
|
2005-02-22 10:29:51 +00:00
|
|
|
if (defined($disabled{"zlib-dynamic"}))
|
|
|
|
{
|
2016-02-03 16:31:40 +00:00
|
|
|
if (defined($withargs{zlib_lib}))
|
2009-04-07 16:33:26 +00:00
|
|
|
{
|
2016-02-03 16:31:40 +00:00
|
|
|
$config{ex_libs} .= " -L" . $withargs{zlib_lib} . " -lz";
|
2009-04-07 16:33:26 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2016-01-29 17:07:37 +00:00
|
|
|
$config{ex_libs} .= " -lz";
|
2009-04-07 16:33:26 +00:00
|
|
|
}
|
2005-02-22 10:29:51 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2016-01-30 01:17:05 +00:00
|
|
|
push @{$config{defines}}, "ZLIB_SHARED";
|
2005-02-22 10:29:51 +00:00
|
|
|
}
|
1999-04-29 16:10:09 +00:00
|
|
|
}
|
|
|
|
|
2016-01-05 04:00:33 +00:00
|
|
|
# With "deprecated" disable all deprecated features.
|
|
|
|
if (defined($disabled{"deprecated"})) {
|
2015-05-20 18:03:20 +00:00
|
|
|
$config{api} = $maxapi;
|
2016-01-05 04:00:33 +00:00
|
|
|
}
|
2014-12-17 13:17:26 +00:00
|
|
|
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
if ($target{shared_target} eq "")
|
2002-12-13 17:56:14 +00:00
|
|
|
{
|
2015-05-20 18:03:20 +00:00
|
|
|
$no_shared_warn = 1 if !$config{no_shared} && !$config{fips};
|
2016-01-25 14:48:35 +00:00
|
|
|
$config{no_shared} = 1;
|
2002-12-13 17:56:14 +00:00
|
|
|
}
|
2016-01-25 14:48:35 +00:00
|
|
|
if (!$config{no_shared})
|
2000-07-21 15:08:53 +00:00
|
|
|
{
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
if ($target{shared_cflag} ne "")
|
2000-10-13 15:25:06 +00:00
|
|
|
{
|
2016-01-30 01:17:05 +00:00
|
|
|
push @{$config{defines}}, "OPENSSL_PIC";
|
|
|
|
$config{cflags} = "$target{shared_cflag} $config{cflags}";
|
2000-10-13 15:25:06 +00:00
|
|
|
}
|
2000-10-09 00:48:30 +00:00
|
|
|
}
|
2000-07-21 15:08:53 +00:00
|
|
|
|
2016-01-29 23:57:33 +00:00
|
|
|
if ($builder ne "mk1mf")
|
2002-10-11 18:06:08 +00:00
|
|
|
{
|
2008-04-17 10:19:16 +00:00
|
|
|
# add {no-}static-engine to options to allow mkdef.pl to work without extra arguments
|
2016-01-25 14:48:35 +00:00
|
|
|
if ($config{no_shared})
|
2005-11-06 17:58:26 +00:00
|
|
|
{
|
2015-05-18 23:40:54 +00:00
|
|
|
push @{$config{openssl_other_defines}}, "OPENSSL_NO_DYNAMIC_ENGINE";
|
2016-01-11 23:17:12 +00:00
|
|
|
$config{options}.=" static-engine";
|
2005-11-06 17:58:26 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2015-05-18 23:40:54 +00:00
|
|
|
push @{$config{openssl_other_defines}}, "OPENSSL_NO_STATIC_ENGINE";
|
2016-01-11 23:17:12 +00:00
|
|
|
$config{options}.=" no-static-engine";
|
2005-11-06 17:58:26 +00:00
|
|
|
}
|
2002-10-24 19:09:03 +00:00
|
|
|
}
|
2002-10-11 18:06:08 +00:00
|
|
|
|
2007-09-16 12:23:47 +00:00
|
|
|
#
|
|
|
|
# Platform fix-ups
|
|
|
|
#
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
if ($target{sys_id} ne "")
|
2001-02-19 16:06:34 +00:00
|
|
|
{
|
2015-12-27 01:27:30 +00:00
|
|
|
push @{$config{openssl_sys_defines}}, "OPENSSL_SYS_$target{sys_id}";
|
2001-02-19 16:06:34 +00:00
|
|
|
}
|
|
|
|
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
if ($target{ranlib} eq "")
|
2001-03-09 13:04:06 +00:00
|
|
|
{
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
$target{ranlib} = $default_ranlib;
|
2001-03-09 13:04:06 +00:00
|
|
|
}
|
|
|
|
|
2015-05-18 00:54:28 +00:00
|
|
|
if (!$no_asm) {
|
2016-01-29 18:45:51 +00:00
|
|
|
$target{cpuid_asm_src}=$table{BASE}->{cpuid_asm_src} if ($config{processor} eq "386");
|
2016-01-30 01:17:05 +00:00
|
|
|
$target{cpuid_asm_src}.=" uplink.c uplink-x86.s" if (grep { $_ eq "OPENSSL_USE_APPLINK"} @{$config{defines}});
|
1999-02-14 22:47:21 +00:00
|
|
|
|
2016-01-29 18:45:51 +00:00
|
|
|
$target{bn_asm_src} =~ s/\w+-gf2m.c// if (defined($disabled{ec2m}));
|
2004-08-02 22:41:19 +00:00
|
|
|
|
2015-05-18 00:54:28 +00:00
|
|
|
# bn-586 is the only one implementing bn_*_part_words
|
2016-01-30 01:17:05 +00:00
|
|
|
push @{$config{defines}}, "OPENSSL_BN_ASM_PART_WORDS" if ($target{bn_asm_src} =~ /bn-586/);
|
|
|
|
push @{$config{defines}}, "OPENSSL_IA32_SSE2" if (!$no_sse2 && $target{bn_asm_src} =~ /86/);
|
1998-12-21 11:00:56 +00:00
|
|
|
|
2016-01-30 01:17:05 +00:00
|
|
|
push @{$config{defines}}, "OPENSSL_BN_ASM_MONT" if ($target{bn_asm_src} =~ /-mont/);
|
|
|
|
push @{$config{defines}}, "OPENSSL_BN_ASM_MONT5" if ($target{bn_asm_src} =~ /-mont5/);
|
|
|
|
push @{$config{defines}}, "OPENSSL_BN_ASM_GF2m" if ($target{bn_asm_src} =~ /-gf2m/);
|
2005-10-07 14:18:06 +00:00
|
|
|
|
2015-05-20 18:03:20 +00:00
|
|
|
if ($config{fips}) {
|
2015-05-18 23:40:54 +00:00
|
|
|
push @{$config{openssl_other_defines}}, "OPENSSL_FIPS";
|
2015-05-18 00:54:28 +00:00
|
|
|
}
|
2011-01-26 12:31:30 +00:00
|
|
|
|
2016-01-29 18:45:51 +00:00
|
|
|
if ($target{sha1_asm_src}) {
|
2016-01-30 01:17:05 +00:00
|
|
|
push @{$config{defines}}, "SHA1_ASM" if ($target{sha1_asm_src} =~ /sx86/ || $target{sha1_asm_src} =~ /sha1/);
|
|
|
|
push @{$config{defines}}, "SHA256_ASM" if ($target{sha1_asm_src} =~ /sha256/);
|
|
|
|
push @{$config{defines}}, "SHA512_ASM" if ($target{sha1_asm_src} =~ /sha512/);
|
2015-05-18 00:54:28 +00:00
|
|
|
}
|
2016-01-29 18:45:51 +00:00
|
|
|
if ($target{md5_asm_src}) {
|
2016-01-30 01:17:05 +00:00
|
|
|
push @{$config{defines}}, "MD5_ASM";
|
2015-05-18 00:54:28 +00:00
|
|
|
}
|
2016-01-29 18:45:51 +00:00
|
|
|
$target{cast_asm_src}=$table{BASE}->{cast_asm_src} if (!$config{no_shared}); # CAST assembler is not PIC
|
|
|
|
if ($target{rmd160_asm_src}) {
|
2016-01-30 01:17:05 +00:00
|
|
|
push @{$config{defines}}, "RMD160_ASM";
|
2015-05-18 00:54:28 +00:00
|
|
|
}
|
2016-01-29 18:45:51 +00:00
|
|
|
if ($target{aes_asm_src}) {
|
2016-01-30 01:17:05 +00:00
|
|
|
push @{$config{defines}}, "AES_ASM" if ($target{aes_asm_src} =~ m/\baes-/);;
|
2016-01-29 18:45:51 +00:00
|
|
|
# aes-ctr.fake is not a real file, only indication that assembler
|
2010-07-09 12:21:52 +00:00
|
|
|
# module implements AES_ctr32_encrypt...
|
2016-01-30 01:17:05 +00:00
|
|
|
push @{$config{defines}}, "AES_CTR_ASM" if ($target{aes_asm_src} =~ s/\s*aes-ctr\.fake//);
|
2016-01-29 18:45:51 +00:00
|
|
|
# aes-xts.fake indicates presence of AES_xts_[en|de]crypt...
|
2016-01-30 01:17:05 +00:00
|
|
|
push @{$config{defines}}, "AES_XTS_ASM" if ($target{aes_asm_src} =~ s/\s*aes-xts\.fake//);
|
2016-01-29 18:45:51 +00:00
|
|
|
$target{aes_asm_src} =~ s/\s*(vpaes|aesni)-x86\.s//g if ($no_sse2);
|
2016-01-30 01:17:05 +00:00
|
|
|
push @{$config{defines}}, "VPAES_ASM" if ($target{aes_asm_src} =~ m/vpaes/);
|
|
|
|
push @{$config{defines}}, "BSAES_ASM" if ($target{aes_asm_src} =~ m/bsaes/);
|
2015-05-18 00:54:28 +00:00
|
|
|
}
|
2016-01-29 18:45:51 +00:00
|
|
|
if ($target{wp_asm_src} =~ /mmx/) {
|
2016-01-29 13:23:24 +00:00
|
|
|
if ($config{processor} eq "386") {
|
2016-01-29 18:45:51 +00:00
|
|
|
$target{wp_asm_src}=$table{BASE}->{wp_asm_src};
|
2016-01-29 13:23:24 +00:00
|
|
|
} elsif (!$disabled{"whirlpool"}) {
|
|
|
|
$config{cflags}.=" -DWHIRLPOOL_ASM";
|
|
|
|
}
|
2015-05-18 00:54:28 +00:00
|
|
|
}
|
2016-01-29 18:45:51 +00:00
|
|
|
if ($target{modes_asm_src} =~ /ghash-/) {
|
2016-01-30 01:17:05 +00:00
|
|
|
push @{$config{defines}}, "GHASH_ASM";
|
2015-05-18 00:54:28 +00:00
|
|
|
}
|
2016-01-29 18:45:51 +00:00
|
|
|
if ($target{ec_asm_src} =~ /ecp_nistz256/) {
|
2016-01-30 01:17:05 +00:00
|
|
|
push @{$config{defines}}, "ECP_NISTZ256_ASM";
|
2015-05-18 00:54:28 +00:00
|
|
|
}
|
2016-01-29 18:45:51 +00:00
|
|
|
if ($target{poly1305_asm_src} ne "") {
|
2016-01-30 01:17:05 +00:00
|
|
|
push @{$config{defines}}, "POLY1305_ASM";
|
2015-05-18 00:54:28 +00:00
|
|
|
}
|
|
|
|
}
|
1998-12-21 10:52:47 +00:00
|
|
|
|
2016-01-30 00:50:28 +00:00
|
|
|
# Is the compiler gcc or clang? $ecc is used below to see if error-checking
|
|
|
|
# can be turned on.
|
2016-01-27 18:03:13 +00:00
|
|
|
my $ecc = $target{cc};
|
2016-01-30 00:50:28 +00:00
|
|
|
my $ccpcc = "$config{cross_compile_prefix}$target{cc}";
|
|
|
|
$config{makedepprog} = 'makedepend';
|
|
|
|
open(PIPE, "$ccpcc --version 2>&1 | head -2 |");
|
|
|
|
while ( <PIPE> ) {
|
|
|
|
$config{makedepprog} = $ccpcc if /clang|gcc/;
|
|
|
|
$ecc = "clang" if /clang/;
|
|
|
|
$ecc = "gcc" if /gcc/;
|
|
|
|
}
|
|
|
|
close(PIPE);
|
2016-01-27 18:03:13 +00:00
|
|
|
|
2015-05-20 18:03:20 +00:00
|
|
|
$config{depflags} =~ s/^\s*//;
|
|
|
|
|
2015-05-18 23:40:54 +00:00
|
|
|
|
|
|
|
# Deal with bn_ops ###################################################
|
|
|
|
|
|
|
|
$config{bn_ll} =0;
|
|
|
|
$config{export_var_as_fn} =0;
|
|
|
|
my $def_int="unsigned int";
|
|
|
|
$config{rc4_int} =$def_int;
|
2016-01-23 18:23:25 +00:00
|
|
|
($config{b64l},$config{b64},$config{b32})=(0,0,1);
|
2015-05-18 23:40:54 +00:00
|
|
|
|
2016-01-28 15:13:21 +00:00
|
|
|
my $count = 0;
|
2015-05-18 23:40:54 +00:00
|
|
|
foreach (sort split(/\s+/,$target{bn_ops})) {
|
2016-01-28 15:13:21 +00:00
|
|
|
$count++ if /SIXTY_FOUR_BIT|SIXTY_FOUR_BIT_LONG|THIRTY_TWO_BIT/;
|
|
|
|
$config{export_var_as_fn}=1 if $_ eq 'EXPORT_VAR_AS_FN';
|
|
|
|
$config{bn_ll}=1 if $_ eq 'BN_LLONG';
|
|
|
|
$config{rc4_int}="unsigned char" if $_ eq 'RC4_CHAR';
|
|
|
|
($config{b64l},$config{b64},$config{b32})
|
|
|
|
=(0,1,0) if $_ eq 'SIXTY_FOUR_BIT';
|
|
|
|
($config{b64l},$config{b64},$config{b32})
|
|
|
|
=(1,0,0) if $_ eq 'SIXTY_FOUR_BIT_LONG';
|
|
|
|
($config{b64l},$config{b64},$config{b32})
|
|
|
|
=(0,0,1) if $_ eq 'THIRTY_TWO_BIT';
|
2015-05-18 23:40:54 +00:00
|
|
|
}
|
2016-01-28 15:13:21 +00:00
|
|
|
die "Exactly one of SIXTY_FOUR_BIT|SIXTY_FOUR_BIT_LONG|THIRTY_TWO_BIT can be set in bn_ops\n"
|
|
|
|
if $count > 1;
|
2015-05-18 23:40:54 +00:00
|
|
|
|
|
|
|
|
|
|
|
# Hack cflags for better warnings (dev option) #######################
|
|
|
|
|
2002-05-30 18:06:35 +00:00
|
|
|
# "Stringify" the C flags string. This permits it to be made part of a string
|
|
|
|
# and works as well on command lines.
|
2015-05-20 18:03:20 +00:00
|
|
|
$config{cflags} =~ s/([\\\"])/\\\1/g;
|
2000-07-21 15:08:53 +00:00
|
|
|
|
2015-05-20 18:03:20 +00:00
|
|
|
if (defined($config{api})) {
|
|
|
|
$config{openssl_api_defines} = [ "OPENSSL_MIN_API=".$apitable->{$config{api}} ];
|
2016-01-30 01:17:05 +00:00
|
|
|
my $apiflag = sprintf("OPENSSL_API_COMPAT=%s", $apitable->{$config{api}});
|
|
|
|
push @default_depdefines, $apiflag;
|
|
|
|
push @{$config{defines}}, $apiflag;
|
2016-01-05 04:00:33 +00:00
|
|
|
}
|
|
|
|
|
2009-09-09 16:31:32 +00:00
|
|
|
if ($strict_warnings)
|
|
|
|
{
|
|
|
|
my $wopt;
|
2016-01-30 00:50:28 +00:00
|
|
|
die "ERROR --strict-warnings requires gcc or clang"
|
|
|
|
unless $ecc eq 'gcc' || $ecc eq 'clang';
|
2009-09-09 16:31:32 +00:00
|
|
|
foreach $wopt (split /\s+/, $gcc_devteam_warn)
|
|
|
|
{
|
2016-02-13 12:02:35 +00:00
|
|
|
$config{cflags} .= " $wopt" unless ($config{cflags} =~ /(^|\s)$wopt(\s|$)/)
|
2009-09-09 16:31:32 +00:00
|
|
|
}
|
2015-04-19 13:10:54 +00:00
|
|
|
if ($ecc eq "clang")
|
|
|
|
{
|
|
|
|
foreach $wopt (split /\s+/, $clang_devteam_warn)
|
|
|
|
{
|
2016-02-13 12:02:35 +00:00
|
|
|
$config{cflags} .= " $wopt" unless ($config{cflags} =~ /(^|\s)$wopt(\s|$)/)
|
2015-04-19 13:10:54 +00:00
|
|
|
}
|
|
|
|
}
|
2016-02-14 11:16:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
unless ($disabled{"crypto-mdebug-backtrace"})
|
|
|
|
{
|
|
|
|
foreach my $wopt (split /\s+/, $memleak_devteam_backtrace)
|
2015-12-02 17:44:26 +00:00
|
|
|
{
|
2016-02-14 11:16:52 +00:00
|
|
|
$config{cflags} .= " $wopt" unless ($config{cflags} =~ /(^|\s)$wopt(\s|$)/)
|
|
|
|
}
|
|
|
|
if ($target =~ /^BSD-/)
|
|
|
|
{
|
|
|
|
$config{ex_libs} .= " -lexecinfo";
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
}
|
2009-09-09 16:31:32 +00:00
|
|
|
}
|
|
|
|
|
2016-02-13 12:02:35 +00:00
|
|
|
if ($user_cflags ne "") { $config{cflags}="$config{cflags}$user_cflags"; }
|
|
|
|
else { $no_user_cflags=1; }
|
|
|
|
if (@user_defines) { $config{defines}=[ @{$config{defines}}, @user_defines ]; }
|
|
|
|
else { $no_user_defines=1; }
|
|
|
|
|
|
|
|
# ALL MODIFICATIONS TO %config and %target MUST BE DONE FROM HERE ON
|
|
|
|
|
2016-01-29 18:45:51 +00:00
|
|
|
# If we use the unified build, collect information from build.info files
|
|
|
|
my %unified_info = ();
|
|
|
|
|
2016-01-29 23:57:33 +00:00
|
|
|
if ($builder eq "unified") {
|
|
|
|
# Store the name of the template file we will build the build file from
|
|
|
|
# in %config. This may be useful for the build file itself.
|
|
|
|
my $build_file_template =
|
|
|
|
catfile($srcdir, "Configurations",
|
|
|
|
$builder_platform."-".$target{build_file}.".tmpl");
|
|
|
|
$build_file_template =
|
|
|
|
catfile($srcdir, "Configurations", $target{build_file}.".tmpl")
|
|
|
|
if (! -f $build_file_template);
|
|
|
|
$config{build_file_template} = $build_file_template;
|
|
|
|
|
2016-01-29 18:45:51 +00:00
|
|
|
use lib catdir(dirname(__FILE__),"util");
|
|
|
|
use with_fallback qw(Text::Template);
|
|
|
|
|
|
|
|
sub cleandir {
|
2016-02-10 01:00:37 +00:00
|
|
|
my $base = shift;
|
2016-01-29 18:45:51 +00:00
|
|
|
my $dir = shift;
|
2016-02-10 01:00:37 +00:00
|
|
|
my $relativeto = shift || ".";
|
|
|
|
|
|
|
|
$dir = catdir($base,$dir) unless isabsolute($dir);
|
2016-01-29 18:45:51 +00:00
|
|
|
|
2016-02-09 09:15:13 +00:00
|
|
|
# Make sure the directories we're building in exists
|
|
|
|
mkpath($dir);
|
|
|
|
|
2016-02-10 01:00:37 +00:00
|
|
|
my $res = abs2rel(absolutedir($dir), rel2abs($relativeto));
|
2016-01-29 18:45:51 +00:00
|
|
|
#print STDERR "DEBUG[cleandir]: $dir , $base => $res\n";
|
|
|
|
return $res;
|
|
|
|
}
|
|
|
|
|
|
|
|
sub cleanfile {
|
2016-02-10 01:00:37 +00:00
|
|
|
my $base = shift;
|
2016-01-29 18:45:51 +00:00
|
|
|
my $file = shift;
|
2016-02-10 01:00:37 +00:00
|
|
|
my $relativeto = shift || ".";
|
|
|
|
|
|
|
|
$file = catfile($base,$file) unless isabsolute($file);
|
|
|
|
|
2016-01-29 18:45:51 +00:00
|
|
|
my $d = dirname($file);
|
|
|
|
my $f = basename($file);
|
|
|
|
|
2016-02-09 09:15:13 +00:00
|
|
|
# Make sure the directories we're building in exists
|
|
|
|
mkpath($d);
|
|
|
|
|
2016-02-10 01:00:37 +00:00
|
|
|
my $res = abs2rel(catfile(absolutedir($d), $f), rel2abs($relativeto));
|
2016-01-29 18:45:51 +00:00
|
|
|
#print STDERR "DEBUG[cleanfile]: $d , $f => $res\n";
|
|
|
|
return $res;
|
|
|
|
}
|
|
|
|
|
|
|
|
my @build_infos = ( [ ".", "build.info" ] );
|
|
|
|
foreach (@{$config{dirs}}) {
|
|
|
|
push @build_infos, [ $_, "build.info" ]
|
|
|
|
if (-f catfile($srcdir, $_, "build.info"));
|
|
|
|
}
|
|
|
|
foreach (@{$config{sdirs}}) {
|
|
|
|
push @build_infos, [ catdir("crypto", $_), "build.info" ]
|
|
|
|
if (-f catfile($srcdir, "crypto", $_, "build.info"));
|
|
|
|
}
|
|
|
|
foreach (@{$config{engdirs}}) {
|
|
|
|
push @build_infos, [ catdir("engines", $_), "build.info" ]
|
|
|
|
if (-f catfile($srcdir, "engines", $_, "build.info"));
|
|
|
|
}
|
|
|
|
|
|
|
|
foreach (@build_infos) {
|
|
|
|
my $sourced = catdir($srcdir, $_->[0]);
|
|
|
|
my $buildd = catdir($blddir, $_->[0]);
|
|
|
|
|
2016-02-08 15:27:15 +00:00
|
|
|
mkpath($buildd);
|
2016-01-29 18:45:51 +00:00
|
|
|
|
|
|
|
my $f = $_->[1];
|
|
|
|
# The basic things we're trying to build
|
|
|
|
my @programs = ();
|
|
|
|
my @libraries = ();
|
|
|
|
my @engines = ();
|
|
|
|
my @scripts = ();
|
|
|
|
my @extra = ();
|
|
|
|
my @intermediates = ();
|
|
|
|
my @rawlines = ();
|
|
|
|
|
|
|
|
my %ordinals = ();
|
|
|
|
my %sources = ();
|
|
|
|
my %includes = ();
|
|
|
|
my %depends = ();
|
|
|
|
my %renames = ();
|
|
|
|
my %sharednames = ();
|
|
|
|
|
|
|
|
my $template = Text::Template->new(TYPE => 'FILE',
|
|
|
|
SOURCE => catfile($sourced, $f));
|
|
|
|
die "Something went wrong with $sourced/$f: $!\n" unless $template;
|
|
|
|
my @text =
|
|
|
|
split /^/m,
|
|
|
|
$template->fill_in(HASH => { config => \%config,
|
|
|
|
target => \%target,
|
|
|
|
builddir => abs2rel($buildd, $blddir),
|
|
|
|
sourcedir => abs2rel($sourced, $blddir),
|
|
|
|
buildtop => abs2rel($blddir, $blddir),
|
|
|
|
sourcetop => abs2rel($srcdir, $blddir) },
|
|
|
|
DELIMITERS => [ "{-", "-}" ]);
|
|
|
|
|
|
|
|
# The top item of this stack has the following values
|
|
|
|
# -2 positive already run and we found ELSE (following ELSIF should fail)
|
|
|
|
# -1 positive already run (skip until ENDIF)
|
|
|
|
# 0 negatives so far (if we're at a condition, check it)
|
|
|
|
# 1 last was positive (don't skip lines until next ELSE, ELSIF or ENDIF)
|
|
|
|
# 2 positive ELSE (following ELSIF should fail)
|
|
|
|
my @skip = ();
|
|
|
|
collect_information(
|
|
|
|
collect_from_array([ @text ],
|
|
|
|
qr/\\$/ => sub { my $l1 = shift; my $l2 = shift;
|
|
|
|
$l1 =~ s/\\$//; $l1.$l2 }),
|
|
|
|
# Info we're looking for
|
|
|
|
qr/^\s*IF\[((?:\\.|[^\\\]])*)\]\s*$/
|
|
|
|
=> sub { push @skip, !! $1; },
|
|
|
|
qr/^\s*ELSIF\[((?:\\.|[^\\\]])*)\]\s*$/
|
|
|
|
=> sub { die "ELSIF out of scope" if ! @skip;
|
|
|
|
die "ELSIF following ELSE" if abs($skip[$#skip]) == 2;
|
|
|
|
$skip[$#skip] = -1 if $skip[$#skip] != 0;
|
|
|
|
$skip[$#skip] = !! $1
|
|
|
|
if $skip[$#skip] == 0; },
|
|
|
|
qr/^\s*ELSE\s*$/
|
|
|
|
=> sub { die "ELSE out of scope" if ! @skip;
|
|
|
|
$skip[$#skip] = -2 if $skip[$#skip] != 0;
|
|
|
|
$skip[$#skip] = 2 if $skip[$#skip] == 0; },
|
|
|
|
qr/^\s*ENDIF\s*$/
|
|
|
|
=> sub { die "ENDIF out of scope" if ! @skip;
|
|
|
|
pop @skip; },
|
|
|
|
qr/^\s*PROGRAMS\s*=\s*(.*)\s*$/
|
|
|
|
=> sub { push @programs, split(/\s+/, $1)
|
|
|
|
if !@skip || $skip[$#skip] > 0 },
|
|
|
|
qr/^\s*LIBS\s*=\s*(.*)\s*$/
|
|
|
|
=> sub { push @libraries, split(/\s+/, $1)
|
|
|
|
if !@skip || $skip[$#skip] > 0 },
|
|
|
|
qr/^\s*ENGINES\s*=\s*(.*)\s*$/
|
|
|
|
=> sub { push @engines, split(/\s+/, $1)
|
|
|
|
if !@skip || $skip[$#skip] > 0 },
|
|
|
|
qr/^\s*SCRIPTS\s*=\s*(.*)\s*$/
|
|
|
|
=> sub { push @scripts, split(/\s+/, $1)
|
|
|
|
if !@skip || $skip[$#skip] > 0 },
|
|
|
|
qr/^\s*EXTRA\s*=\s*(.*)\s*$/
|
|
|
|
=> sub { push @extra, split(/\s+/, $1)
|
|
|
|
if !@skip || $skip[$#skip] > 0 },
|
|
|
|
|
|
|
|
qr/^\s*ORDINALS\[((?:\\.|[^\\\]])+)\]\s*=\s*(.*)\s*$/,
|
|
|
|
=> sub { push @{$ordinals{$1}}, split(/\s+/, $2)
|
|
|
|
if !@skip || $skip[$#skip] > 0 },
|
|
|
|
qr/^\s*SOURCE\[((?:\\.|[^\\\]])+)\]\s*=\s*(.*)\s*$/
|
|
|
|
=> sub { push @{$sources{$1}}, split(/\s+/, $2)
|
|
|
|
if !@skip || $skip[$#skip] > 0 },
|
|
|
|
qr/^\s*INCLUDE\[((?:\\.|[^\\\]])+)\]\s*=\s*(.*)\s*$/
|
|
|
|
=> sub { push @{$includes{$1}}, split(/\s+/, $2)
|
|
|
|
if !@skip || $skip[$#skip] > 0 },
|
|
|
|
qr/^\s*DEPEND\[((?:\\.|[^\\\]])+)\]\s*=\s*(.*)\s*$/
|
|
|
|
=> sub { push @{$depends{$1}}, split(/\s+/, $2)
|
|
|
|
if !@skip || $skip[$#skip] > 0 },
|
|
|
|
qr/^\s*RENAME\[((?:\\.|[^\\\]])+)\]\s*=\s*(.*)\s*$/
|
|
|
|
=> sub { push @{$renames{$1}}, split(/\s+/, $2)
|
|
|
|
if !@skip || $skip[$#skip] > 0 },
|
|
|
|
qr/^\s*SHARED_NAME\[((?:\\.|[^\\\]])+)\]\s*=\s*(.*)\s*$/
|
|
|
|
=> sub { push @{$sharednames{$1}}, split(/\s+/, $2)
|
|
|
|
if !@skip || $skip[$#skip] > 0 },
|
|
|
|
qr/^\s*BEGINRAW\[((?:\\.|[^\\\]])+)\]\s*$/
|
|
|
|
=> sub {
|
|
|
|
my $lineiterator = shift;
|
|
|
|
my $target_kind = $1;
|
|
|
|
while (defined $lineiterator->()) {
|
2016-02-12 11:10:27 +00:00
|
|
|
s|\R$||;
|
2016-01-29 18:45:51 +00:00
|
|
|
if (/^\s*ENDRAW\[((?:\\.|[^\\\]])+)\]\s*$/) {
|
|
|
|
die "ENDRAW doesn't match BEGINRAW"
|
|
|
|
if $1 ne $target_kind;
|
|
|
|
last;
|
|
|
|
}
|
|
|
|
next if @skip && $skip[$#skip] <= 0;
|
|
|
|
push @rawlines, $_
|
|
|
|
if ($target_kind eq $target{build_file}
|
2016-01-29 23:57:33 +00:00
|
|
|
|| $target_kind eq $target{build_file}."(".$builder_platform.")");
|
2016-01-29 18:45:51 +00:00
|
|
|
}
|
|
|
|
},
|
|
|
|
qr/^(?:#.*|\s*)$/ => sub { },
|
|
|
|
"OTHERWISE" => sub { die "Something wrong with this line:\n$_\nat $sourced/$f" }
|
|
|
|
);
|
|
|
|
die "runaway IF?" if (@skip);
|
|
|
|
|
|
|
|
foreach (keys %renames) {
|
|
|
|
die "$_ renamed to more than one thing: "
|
|
|
|
,join(" ", @{$renames{$_}}),"\n"
|
|
|
|
if scalar @{$renames{$_}} > 1;
|
2016-02-10 01:00:37 +00:00
|
|
|
my $dest = cleanfile($buildd, $_, $blddir);
|
|
|
|
my $to = cleanfile($buildd, $renames{$_}->[0], $blddir);
|
2016-01-29 18:45:51 +00:00
|
|
|
die "$dest renamed to more than one thing: "
|
|
|
|
,$unified_info{rename}->{$dest}, $to
|
|
|
|
unless !defined($unified_info{rename}->{$dest})
|
|
|
|
or $unified_info{rename}->{$dest} eq $to;
|
|
|
|
$unified_info{rename}->{$dest} = $to;
|
|
|
|
}
|
|
|
|
|
|
|
|
foreach (@programs) {
|
2016-02-10 01:00:37 +00:00
|
|
|
my $program = cleanfile($buildd, $_, $blddir);
|
2016-01-29 18:45:51 +00:00
|
|
|
if ($unified_info{rename}->{$program}) {
|
|
|
|
$program = $unified_info{rename}->{$program};
|
|
|
|
}
|
|
|
|
$unified_info{programs}->{$program} = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
foreach (@libraries) {
|
2016-02-10 01:00:37 +00:00
|
|
|
my $library = cleanfile($buildd, $_, $blddir);
|
2016-01-29 18:45:51 +00:00
|
|
|
if ($unified_info{rename}->{$library}) {
|
|
|
|
$library = $unified_info{rename}->{$library};
|
|
|
|
}
|
|
|
|
$unified_info{libraries}->{$library} = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
die <<"EOF" if $config{no_shared} && scalar @engines;
|
|
|
|
ENGINES can only be used if configured with 'shared'.
|
|
|
|
This is usually a fault in a build.info file.
|
|
|
|
EOF
|
|
|
|
foreach (@engines) {
|
2016-02-10 01:00:37 +00:00
|
|
|
my $library = cleanfile($buildd, $_, $blddir);
|
2016-01-29 18:45:51 +00:00
|
|
|
if ($unified_info{rename}->{$library}) {
|
|
|
|
$library = $unified_info{rename}->{$library};
|
|
|
|
}
|
|
|
|
$unified_info{engines}->{$library} = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
foreach (@scripts) {
|
2016-02-10 01:00:37 +00:00
|
|
|
my $script = cleanfile($buildd, $_, $blddir);
|
2016-01-29 18:45:51 +00:00
|
|
|
if ($unified_info{rename}->{$script}) {
|
|
|
|
$script = $unified_info{rename}->{$script};
|
|
|
|
}
|
|
|
|
$unified_info{scripts}->{$script} = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
foreach (@extra) {
|
2016-02-10 01:00:37 +00:00
|
|
|
my $extra = cleanfile($buildd, $_, $blddir);
|
2016-01-29 18:45:51 +00:00
|
|
|
$unified_info{extra}->{$extra} = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
push @{$unified_info{rawlines}}, @rawlines;
|
|
|
|
|
|
|
|
if (!$config{no_shared}) {
|
|
|
|
# Check sharednames.
|
|
|
|
foreach (keys %sharednames) {
|
2016-02-10 01:00:37 +00:00
|
|
|
my $dest = cleanfile($buildd, $_, $blddir);
|
2016-01-29 18:45:51 +00:00
|
|
|
if ($unified_info{rename}->{$dest}) {
|
|
|
|
$dest = $unified_info{rename}->{$dest};
|
|
|
|
}
|
|
|
|
die "shared_name for $dest with multiple values: "
|
|
|
|
,join(" ", @{$sharednames{$_}}),"\n"
|
|
|
|
if scalar @{$sharednames{$_}} > 1;
|
2016-02-10 01:00:37 +00:00
|
|
|
my $to = cleanfile($buildd, $sharednames{$_}->[0], $blddir);
|
2016-01-29 18:45:51 +00:00
|
|
|
die "shared_name found for a library $dest that isn't defined\n"
|
|
|
|
unless $unified_info{libraries}->{$dest};
|
|
|
|
die "shared_name for $dest with multiple values: "
|
|
|
|
,$unified_info{sharednames}->{$dest}, ", ", $to
|
|
|
|
unless !defined($unified_info{sharednames}->{$dest})
|
|
|
|
or $unified_info{sharednames}->{$dest} eq $to;
|
|
|
|
$unified_info{sharednames}->{$dest} = $to;
|
|
|
|
}
|
|
|
|
|
|
|
|
# Additionally, we set up sharednames for libraries that don't
|
|
|
|
# have any, as themselves.
|
|
|
|
foreach (keys %{$unified_info{libraries}}) {
|
|
|
|
if (!defined $unified_info{sharednames}->{$_}) {
|
|
|
|
$unified_info{sharednames}->{$_} = $_
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
foreach (keys %ordinals) {
|
|
|
|
my $dest = $_;
|
2016-02-10 01:00:37 +00:00
|
|
|
my $ddest = cleanfile($buildd, $_, $blddir);
|
2016-01-29 18:45:51 +00:00
|
|
|
if ($unified_info{rename}->{$ddest}) {
|
|
|
|
$ddest = $unified_info{rename}->{$ddest};
|
|
|
|
}
|
|
|
|
foreach (@{$ordinals{$dest}}) {
|
|
|
|
my %known_ordinals =
|
|
|
|
(
|
|
|
|
crypto =>
|
2016-02-10 01:00:37 +00:00
|
|
|
cleanfile($sourced, catfile("util", "libeay.num"), $blddir),
|
2016-01-29 18:45:51 +00:00
|
|
|
ssl =>
|
2016-02-10 01:00:37 +00:00
|
|
|
cleanfile($sourced, catfile("util", "ssleay.num"), $blddir)
|
2016-01-29 18:45:51 +00:00
|
|
|
);
|
|
|
|
my $o = $known_ordinals{$_};
|
|
|
|
die "Ordinals for $ddest defined more than once\n"
|
|
|
|
if $unified_info{ordinals}->{$ddest};
|
|
|
|
$unified_info{ordinals}->{$ddest} = [ $_, $o ];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
foreach (keys %sources) {
|
|
|
|
my $dest = $_;
|
2016-02-10 01:00:37 +00:00
|
|
|
my $ddest = cleanfile($buildd, $_, $blddir);
|
2016-01-29 18:45:51 +00:00
|
|
|
if ($unified_info{rename}->{$ddest}) {
|
|
|
|
$ddest = $unified_info{rename}->{$ddest};
|
|
|
|
}
|
|
|
|
foreach (@{$sources{$dest}}) {
|
2016-02-10 01:00:37 +00:00
|
|
|
my $s = cleanfile($sourced, $_, $blddir);
|
2016-01-29 18:45:51 +00:00
|
|
|
|
|
|
|
# If it isn't in the source tree, we assume it's generated
|
|
|
|
# in the build tree
|
|
|
|
if (! -f $s) {
|
2016-02-10 01:00:37 +00:00
|
|
|
$s = cleanfile($buildd, $_, $blddir);
|
2016-01-29 18:45:51 +00:00
|
|
|
}
|
|
|
|
# We recognise C and asm files
|
|
|
|
if ($s =~ /\.[csS]\b$/) {
|
|
|
|
(my $o = $_) =~ s/\.[csS]\b$/.o/;
|
2016-02-10 01:00:37 +00:00
|
|
|
$o = cleanfile($buildd, $o, $blddir);
|
2016-01-29 18:45:51 +00:00
|
|
|
$unified_info{sources}->{$ddest}->{$o} = 1;
|
|
|
|
$unified_info{sources}->{$o}->{$s} = 1;
|
|
|
|
} else {
|
|
|
|
$unified_info{sources}->{$ddest}->{$s} = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
foreach (keys %depends) {
|
|
|
|
my $dest = $_;
|
2016-02-10 01:00:37 +00:00
|
|
|
my $ddest = cleanfile($buildd, $_, $blddir);
|
2016-01-29 18:45:51 +00:00
|
|
|
if ($unified_info{rename}->{$ddest}) {
|
|
|
|
$ddest = $unified_info{rename}->{$ddest};
|
|
|
|
}
|
|
|
|
foreach (@{$depends{$dest}}) {
|
2016-02-10 01:00:37 +00:00
|
|
|
my $d = cleanfile($sourced, $_, $blddir);
|
2016-01-29 18:45:51 +00:00
|
|
|
|
2016-02-11 14:22:27 +00:00
|
|
|
# If we know it's generated, or assume it is because we can't
|
|
|
|
# find it in the source tree, we set file we depend on to be
|
|
|
|
# in the build tree rather than the source tree, and assume
|
|
|
|
# and that there are lines to build it in a BEGINRAW..ENDRAW
|
|
|
|
# section or in the Makefile template.
|
|
|
|
if (! -f $d
|
|
|
|
|| !(grep { $d eq $_ }
|
|
|
|
map { cleanfile($srcdir, $_, $blddir) }
|
|
|
|
(@generated_headers, @generated_by_make_headers))) {
|
2016-02-10 01:00:37 +00:00
|
|
|
$d = cleanfile($buildd, $_, $blddir);
|
2016-01-29 18:45:51 +00:00
|
|
|
}
|
|
|
|
# Take note if the file to depend on is being renamed
|
|
|
|
if ($unified_info{rename}->{$d}) {
|
|
|
|
$d = $unified_info{rename}->{$d};
|
|
|
|
}
|
|
|
|
$unified_info{depends}->{$ddest}->{$d} = 1;
|
|
|
|
# If we depend on a header file, let's make sure it
|
|
|
|
# can get included
|
|
|
|
if ($d =~ /\.h$/) {
|
|
|
|
my $i = dirname($d);
|
|
|
|
push @{$unified_info{includes}->{$ddest}}, $i
|
|
|
|
unless grep { $_ eq $i } @{$unified_info{includes}->{$ddest}};
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
foreach (keys %includes) {
|
|
|
|
my $dest = $_;
|
2016-02-10 01:00:37 +00:00
|
|
|
my $ddest = cleanfile($buildd, $_, $blddir);
|
2016-01-29 18:45:51 +00:00
|
|
|
if ($unified_info{rename}->{$ddest}) {
|
|
|
|
$ddest = $unified_info{rename}->{$ddest};
|
|
|
|
}
|
|
|
|
foreach (@{$includes{$dest}}) {
|
2016-02-10 01:00:37 +00:00
|
|
|
my $i = cleandir($sourced, $_, $blddir);
|
2016-01-29 18:45:51 +00:00
|
|
|
push @{$unified_info{includes}->{$ddest}}, $i
|
|
|
|
unless grep { $_ eq $i } @{$unified_info{includes}->{$ddest}};
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
### Make unified_info a bit more efficient
|
|
|
|
# One level structures
|
|
|
|
foreach (("programs", "libraries", "engines", "scripts", "extra")) {
|
|
|
|
$unified_info{$_} = [ sort keys %{$unified_info{$_}} ];
|
|
|
|
}
|
|
|
|
# Two level structures
|
|
|
|
foreach my $l1 (("sources", "ldadd", "depends")) {
|
|
|
|
foreach my $l2 (sort keys %{$unified_info{$l1}}) {
|
|
|
|
$unified_info{$l1}->{$l2} =
|
|
|
|
[ sort keys %{$unified_info{$l1}->{$l2}} ];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
# For the schemes that need it, we provide the old *_obj configs
|
|
|
|
# from the *_asm_obj ones
|
|
|
|
foreach (grep /_asm_src$/, keys %target) {
|
|
|
|
my $src = $_;
|
|
|
|
(my $obj = $_) =~ s/_asm_src$/_obj/;
|
|
|
|
($target{$obj} = $target{$src}) =~ s/\.[csS]\b/.o/g;
|
|
|
|
}
|
|
|
|
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
# Write down our configuration where it fits #########################
|
|
|
|
|
|
|
|
open(OUT,">configdata.pm") || die "unable to create configdata.pm: $!\n";
|
|
|
|
print OUT <<"EOF";
|
|
|
|
package configdata;
|
|
|
|
|
|
|
|
use strict;
|
|
|
|
use warnings;
|
|
|
|
|
|
|
|
use Exporter;
|
|
|
|
#use vars qw(\@ISA \@EXPORT);
|
|
|
|
our \@ISA = qw(Exporter);
|
2016-01-29 18:45:51 +00:00
|
|
|
our \@EXPORT = qw(\%config \%target %withargs %unified_info);
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
|
|
|
|
EOF
|
|
|
|
print OUT "our %config = (\n";
|
|
|
|
foreach (sort keys %config) {
|
|
|
|
if (ref($config{$_}) eq "ARRAY") {
|
|
|
|
print OUT " ", $_, " => [ ", join(", ",
|
|
|
|
map { quotify("perl", $_) }
|
|
|
|
@{$config{$_}}), " ],\n";
|
|
|
|
} else {
|
|
|
|
print OUT " ", $_, " => ", quotify("perl", $config{$_}), ",\n"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
print OUT <<"EOF";
|
|
|
|
);
|
|
|
|
|
|
|
|
EOF
|
|
|
|
print OUT "our %target = (\n";
|
|
|
|
foreach (sort keys %target) {
|
|
|
|
if (ref($target{$_}) eq "ARRAY") {
|
|
|
|
print OUT " ", $_, " => [ ", join(", ",
|
|
|
|
map { quotify("perl", $_) }
|
|
|
|
@{$target{$_}}), " ],\n";
|
|
|
|
} else {
|
|
|
|
print OUT " ", $_, " => ", quotify("perl", $target{$_}), ",\n"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
print OUT <<"EOF";
|
|
|
|
);
|
|
|
|
|
2016-01-26 01:09:33 +00:00
|
|
|
EOF
|
|
|
|
print OUT "our \%available_protocols = (\n";
|
|
|
|
print OUT " tls => [ ", join(", ", map { quotify("perl", $_) } @tls), " ],\n";
|
|
|
|
print OUT " dtls => [ ", join(", ", map { quotify("perl", $_) } @dtls), " ],\n";
|
|
|
|
print OUT <<"EOF";
|
|
|
|
);
|
|
|
|
|
|
|
|
EOF
|
|
|
|
print OUT "our \%disabled = (\n";
|
|
|
|
foreach (sort keys %disabled) {
|
|
|
|
print OUT " ", quotify("perl", $_), " => ", quotify("perl", $disabled{$_}), ",\n";
|
|
|
|
}
|
|
|
|
print OUT <<"EOF";
|
|
|
|
);
|
|
|
|
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
EOF
|
2015-05-20 18:03:20 +00:00
|
|
|
print OUT "our %withargs = (\n";
|
|
|
|
foreach (sort keys %withargs) {
|
|
|
|
if (ref($withargs{$_}) eq "ARRAY") {
|
|
|
|
print OUT " ", $_, " => [ ", join(", ",
|
|
|
|
map { quotify("perl", $_) }
|
|
|
|
@{$withargs{$_}}), " ],\n";
|
|
|
|
} else {
|
|
|
|
print OUT " ", $_, " => ", quotify("perl", $withargs{$_}), ",\n"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
print OUT <<"EOF";
|
|
|
|
);
|
2011-08-23 23:35:30 +00:00
|
|
|
|
2015-05-20 18:03:20 +00:00
|
|
|
EOF
|
2016-01-29 23:57:33 +00:00
|
|
|
if ($builder eq "unified") {
|
2016-01-29 18:45:51 +00:00
|
|
|
my $recurse;
|
|
|
|
$recurse = sub {
|
|
|
|
my $indent = shift;
|
|
|
|
foreach (@_) {
|
|
|
|
if (ref $_ eq "ARRAY") {
|
|
|
|
print OUT " "x$indent, "[\n";
|
|
|
|
foreach (@$_) {
|
|
|
|
$recurse->($indent + 4, $_);
|
|
|
|
}
|
|
|
|
print OUT " "x$indent, "],\n";
|
|
|
|
} elsif (ref $_ eq "HASH") {
|
|
|
|
my %h = %$_;
|
|
|
|
print OUT " "x$indent, "{\n";
|
|
|
|
foreach (sort keys %h) {
|
|
|
|
if (ref $h{$_} eq "") {
|
|
|
|
print OUT " "x($indent + 4), quotify("perl", $_), " => ", quotify("perl", $h{$_}), ",\n";
|
|
|
|
} else {
|
|
|
|
print OUT " "x($indent + 4), quotify("perl", $_), " =>\n";
|
|
|
|
$recurse->($indent + 8, $h{$_});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
print OUT " "x$indent, "},\n";
|
|
|
|
} else {
|
|
|
|
print OUT " "x$indent, quotify("perl", $_), ",\n";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
print OUT "our %unified_info = (\n";
|
|
|
|
foreach (sort keys %unified_info) {
|
|
|
|
if (ref $unified_info{$_} eq "") {
|
|
|
|
print OUT " "x4, quotify("perl", $_), " => ", quotify("perl", $unified_info{$_}), ",\n";
|
|
|
|
} else {
|
|
|
|
print OUT " "x4, quotify("perl", $_), " =>\n";
|
|
|
|
$recurse->(8, $unified_info{$_});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
print OUT <<"EOF";
|
|
|
|
);
|
|
|
|
|
|
|
|
EOF
|
|
|
|
}
|
|
|
|
print OUT "1;\n";
|
1998-12-21 10:52:47 +00:00
|
|
|
close(OUT);
|
1998-12-28 22:05:44 +00:00
|
|
|
|
2016-01-29 23:57:33 +00:00
|
|
|
die <<"EOF" if $builder ne "unified" && $srcdir ne $blddir;
|
2016-01-29 18:45:51 +00:00
|
|
|
|
|
|
|
***** Trying building anywhere else than in the source tree will not
|
|
|
|
***** work for target $config{target}. To make it possible, it needs
|
|
|
|
***** to use the "unified" build scheme.
|
|
|
|
|
|
|
|
EOF
|
|
|
|
|
2016-01-29 23:57:33 +00:00
|
|
|
print "IsMK1MF =", ($builder eq "mk1mf" ? "yes" : "no"), "\n";
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
print "CC =$target{cc}\n";
|
2015-05-20 18:03:20 +00:00
|
|
|
print "CFLAG =$config{cflags}\n";
|
2016-01-30 01:17:05 +00:00
|
|
|
print "DEFINES =",join(" ", @{$config{defines}}),"\n";
|
Enhance and clear the support of linker flags
Some time ago, we had a ex_libs configuration setting that could be
divided into lflags and ex_libs. These got divided in two settings,
lflags and ex_libs, and the former was interpreted to be general
linking flags.
Unfortunately, that conclusion wasn't entirely accurate. Most of
those linking were meant to end up in a very precise position on the
linking command line, just before the spec of libraries the linking
depends on.
Back to the drawing board, we're diving things further, now having
lflags, which are linking flags that aren't depending on command line
position, plib_lflags, which are linking flags that should show up just
before the spec of libraries to depend on, and finally ex_libs, which
is the spec of extra libraries to depend on.
Also, documentation is changed in Configurations/README. This was
previously forgotten.
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
2016-02-05 10:47:14 +00:00
|
|
|
print "LFLAG =$config{lflags}\n";
|
|
|
|
print "PLIB_LFLAG =$config{plib_lflags}\n";
|
2016-01-29 17:07:37 +00:00
|
|
|
print "EX_LIBS =$config{ex_libs}\n";
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
print "CPUID_OBJ =$target{cpuid_obj}\n";
|
|
|
|
print "BN_ASM =$target{bn_obj}\n";
|
|
|
|
print "EC_ASM =$target{ec_obj}\n";
|
|
|
|
print "DES_ENC =$target{des_obj}\n";
|
|
|
|
print "AES_ENC =$target{aes_obj}\n";
|
|
|
|
print "BF_ENC =$target{bf_obj}\n";
|
|
|
|
print "CAST_ENC =$target{cast_obj}\n";
|
|
|
|
print "RC4_ENC =$target{rc4_obj}\n";
|
|
|
|
print "RC5_ENC =$target{rc5_obj}\n";
|
|
|
|
print "MD5_OBJ_ASM =$target{md5_obj}\n";
|
|
|
|
print "SHA1_OBJ_ASM =$target{sha1_obj}\n";
|
|
|
|
print "RMD160_OBJ_ASM=$target{rmd160_obj}\n";
|
|
|
|
print "CMLL_ENC =$target{cmll_obj}\n";
|
|
|
|
print "MODES_OBJ =$target{modes_obj}\n";
|
2016-01-25 20:51:22 +00:00
|
|
|
print "PADLOCK_OBJ =$target{padlock_obj}\n";
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
print "CHACHA_ENC =$target{chacha_obj}\n";
|
|
|
|
print "POLY1305_OBJ =$target{poly1305_obj}\n";
|
2015-05-18 23:40:54 +00:00
|
|
|
print "PROCESSOR =$config{processor}\n";
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
print "RANLIB =$target{ranlib}\n";
|
|
|
|
print "ARFLAGS =$target{arflags}\n";
|
|
|
|
print "PERL =$config{perl}\n";
|
2016-01-25 20:51:22 +00:00
|
|
|
print "\n";
|
2015-05-18 23:40:54 +00:00
|
|
|
print "SIXTY_FOUR_BIT_LONG mode\n" if $config{b64l};
|
|
|
|
print "SIXTY_FOUR_BIT mode\n" if $config{b64};
|
|
|
|
print "THIRTY_TWO_BIT mode\n" if $config{b32};
|
|
|
|
print "BN_LLONG mode\n" if $config{bn_ll};
|
|
|
|
print "RC4 uses $config{rc4_int}\n" if $config{rc4_int} != $def_int;
|
1999-03-07 14:05:36 +00:00
|
|
|
|
2016-02-11 14:22:27 +00:00
|
|
|
for (@generated_headers) {
|
|
|
|
mkpath(catdir($blddir, dirname($_)));
|
|
|
|
run_dofile(catfile($blddir, $_),
|
|
|
|
catfile($srcdir, $_.".in"));
|
2016-01-25 20:51:22 +00:00
|
|
|
}
|
|
|
|
|
2016-01-29 18:45:51 +00:00
|
|
|
###
|
|
|
|
### When the old "unixmake" scheme goes away, so does this function
|
|
|
|
###
|
|
|
|
sub build_Makefile {
|
|
|
|
run_dofile("Makefile","Makefile.in");
|
|
|
|
|
|
|
|
# Copy all Makefile.in to Makefile (except top-level)
|
|
|
|
use File::Find;
|
|
|
|
use IO::File;
|
|
|
|
find(
|
|
|
|
{
|
|
|
|
preprocess => sub {
|
|
|
|
grep(!/^\./, @_);
|
|
|
|
},
|
|
|
|
wanted => sub {
|
|
|
|
return if ($_ ne "Makefile.in" || $File::Find::dir eq ".");
|
|
|
|
my $in = IO::File->new($_, "r") or
|
|
|
|
die sprintf "Error reading Makefile.in in %s: !$\n",
|
|
|
|
$File::Find::dir;
|
|
|
|
my $out = IO::File->new("Makefile", "w") or
|
|
|
|
die sprintf "Error writing Makefile in %s: !$\n",
|
|
|
|
$File::Find::dir;
|
|
|
|
print $out "# Generated from $_, do not edit\n";
|
|
|
|
while (my $line = <$in>) { print $out $line }
|
|
|
|
$in->close() or
|
|
|
|
die sprintf "Error reading Makefile.in in %s: !$\n",
|
|
|
|
$File::Find::dir;
|
|
|
|
$out->close() or
|
|
|
|
die sprintf "Error writing Makefile in %s: !$\n",
|
|
|
|
$File::Find::dir;
|
|
|
|
},
|
2016-01-31 10:51:07 +00:00
|
|
|
},
|
2016-01-29 18:45:51 +00:00
|
|
|
".");
|
|
|
|
}
|
2016-01-12 21:25:30 +00:00
|
|
|
|
Refactor config - @MK1MF_Builds out, general build scheme in
Time to get rid of @MK1MF_Builds and introduce a more flexible
'build_scheme' configuration key. Its value may be a string or an
array of strings, meaning we need to teach resolve_config how to
handle ARRAY referenses.
The build scheme is a word that selects a function to create the
appropriate result files for a certain configuration. Currently valid
build schemes aer "mk1mf" and "unixmake", the plan is however to add
at least one other for a more universal build scheme.
Incidently, this also adds the functions 'add' and 'add_before', which
can be used in a configuration, so instead of having to repeatedly
write a sub like this:
key1 => sub { join(" ", @_, "myvalues"); },
key2 => sub { join(" ", "myvalues", @_); },
one could write this:
key1 => add(" ", "myvalues"),
key2 => add_before(" ", "myvalues"),
The good point with 'add' and 'add_before' is that they handle
inheritances where the values are a misture of scalars and ARRAYs. If
there are any ARRAY to be found, the resulting value will be an ARRAY,
otherwise it will be a scalar with all the incoming valued joined
together with the separator given as first argument to add/add_before.
Reviewed-by: Rich Salz <rsalz@openssl.org>
2015-05-18 12:31:49 +00:00
|
|
|
my %builders = (
|
2016-01-29 18:45:51 +00:00
|
|
|
unified => sub {
|
2016-01-29 23:57:33 +00:00
|
|
|
run_dofile(catfile($blddir, $target{build_file}),
|
|
|
|
$config{build_file_template},
|
|
|
|
catfile($srcdir, "Configurations", "common.tmpl"));
|
2016-01-29 18:45:51 +00:00
|
|
|
},
|
Refactor config - @MK1MF_Builds out, general build scheme in
Time to get rid of @MK1MF_Builds and introduce a more flexible
'build_scheme' configuration key. Its value may be a string or an
array of strings, meaning we need to teach resolve_config how to
handle ARRAY referenses.
The build scheme is a word that selects a function to create the
appropriate result files for a certain configuration. Currently valid
build schemes aer "mk1mf" and "unixmake", the plan is however to add
at least one other for a more universal build scheme.
Incidently, this also adds the functions 'add' and 'add_before', which
can be used in a configuration, so instead of having to repeatedly
write a sub like this:
key1 => sub { join(" ", @_, "myvalues"); },
key2 => sub { join(" ", "myvalues", @_); },
one could write this:
key1 => add(" ", "myvalues"),
key2 => add_before(" ", "myvalues"),
The good point with 'add' and 'add_before' is that they handle
inheritances where the values are a misture of scalars and ARRAYs. If
there are any ARRAY to be found, the resulting value will be an ARRAY,
otherwise it will be a scalar with all the incoming valued joined
together with the separator given as first argument to add/add_before.
Reviewed-by: Rich Salz <rsalz@openssl.org>
2015-05-18 12:31:49 +00:00
|
|
|
unixmake => sub {
|
2016-01-29 18:45:51 +00:00
|
|
|
build_Makefile();
|
|
|
|
|
|
|
|
run_dofile("util/domd", "util/domd.in");
|
|
|
|
chmod 0755, "util/domd";
|
Refactor config - @MK1MF_Builds out, general build scheme in
Time to get rid of @MK1MF_Builds and introduce a more flexible
'build_scheme' configuration key. Its value may be a string or an
array of strings, meaning we need to teach resolve_config how to
handle ARRAY referenses.
The build scheme is a word that selects a function to create the
appropriate result files for a certain configuration. Currently valid
build schemes aer "mk1mf" and "unixmake", the plan is however to add
at least one other for a more universal build scheme.
Incidently, this also adds the functions 'add' and 'add_before', which
can be used in a configuration, so instead of having to repeatedly
write a sub like this:
key1 => sub { join(" ", @_, "myvalues"); },
key2 => sub { join(" ", "myvalues", @_); },
one could write this:
key1 => add(" ", "myvalues"),
key2 => add_before(" ", "myvalues"),
The good point with 'add' and 'add_before' is that they handle
inheritances where the values are a misture of scalars and ARRAYs. If
there are any ARRAY to be found, the resulting value will be an ARRAY,
otherwise it will be a scalar with all the incoming valued joined
together with the separator given as first argument to add/add_before.
Reviewed-by: Rich Salz <rsalz@openssl.org>
2015-05-18 12:31:49 +00:00
|
|
|
},
|
|
|
|
mk1mf => sub {
|
2016-01-29 23:57:33 +00:00
|
|
|
my $platform = shift;
|
2016-01-29 18:45:51 +00:00
|
|
|
# The only reason we do this is to have something to build MINFO from
|
|
|
|
build_Makefile();
|
|
|
|
|
Refactor config - @MK1MF_Builds out, general build scheme in
Time to get rid of @MK1MF_Builds and introduce a more flexible
'build_scheme' configuration key. Its value may be a string or an
array of strings, meaning we need to teach resolve_config how to
handle ARRAY referenses.
The build scheme is a word that selects a function to create the
appropriate result files for a certain configuration. Currently valid
build schemes aer "mk1mf" and "unixmake", the plan is however to add
at least one other for a more universal build scheme.
Incidently, this also adds the functions 'add' and 'add_before', which
can be used in a configuration, so instead of having to repeatedly
write a sub like this:
key1 => sub { join(" ", @_, "myvalues"); },
key2 => sub { join(" ", "myvalues", @_); },
one could write this:
key1 => add(" ", "myvalues"),
key2 => add_before(" ", "myvalues"),
The good point with 'add' and 'add_before' is that they handle
inheritances where the values are a misture of scalars and ARRAYs. If
there are any ARRAY to be found, the resulting value will be an ARRAY,
otherwise it will be a scalar with all the incoming valued joined
together with the separator given as first argument to add/add_before.
Reviewed-by: Rich Salz <rsalz@openssl.org>
2015-05-18 12:31:49 +00:00
|
|
|
# create the ms/version32.rc file if needed
|
2016-02-09 21:53:14 +00:00
|
|
|
if ($platform ne "netware") {
|
Refactor config - @MK1MF_Builds out, general build scheme in
Time to get rid of @MK1MF_Builds and introduce a more flexible
'build_scheme' configuration key. Its value may be a string or an
array of strings, meaning we need to teach resolve_config how to
handle ARRAY referenses.
The build scheme is a word that selects a function to create the
appropriate result files for a certain configuration. Currently valid
build schemes aer "mk1mf" and "unixmake", the plan is however to add
at least one other for a more universal build scheme.
Incidently, this also adds the functions 'add' and 'add_before', which
can be used in a configuration, so instead of having to repeatedly
write a sub like this:
key1 => sub { join(" ", @_, "myvalues"); },
key2 => sub { join(" ", "myvalues", @_); },
one could write this:
key1 => add(" ", "myvalues"),
key2 => add_before(" ", "myvalues"),
The good point with 'add' and 'add_before' is that they handle
inheritances where the values are a misture of scalars and ARRAYs. If
there are any ARRAY to be found, the resulting value will be an ARRAY,
otherwise it will be a scalar with all the incoming valued joined
together with the separator given as first argument to add/add_before.
Reviewed-by: Rich Salz <rsalz@openssl.org>
2015-05-18 12:31:49 +00:00
|
|
|
my ($v1, $v2, $v3, $v4);
|
2016-01-11 23:17:12 +00:00
|
|
|
if ($config{version_num} =~ /^0x([0-9a-f]{1})([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{1})L$/i) {
|
2002-10-04 21:22:47 +00:00
|
|
|
$v1=hex $1;
|
|
|
|
$v2=hex $2;
|
|
|
|
$v3=hex $3;
|
|
|
|
$v4=hex $4;
|
Refactor config - @MK1MF_Builds out, general build scheme in
Time to get rid of @MK1MF_Builds and introduce a more flexible
'build_scheme' configuration key. Its value may be a string or an
array of strings, meaning we need to teach resolve_config how to
handle ARRAY referenses.
The build scheme is a word that selects a function to create the
appropriate result files for a certain configuration. Currently valid
build schemes aer "mk1mf" and "unixmake", the plan is however to add
at least one other for a more universal build scheme.
Incidently, this also adds the functions 'add' and 'add_before', which
can be used in a configuration, so instead of having to repeatedly
write a sub like this:
key1 => sub { join(" ", @_, "myvalues"); },
key2 => sub { join(" ", "myvalues", @_); },
one could write this:
key1 => add(" ", "myvalues"),
key2 => add_before(" ", "myvalues"),
The good point with 'add' and 'add_before' is that they handle
inheritances where the values are a misture of scalars and ARRAYs. If
there are any ARRAY to be found, the resulting value will be an ARRAY,
otherwise it will be a scalar with all the incoming valued joined
together with the separator given as first argument to add/add_before.
Reviewed-by: Rich Salz <rsalz@openssl.org>
2015-05-18 12:31:49 +00:00
|
|
|
}
|
|
|
|
open (OUT,">ms/version32.rc") || die "Can't open ms/version32.rc";
|
|
|
|
print OUT <<"EOF";
|
2002-10-04 21:22:47 +00:00
|
|
|
#include <winver.h>
|
|
|
|
|
|
|
|
LANGUAGE 0x09,0x01
|
|
|
|
|
|
|
|
1 VERSIONINFO
|
|
|
|
FILEVERSION $v1,$v2,$v3,$v4
|
|
|
|
PRODUCTVERSION $v1,$v2,$v3,$v4
|
|
|
|
FILEFLAGSMASK 0x3fL
|
|
|
|
#ifdef _DEBUG
|
|
|
|
FILEFLAGS 0x01L
|
|
|
|
#else
|
|
|
|
FILEFLAGS 0x00L
|
|
|
|
#endif
|
|
|
|
FILEOS VOS__WINDOWS32
|
|
|
|
FILETYPE VFT_DLL
|
|
|
|
FILESUBTYPE 0x0L
|
|
|
|
BEGIN
|
|
|
|
BLOCK "StringFileInfo"
|
|
|
|
BEGIN
|
|
|
|
BLOCK "040904b0"
|
|
|
|
BEGIN
|
2014-05-26 16:19:28 +00:00
|
|
|
// Required:
|
2002-10-04 21:22:47 +00:00
|
|
|
VALUE "CompanyName", "The OpenSSL Project, http://www.openssl.org/\\0"
|
|
|
|
VALUE "FileDescription", "OpenSSL Shared Library\\0"
|
2016-01-11 23:17:12 +00:00
|
|
|
VALUE "FileVersion", "$config{version}\\0"
|
2002-10-04 21:22:47 +00:00
|
|
|
#if defined(CRYPTO)
|
|
|
|
VALUE "InternalName", "libeay32\\0"
|
|
|
|
VALUE "OriginalFilename", "libeay32.dll\\0"
|
|
|
|
#elif defined(SSL)
|
|
|
|
VALUE "InternalName", "ssleay32\\0"
|
|
|
|
VALUE "OriginalFilename", "ssleay32.dll\\0"
|
2015-02-04 22:51:01 +00:00
|
|
|
#endif
|
2002-10-04 21:22:47 +00:00
|
|
|
VALUE "ProductName", "The OpenSSL Toolkit\\0"
|
2016-01-11 23:17:12 +00:00
|
|
|
VALUE "ProductVersion", "$config{version}\\0"
|
2002-10-04 21:22:47 +00:00
|
|
|
// Optional:
|
|
|
|
//VALUE "Comments", "\\0"
|
2015-09-27 07:23:08 +00:00
|
|
|
VALUE "LegalCopyright", "Copyright © 1998-2015 The OpenSSL Project. Copyright © 1995-1998 Eric A. Young, Tim J. Hudson. All rights reserved.\\0"
|
2002-10-04 21:22:47 +00:00
|
|
|
//VALUE "LegalTrademarks", "\\0"
|
|
|
|
//VALUE "PrivateBuild", "\\0"
|
|
|
|
//VALUE "SpecialBuild", "\\0"
|
|
|
|
END
|
|
|
|
END
|
|
|
|
BLOCK "VarFileInfo"
|
|
|
|
BEGIN
|
|
|
|
VALUE "Translation", 0x409, 0x4b0
|
|
|
|
END
|
|
|
|
END
|
|
|
|
EOF
|
Refactor config - @MK1MF_Builds out, general build scheme in
Time to get rid of @MK1MF_Builds and introduce a more flexible
'build_scheme' configuration key. Its value may be a string or an
array of strings, meaning we need to teach resolve_config how to
handle ARRAY referenses.
The build scheme is a word that selects a function to create the
appropriate result files for a certain configuration. Currently valid
build schemes aer "mk1mf" and "unixmake", the plan is however to add
at least one other for a more universal build scheme.
Incidently, this also adds the functions 'add' and 'add_before', which
can be used in a configuration, so instead of having to repeatedly
write a sub like this:
key1 => sub { join(" ", @_, "myvalues"); },
key2 => sub { join(" ", "myvalues", @_); },
one could write this:
key1 => add(" ", "myvalues"),
key2 => add_before(" ", "myvalues"),
The good point with 'add' and 'add_before' is that they handle
inheritances where the values are a misture of scalars and ARRAYs. If
there are any ARRAY to be found, the resulting value will be an ARRAY,
otherwise it will be a scalar with all the incoming valued joined
together with the separator given as first argument to add/add_before.
Reviewed-by: Rich Salz <rsalz@openssl.org>
2015-05-18 12:31:49 +00:00
|
|
|
close(OUT);
|
|
|
|
}
|
|
|
|
},
|
|
|
|
);
|
|
|
|
|
2016-01-29 23:57:33 +00:00
|
|
|
$builders{$builder}->($builder_platform, @builder_opts);
|
2014-05-26 16:19:28 +00:00
|
|
|
|
2015-05-18 00:46:21 +00:00
|
|
|
print <<"EOF";
|
1999-09-09 20:21:10 +00:00
|
|
|
|
2000-02-01 01:35:29 +00:00
|
|
|
Configured for $target.
|
1999-09-09 20:21:10 +00:00
|
|
|
EOF
|
1999-04-29 16:10:09 +00:00
|
|
|
|
2015-05-18 00:46:21 +00:00
|
|
|
print <<"EOF" if (!$no_threads && !$threads);
|
1999-04-29 16:10:09 +00:00
|
|
|
|
|
|
|
The library could not be configured for supporting multi-threaded
|
|
|
|
applications as the compiler options required on this system are not known.
|
1999-06-26 21:25:01 +00:00
|
|
|
See file INSTALL for details if you need multi-threading.
|
1999-04-23 22:13:45 +00:00
|
|
|
EOF
|
|
|
|
|
2015-05-18 00:46:21 +00:00
|
|
|
print <<"EOF" if ($no_shared_warn);
|
2003-01-11 11:40:39 +00:00
|
|
|
|
2015-12-10 17:31:01 +00:00
|
|
|
You gave the option 'shared', which is not supported on this platform, so
|
|
|
|
we will pretend you gave the option 'no-shared'. If you know how to implement
|
|
|
|
shared libraries, please let us know (but please first make sure you have
|
|
|
|
tried with a current version of OpenSSL).
|
|
|
|
EOF
|
|
|
|
|
2016-01-30 02:31:52 +00:00
|
|
|
###### TO BE REMOVED BEFORE FINAL RELEASE
|
|
|
|
######
|
|
|
|
###### If the user hasn't chosen --unified, try to nudge them.
|
|
|
|
if ($target{build_file} eq "Makefile"
|
|
|
|
&& $target{build_scheme}->[0] eq "unixmake"
|
|
|
|
&& !$unified) {
|
|
|
|
|
|
|
|
my $plausible_builddir =
|
|
|
|
abs2rel(rel2abs("../_openssl-build_$target"),rel2abs("."));
|
|
|
|
my $plausible_to_sourcedir =
|
|
|
|
abs2rel(rel2abs("."),rel2abs("../_openssl-build_$target"));
|
|
|
|
print <<"EOF";
|
|
|
|
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
Please consider configuring with the flag --unified .
|
|
|
|
It's to test out a new "unified" building system.
|
|
|
|
|
|
|
|
One cool feature is that you can have your build directory elsewhere,
|
|
|
|
for example:
|
|
|
|
|
|
|
|
make clean # Clean the current configuration away
|
|
|
|
mkdir $plausible_builddir
|
|
|
|
cd $plausible_builddir
|
|
|
|
$plausible_to_sourcedir/config --unified
|
|
|
|
make
|
|
|
|
make test
|
|
|
|
|
|
|
|
Please report any problem you have.
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
|
|
|
|
EOF
|
|
|
|
}
|
|
|
|
|
1998-12-21 10:52:47 +00:00
|
|
|
exit(0);
|
|
|
|
|
2015-05-18 00:57:24 +00:00
|
|
|
######################################################################
|
|
|
|
#
|
|
|
|
# Helpers and utility functions
|
|
|
|
#
|
|
|
|
|
|
|
|
# Configuration file reading #########################################
|
|
|
|
|
|
|
|
# Helper function to implement conditional inheritance depending on the
|
|
|
|
# value of $no_asm. Used in inherit_from values as follows:
|
|
|
|
#
|
|
|
|
# inherit_from => [ "template", asm("asm_tmpl") ]
|
|
|
|
#
|
|
|
|
sub asm {
|
|
|
|
my @x = @_;
|
|
|
|
sub {
|
|
|
|
$no_asm ? () : @x;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Refactor config - @MK1MF_Builds out, general build scheme in
Time to get rid of @MK1MF_Builds and introduce a more flexible
'build_scheme' configuration key. Its value may be a string or an
array of strings, meaning we need to teach resolve_config how to
handle ARRAY referenses.
The build scheme is a word that selects a function to create the
appropriate result files for a certain configuration. Currently valid
build schemes aer "mk1mf" and "unixmake", the plan is however to add
at least one other for a more universal build scheme.
Incidently, this also adds the functions 'add' and 'add_before', which
can be used in a configuration, so instead of having to repeatedly
write a sub like this:
key1 => sub { join(" ", @_, "myvalues"); },
key2 => sub { join(" ", "myvalues", @_); },
one could write this:
key1 => add(" ", "myvalues"),
key2 => add_before(" ", "myvalues"),
The good point with 'add' and 'add_before' is that they handle
inheritances where the values are a misture of scalars and ARRAYs. If
there are any ARRAY to be found, the resulting value will be an ARRAY,
otherwise it will be a scalar with all the incoming valued joined
together with the separator given as first argument to add/add_before.
Reviewed-by: Rich Salz <rsalz@openssl.org>
2015-05-18 12:31:49 +00:00
|
|
|
# Helper function to implement adding values to already existing configuration
|
|
|
|
# values. It handles elements that are ARRAYs, CODEs and scalars
|
|
|
|
sub _add {
|
|
|
|
my $separator = shift;
|
|
|
|
|
2016-01-30 01:17:05 +00:00
|
|
|
# If there's any ARRAY in the collection of values OR the separator
|
|
|
|
# is undef, we will return an ARRAY of combined values, otherwise a
|
|
|
|
# string of joined values with $separator as the separator.
|
|
|
|
my $found_array = !defined($separator);
|
Refactor config - @MK1MF_Builds out, general build scheme in
Time to get rid of @MK1MF_Builds and introduce a more flexible
'build_scheme' configuration key. Its value may be a string or an
array of strings, meaning we need to teach resolve_config how to
handle ARRAY referenses.
The build scheme is a word that selects a function to create the
appropriate result files for a certain configuration. Currently valid
build schemes aer "mk1mf" and "unixmake", the plan is however to add
at least one other for a more universal build scheme.
Incidently, this also adds the functions 'add' and 'add_before', which
can be used in a configuration, so instead of having to repeatedly
write a sub like this:
key1 => sub { join(" ", @_, "myvalues"); },
key2 => sub { join(" ", "myvalues", @_); },
one could write this:
key1 => add(" ", "myvalues"),
key2 => add_before(" ", "myvalues"),
The good point with 'add' and 'add_before' is that they handle
inheritances where the values are a misture of scalars and ARRAYs. If
there are any ARRAY to be found, the resulting value will be an ARRAY,
otherwise it will be a scalar with all the incoming valued joined
together with the separator given as first argument to add/add_before.
Reviewed-by: Rich Salz <rsalz@openssl.org>
2015-05-18 12:31:49 +00:00
|
|
|
|
|
|
|
my @values =
|
|
|
|
map {
|
|
|
|
if (ref($_) eq "ARRAY") {
|
|
|
|
$found_array = 1;
|
|
|
|
@$_;
|
|
|
|
} else {
|
|
|
|
$_;
|
|
|
|
}
|
|
|
|
} (@_);
|
|
|
|
|
|
|
|
if ($found_array) {
|
|
|
|
[ @values ];
|
|
|
|
} else {
|
|
|
|
join($separator, @values);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
sub add_before {
|
|
|
|
my $separator = shift;
|
|
|
|
my @x = @_;
|
|
|
|
sub { _add($separator, @x, @_) };
|
|
|
|
}
|
|
|
|
sub add {
|
|
|
|
my $separator = shift;
|
|
|
|
my @x = @_;
|
|
|
|
sub { _add($separator, @_, @x) };
|
|
|
|
}
|
|
|
|
|
2015-05-18 00:57:24 +00:00
|
|
|
# configuration reader, evaluates the input file as a perl script and expects
|
|
|
|
# it to fill %targets with target configurations. Those are then added to
|
|
|
|
# %table.
|
|
|
|
sub read_config {
|
|
|
|
my $fname = shift;
|
|
|
|
open(CONFFILE, "< $fname")
|
|
|
|
or die "Can't open configuration file '$fname'!\n";
|
|
|
|
my $x = $/;
|
|
|
|
undef $/;
|
|
|
|
my $content = <CONFFILE>;
|
|
|
|
$/ = $x;
|
|
|
|
close(CONFFILE);
|
|
|
|
my %targets = ();
|
|
|
|
{
|
|
|
|
local %table = %::table; # Protect %table from tampering
|
|
|
|
|
|
|
|
eval $content;
|
|
|
|
warn $@ if $@;
|
|
|
|
}
|
|
|
|
|
|
|
|
# For each target, check that it's configured with a hash table.
|
|
|
|
foreach (keys %targets) {
|
|
|
|
if (ref($targets{$_}) ne "HASH") {
|
|
|
|
if (ref($targets{$_}) eq "") {
|
|
|
|
warn "Deprecated target configuration for $_, ignoring...\n";
|
|
|
|
} else {
|
|
|
|
warn "Misconfigured target configuration for $_ (should be a hash table), ignoring...\n";
|
|
|
|
}
|
|
|
|
delete $targets{$_};
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
%table = (%table, %targets);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
# configuration resolver. Will only resolve all the lazy evalutation
|
|
|
|
# codeblocks for the chozen target and all those it inherits from,
|
|
|
|
# recursively
|
|
|
|
sub resolve_config {
|
|
|
|
my $target = shift;
|
|
|
|
my @breadcrumbs = @_;
|
|
|
|
|
|
|
|
if (grep { $_ eq $target } @breadcrumbs) {
|
|
|
|
die "inherit_from loop! target backtrace:\n "
|
|
|
|
,$target,"\n ",join("\n ", @breadcrumbs),"\n";
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!defined($table{$target})) {
|
|
|
|
warn "Warning! target $target doesn't exist!\n";
|
|
|
|
return ();
|
|
|
|
}
|
|
|
|
# Recurse through all inheritances. They will be resolved on the
|
|
|
|
# fly, so when this operation is done, they will all just be a
|
|
|
|
# bunch of attributes with string values.
|
|
|
|
# What we get here, though, are keys with references to lists of
|
|
|
|
# the combined values of them all. We will deal with lists after
|
|
|
|
# this stage is done.
|
|
|
|
my %combined_inheritance = ();
|
|
|
|
if ($table{$target}->{inherit_from}) {
|
|
|
|
my @inherit_from =
|
|
|
|
map { ref($_) eq "CODE" ? $_->() : $_ } @{$table{$target}->{inherit_from}};
|
|
|
|
foreach (@inherit_from) {
|
|
|
|
my %inherited_config = resolve_config($_, $target, @breadcrumbs);
|
|
|
|
|
|
|
|
# 'template' is a marker that's considered private to
|
|
|
|
# the config that had it.
|
|
|
|
delete $inherited_config{template};
|
|
|
|
|
|
|
|
map {
|
|
|
|
if (!$combined_inheritance{$_}) {
|
|
|
|
$combined_inheritance{$_} = [];
|
|
|
|
}
|
|
|
|
push @{$combined_inheritance{$_}}, $inherited_config{$_};
|
|
|
|
} keys %inherited_config;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
# We won't need inherit_from in this target any more, since we've
|
|
|
|
# resolved all the inheritances that lead to this
|
|
|
|
delete $table{$target}->{inherit_from};
|
|
|
|
|
|
|
|
# Now is the time to deal with those lists. Here's the place to
|
|
|
|
# decide what shall be done with those lists, all based on the
|
|
|
|
# values of the target we're currently dealing with.
|
|
|
|
# - If a value is a coderef, it will be executed with the list of
|
|
|
|
# inherited values as arguments.
|
|
|
|
# - If the corresponding key doesn't have a value at all or is the
|
|
|
|
# emoty string, the inherited value list will be run through the
|
|
|
|
# default combiner (below), and the result becomes this target's
|
|
|
|
# value.
|
|
|
|
# - Otherwise, this target's value is assumed to be a string that
|
|
|
|
# will simply override the inherited list of values.
|
Refactor config - @MK1MF_Builds out, general build scheme in
Time to get rid of @MK1MF_Builds and introduce a more flexible
'build_scheme' configuration key. Its value may be a string or an
array of strings, meaning we need to teach resolve_config how to
handle ARRAY referenses.
The build scheme is a word that selects a function to create the
appropriate result files for a certain configuration. Currently valid
build schemes aer "mk1mf" and "unixmake", the plan is however to add
at least one other for a more universal build scheme.
Incidently, this also adds the functions 'add' and 'add_before', which
can be used in a configuration, so instead of having to repeatedly
write a sub like this:
key1 => sub { join(" ", @_, "myvalues"); },
key2 => sub { join(" ", "myvalues", @_); },
one could write this:
key1 => add(" ", "myvalues"),
key2 => add_before(" ", "myvalues"),
The good point with 'add' and 'add_before' is that they handle
inheritances where the values are a misture of scalars and ARRAYs. If
there are any ARRAY to be found, the resulting value will be an ARRAY,
otherwise it will be a scalar with all the incoming valued joined
together with the separator given as first argument to add/add_before.
Reviewed-by: Rich Salz <rsalz@openssl.org>
2015-05-18 12:31:49 +00:00
|
|
|
my $default_combiner = add(" ");
|
2015-05-18 00:57:24 +00:00
|
|
|
|
|
|
|
my %all_keys =
|
|
|
|
map { $_ => 1 } (keys %combined_inheritance,
|
|
|
|
keys %{$table{$target}});
|
|
|
|
foreach (sort keys %all_keys) {
|
|
|
|
|
|
|
|
# Current target doesn't have a value for the current key?
|
|
|
|
# Assign it the default combiner, the rest of this loop body
|
|
|
|
# will handle it just like any other coderef.
|
|
|
|
if (!exists $table{$target}->{$_}) {
|
|
|
|
$table{$target}->{$_} = $default_combiner;
|
|
|
|
}
|
|
|
|
|
|
|
|
my $valuetype = ref($table{$target}->{$_});
|
|
|
|
if ($valuetype eq "CODE") {
|
|
|
|
# CODE reference, execute it with the inherited values as
|
|
|
|
# arguments.
|
|
|
|
$table{$target}->{$_} =
|
|
|
|
$table{$target}->{$_}->(@{$combined_inheritance{$_}});
|
Refactor config - @MK1MF_Builds out, general build scheme in
Time to get rid of @MK1MF_Builds and introduce a more flexible
'build_scheme' configuration key. Its value may be a string or an
array of strings, meaning we need to teach resolve_config how to
handle ARRAY referenses.
The build scheme is a word that selects a function to create the
appropriate result files for a certain configuration. Currently valid
build schemes aer "mk1mf" and "unixmake", the plan is however to add
at least one other for a more universal build scheme.
Incidently, this also adds the functions 'add' and 'add_before', which
can be used in a configuration, so instead of having to repeatedly
write a sub like this:
key1 => sub { join(" ", @_, "myvalues"); },
key2 => sub { join(" ", "myvalues", @_); },
one could write this:
key1 => add(" ", "myvalues"),
key2 => add_before(" ", "myvalues"),
The good point with 'add' and 'add_before' is that they handle
inheritances where the values are a misture of scalars and ARRAYs. If
there are any ARRAY to be found, the resulting value will be an ARRAY,
otherwise it will be a scalar with all the incoming valued joined
together with the separator given as first argument to add/add_before.
Reviewed-by: Rich Salz <rsalz@openssl.org>
2015-05-18 12:31:49 +00:00
|
|
|
} elsif ($valuetype eq "ARRAY" || $valuetype eq "") {
|
|
|
|
# ARRAY or Scalar, just leave it as is.
|
2015-05-18 00:57:24 +00:00
|
|
|
} else {
|
|
|
|
# Some other type of reference that we don't handle.
|
|
|
|
# Better to abort at this point.
|
|
|
|
die "cannot handle reference type $valuetype,"
|
|
|
|
," found in target $target -> $_\n";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
# Finally done, return the result.
|
|
|
|
return %{$table{$target}};
|
|
|
|
}
|
|
|
|
|
1999-04-24 22:59:36 +00:00
|
|
|
sub usage
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
1999-04-24 22:59:36 +00:00
|
|
|
print STDERR $usage;
|
2000-02-21 00:55:45 +00:00
|
|
|
print STDERR "\npick os/compiler from:\n";
|
1998-12-28 17:08:48 +00:00
|
|
|
my $j=0;
|
1999-02-07 18:22:15 +00:00
|
|
|
my $i;
|
2000-02-21 00:55:45 +00:00
|
|
|
my $k=0;
|
1999-02-07 18:22:15 +00:00
|
|
|
foreach $i (sort keys %table)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
2015-05-18 00:57:24 +00:00
|
|
|
next if $table{$i}->{template};
|
1999-04-24 22:59:36 +00:00
|
|
|
next if $i =~ /^debug/;
|
2000-02-21 00:55:45 +00:00
|
|
|
$k += length($i) + 1;
|
|
|
|
if ($k > 78)
|
|
|
|
{
|
|
|
|
print STDERR "\n";
|
|
|
|
$k=length($i);
|
|
|
|
}
|
|
|
|
print STDERR $i . " ";
|
1999-04-24 22:59:36 +00:00
|
|
|
}
|
|
|
|
foreach $i (sort keys %table)
|
|
|
|
{
|
2015-05-18 00:57:24 +00:00
|
|
|
next if $table{$i}->{template};
|
1999-04-24 22:59:36 +00:00
|
|
|
next if $i !~ /^debug/;
|
2000-02-21 00:55:45 +00:00
|
|
|
$k += length($i) + 1;
|
|
|
|
if ($k > 78)
|
|
|
|
{
|
|
|
|
print STDERR "\n";
|
|
|
|
$k=length($i);
|
|
|
|
}
|
|
|
|
print STDERR $i . " ";
|
1998-12-21 10:52:47 +00:00
|
|
|
}
|
2000-02-21 00:55:45 +00:00
|
|
|
print STDERR "\n\nNOTE: If in doubt, on Unix-ish systems use './config'.\n";
|
1999-04-24 22:59:36 +00:00
|
|
|
exit(1);
|
1998-12-21 10:52:47 +00:00
|
|
|
}
|
|
|
|
|
2015-05-20 18:03:20 +00:00
|
|
|
sub run_dofile()
|
|
|
|
{
|
|
|
|
my $out = shift;
|
2016-01-29 18:45:51 +00:00
|
|
|
my @templates = @_;
|
2015-05-20 18:03:20 +00:00
|
|
|
|
2016-01-29 18:29:45 +00:00
|
|
|
unlink $out || warn "Can't remove $out, $!"
|
|
|
|
if -f $out;
|
2016-01-29 18:45:51 +00:00
|
|
|
foreach (@templates) {
|
|
|
|
die "Can't open $_, $!" unless -f $_;
|
|
|
|
}
|
|
|
|
my $cmd = "$config{perl} \"-I.\" \"-Mconfigdata\" $dofile -o\"Configure\" \"".join("\" \"",@templates)."\" > \"$out.new\"";
|
|
|
|
#print STDERR "DEBUG[run_dofile]: \$cmd = $cmd\n";
|
|
|
|
system($cmd);
|
2015-05-20 18:03:20 +00:00
|
|
|
exit 1 if $? != 0;
|
|
|
|
rename("$out.new", $out) || die "Can't rename $out.new, $!";
|
|
|
|
}
|
|
|
|
|
2015-05-18 10:53:38 +00:00
|
|
|
# Configuration printer ##############################################
|
|
|
|
|
|
|
|
sub print_table_entry
|
|
|
|
{
|
|
|
|
my $target = shift;
|
|
|
|
my %target = resolve_config($target);
|
|
|
|
my $type = shift;
|
|
|
|
|
|
|
|
# Don't print the templates
|
|
|
|
return if $target{template};
|
|
|
|
|
|
|
|
my @sequence = (
|
2016-01-25 20:51:22 +00:00
|
|
|
"sys_id",
|
2015-05-18 10:53:38 +00:00
|
|
|
"cc",
|
|
|
|
"cflags",
|
2016-01-30 01:17:05 +00:00
|
|
|
"defines",
|
2015-05-18 10:53:38 +00:00
|
|
|
"debug_cflags",
|
2016-01-30 01:17:05 +00:00
|
|
|
"debug_defines",
|
2015-05-18 10:53:38 +00:00
|
|
|
"release_cflags",
|
2016-01-30 01:17:05 +00:00
|
|
|
"release_defines",
|
2015-05-18 10:53:38 +00:00
|
|
|
"thread_cflag",
|
2016-01-25 20:51:22 +00:00
|
|
|
"unistd",
|
|
|
|
"ld",
|
2015-05-18 10:53:38 +00:00
|
|
|
"lflags",
|
Enhance and clear the support of linker flags
Some time ago, we had a ex_libs configuration setting that could be
divided into lflags and ex_libs. These got divided in two settings,
lflags and ex_libs, and the former was interpreted to be general
linking flags.
Unfortunately, that conclusion wasn't entirely accurate. Most of
those linking were meant to end up in a very precise position on the
linking command line, just before the spec of libraries the linking
depends on.
Back to the drawing board, we're diving things further, now having
lflags, which are linking flags that aren't depending on command line
position, plib_lflags, which are linking flags that should show up just
before the spec of libraries to depend on, and finally ex_libs, which
is the spec of extra libraries to depend on.
Also, documentation is changed in Configurations/README. This was
previously forgotten.
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
2016-02-05 10:47:14 +00:00
|
|
|
"plib_lflags",
|
2016-01-29 17:07:37 +00:00
|
|
|
"ex_libs",
|
2015-05-18 10:53:38 +00:00
|
|
|
"debug_lflags",
|
Enhance and clear the support of linker flags
Some time ago, we had a ex_libs configuration setting that could be
divided into lflags and ex_libs. These got divided in two settings,
lflags and ex_libs, and the former was interpreted to be general
linking flags.
Unfortunately, that conclusion wasn't entirely accurate. Most of
those linking were meant to end up in a very precise position on the
linking command line, just before the spec of libraries the linking
depends on.
Back to the drawing board, we're diving things further, now having
lflags, which are linking flags that aren't depending on command line
position, plib_lflags, which are linking flags that should show up just
before the spec of libraries to depend on, and finally ex_libs, which
is the spec of extra libraries to depend on.
Also, documentation is changed in Configurations/README. This was
previously forgotten.
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
2016-02-05 10:47:14 +00:00
|
|
|
"debug_plib_lflags",
|
2016-01-29 17:07:37 +00:00
|
|
|
"debug_ex_libs",
|
2015-05-18 10:53:38 +00:00
|
|
|
"release_lflags",
|
Enhance and clear the support of linker flags
Some time ago, we had a ex_libs configuration setting that could be
divided into lflags and ex_libs. These got divided in two settings,
lflags and ex_libs, and the former was interpreted to be general
linking flags.
Unfortunately, that conclusion wasn't entirely accurate. Most of
those linking were meant to end up in a very precise position on the
linking command line, just before the spec of libraries the linking
depends on.
Back to the drawing board, we're diving things further, now having
lflags, which are linking flags that aren't depending on command line
position, plib_lflags, which are linking flags that should show up just
before the spec of libraries to depend on, and finally ex_libs, which
is the spec of extra libraries to depend on.
Also, documentation is changed in Configurations/README. This was
previously forgotten.
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
2016-02-05 10:47:14 +00:00
|
|
|
"release_plib_lflags",
|
2016-01-29 17:07:37 +00:00
|
|
|
"release_ex_libs",
|
2015-05-18 10:53:38 +00:00
|
|
|
"bn_ops",
|
|
|
|
"cpuid_obj",
|
|
|
|
"bn_obj",
|
|
|
|
"ec_obj",
|
|
|
|
"des_obj",
|
|
|
|
"aes_obj",
|
|
|
|
"bf_obj",
|
|
|
|
"md5_obj",
|
|
|
|
"sha1_obj",
|
|
|
|
"cast_obj",
|
|
|
|
"rc4_obj",
|
|
|
|
"rmd160_obj",
|
|
|
|
"rc5_obj",
|
|
|
|
"wp_obj",
|
|
|
|
"cmll_obj",
|
|
|
|
"modes_obj",
|
2016-01-25 20:51:22 +00:00
|
|
|
"padlock_obj",
|
2015-05-18 10:53:38 +00:00
|
|
|
"perlasm_scheme",
|
|
|
|
"dso_scheme",
|
|
|
|
"shared_target",
|
|
|
|
"shared_cflag",
|
|
|
|
"shared_ldflag",
|
2016-02-05 14:17:33 +00:00
|
|
|
"shared_rcflag",
|
2015-05-18 10:53:38 +00:00
|
|
|
"shared_extension",
|
2016-01-25 20:51:22 +00:00
|
|
|
"obj_extension",
|
|
|
|
"exe_extension",
|
2015-05-18 10:53:38 +00:00
|
|
|
"ranlib",
|
2016-01-25 20:51:22 +00:00
|
|
|
"ar",
|
2015-05-18 10:53:38 +00:00
|
|
|
"arflags",
|
|
|
|
"multilib",
|
2016-01-25 20:51:22 +00:00
|
|
|
"build_scheme",
|
2015-05-18 10:53:38 +00:00
|
|
|
);
|
|
|
|
|
|
|
|
if ($type eq "TABLE") {
|
|
|
|
print "\n";
|
|
|
|
print "*** $target\n";
|
|
|
|
printf "\$%-12s = %s\n", $_, $target{$_} foreach (@sequence);
|
|
|
|
} elsif ($type eq "HASH") {
|
|
|
|
my $largest =
|
|
|
|
length((sort { length($a) <=> length($b) } @sequence)[-1]);
|
|
|
|
print " '$target' => {\n";
|
|
|
|
foreach (@sequence) {
|
|
|
|
if ($target{$_}) {
|
|
|
|
print " '",$_,"'"," " x ($largest - length($_))," => '",$target{$_},"',\n";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
print " },\n";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
# Utility routines ###################################################
|
|
|
|
|
2016-02-10 01:00:37 +00:00
|
|
|
# On VMS, if the given file is a logical name, File::Spec::Functions
|
|
|
|
# will consider it an absolute path. There are cases when we want a
|
|
|
|
# purely syntactic check without checking the environment.
|
|
|
|
sub isabsolute {
|
|
|
|
my $file = shift;
|
|
|
|
|
|
|
|
# On non-platforms, we just use file_name_is_absolute().
|
|
|
|
return file_name_is_absolute($file) unless $^O eq "VMS";
|
|
|
|
|
|
|
|
# If the file spec includes a device or a directpry spec,
|
|
|
|
# file_name_is_absolute() is perfectly safe.
|
|
|
|
return file_name_is_absolute($file) if $file =~ m|[:\[]|;
|
|
|
|
|
|
|
|
# Here, we know the given file spec isn't absolute
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-02-09 09:15:13 +00:00
|
|
|
# Makes a directory absolute and cleans out /../ in paths like foo/../bar
|
|
|
|
# On some platforms, this uses rel2abs(), while on others, realpath() is used.
|
|
|
|
# realpath() requires that at least all path components except the last is an
|
|
|
|
# existing directory. On VMS, the last component of the directory spec must
|
|
|
|
# exist.
|
|
|
|
sub absolutedir {
|
|
|
|
my $dir = shift;
|
|
|
|
|
|
|
|
# realpath() is quite buggy on VMS. It uses LIB$FID_TO_NAME, which
|
|
|
|
# will return the volume name for the device, no matter what. Also,
|
|
|
|
# it will return an incorrect directory spec if the argument is a
|
|
|
|
# directory that doesn't exist.
|
|
|
|
if ($^O eq "VMS") {
|
|
|
|
return rel2abs($dir);
|
|
|
|
}
|
|
|
|
|
|
|
|
# We use realpath() on Unix, since no other will properly clean out
|
|
|
|
# a directory spec.
|
|
|
|
use Cwd qw/realpath/;
|
|
|
|
|
|
|
|
return realpath($dir);
|
|
|
|
}
|
|
|
|
|
1999-04-01 12:34:33 +00:00
|
|
|
sub which
|
|
|
|
{
|
|
|
|
my($name)=@_;
|
|
|
|
my $path;
|
|
|
|
foreach $path (split /:/, $ENV{PATH})
|
|
|
|
{
|
2015-05-20 18:03:20 +00:00
|
|
|
if (-f "$path/$name$target{exe_extension}" and -x _)
|
1999-04-01 12:34:33 +00:00
|
|
|
{
|
2015-05-20 18:03:20 +00:00
|
|
|
return "$path/$name$target{exe_extension}" unless ($name eq "perl" and
|
|
|
|
system("$path/$name$target{exe_extension} -e " . '\'exit($]<5.0);\''));
|
1999-04-01 12:34:33 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-05-18 01:33:55 +00:00
|
|
|
sub quotify {
|
|
|
|
my %processors = (
|
|
|
|
perl => sub { my $x = shift;
|
|
|
|
$x =~ s/([\\\$\@"])/\\$1/g;
|
|
|
|
return '"'.$x.'"'; },
|
|
|
|
);
|
|
|
|
my $for = shift;
|
|
|
|
my $processor =
|
|
|
|
defined($processors{$for}) ? $processors{$for} : sub { shift; };
|
|
|
|
|
|
|
|
map { $processor->($_); } @_;
|
|
|
|
}
|
2015-05-20 18:03:20 +00:00
|
|
|
|
2016-01-29 18:45:51 +00:00
|
|
|
# collect_from_file($filename, $line_concat_cond_re, $line_concat)
|
|
|
|
# $filename is a file name to read from
|
|
|
|
# $line_concat_cond_re is a regexp detecting a line continuation ending
|
|
|
|
# $line_concat is a CODEref that takes care of concatenating two lines
|
|
|
|
sub collect_from_file {
|
|
|
|
my $filename = shift;
|
|
|
|
my $line_concat_cond_re = shift;
|
|
|
|
my $line_concat = shift;
|
|
|
|
|
|
|
|
open my $fh, $filename || die "unable to read $filename: $!\n";
|
|
|
|
return sub {
|
|
|
|
my $saved_line = "";
|
|
|
|
$_ = "";
|
|
|
|
while (<$fh>) {
|
2016-02-12 11:10:27 +00:00
|
|
|
s|\R$||;
|
2016-01-29 18:45:51 +00:00
|
|
|
if (defined $line_concat) {
|
|
|
|
$_ = $line_concat->($saved_line, $_);
|
|
|
|
$saved_line = "";
|
|
|
|
}
|
|
|
|
if (defined $line_concat_cond_re && /$line_concat_cond_re/) {
|
|
|
|
$saved_line = $_;
|
|
|
|
next;
|
|
|
|
}
|
|
|
|
return $_;
|
|
|
|
}
|
|
|
|
die "$filename ending with continuation line\n" if $_;
|
|
|
|
close $fh;
|
|
|
|
return undef;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
# collect_from_array($array, $line_concat_cond_re, $line_concat)
|
|
|
|
# $array is an ARRAYref of lines
|
|
|
|
# $line_concat_cond_re is a regexp detecting a line continuation ending
|
|
|
|
# $line_concat is a CODEref that takes care of concatenating two lines
|
|
|
|
sub collect_from_array {
|
|
|
|
my $array = shift;
|
|
|
|
my $line_concat_cond_re = shift;
|
|
|
|
my $line_concat = shift;
|
|
|
|
my @array = (@$array);
|
|
|
|
|
|
|
|
return sub {
|
|
|
|
my $saved_line = "";
|
|
|
|
$_ = "";
|
|
|
|
while (defined($_ = shift @array)) {
|
2016-02-12 11:10:27 +00:00
|
|
|
s|\R$||;
|
2016-01-29 18:45:51 +00:00
|
|
|
if (defined $line_concat) {
|
|
|
|
$_ = $line_concat->($saved_line, $_);
|
|
|
|
$saved_line = "";
|
|
|
|
}
|
|
|
|
if (defined $line_concat_cond_re && /$line_concat_cond_re/) {
|
|
|
|
$saved_line = $_;
|
|
|
|
next;
|
|
|
|
}
|
|
|
|
return $_;
|
|
|
|
}
|
|
|
|
die "input text ending with continuation line\n" if $_;
|
|
|
|
return undef;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
# collect_information($lineiterator, $line_continue, $regexp => $CODEref, ...)
|
|
|
|
# $lineiterator is a CODEref that delivers one line at a time.
|
2015-05-20 18:03:20 +00:00
|
|
|
# All following arguments are regex/CODEref pairs, where the regexp detects a
|
|
|
|
# line and the CODEref does something with the result of the regexp.
|
|
|
|
sub collect_information {
|
2016-01-29 18:45:51 +00:00
|
|
|
my $lineiterator = shift;
|
2015-05-20 18:03:20 +00:00
|
|
|
my %collectors = @_;
|
|
|
|
|
2016-01-29 18:45:51 +00:00
|
|
|
while(defined($_ = $lineiterator->())) {
|
2016-02-12 11:10:27 +00:00
|
|
|
s|\R$||;
|
2016-01-29 18:45:51 +00:00
|
|
|
my $found = 0;
|
|
|
|
foreach my $re (keys %collectors) {
|
|
|
|
if ($re ne "OTHERWISE" && /$re/) {
|
|
|
|
$collectors{$re}->($lineiterator);
|
|
|
|
$found = 1;
|
|
|
|
};
|
|
|
|
}
|
|
|
|
if ($collectors{"OTHERWISE"}) {
|
|
|
|
$collectors{"OTHERWISE"}->($lineiterator, $_)
|
|
|
|
unless $found || !defined $collectors{"OTHERWISE"};
|
|
|
|
}
|
2015-05-20 18:03:20 +00:00
|
|
|
}
|
|
|
|
}
|