2015-11-24 21:06:45 +08:00
|
|
|
#! /usr/bin/env perl
|
2015-11-24 13:44:58 +08:00
|
|
|
# -*- mode: perl; -*-
|
2018-01-19 17:49:22 +08:00
|
|
|
# Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
|
2016-04-20 22:20:59 +08:00
|
|
|
#
|
2018-12-06 21:08:43 +08:00
|
|
|
# Licensed under the Apache License 2.0 (the "License"). You may not use
|
2016-04-20 22:20:59 +08:00
|
|
|
# this file except in compliance with the License. You can obtain a copy
|
|
|
|
# in the file LICENSE in the source distribution or at
|
|
|
|
# https://www.openssl.org/source/license.html
|
2015-11-24 21:06:45 +08:00
|
|
|
|
1999-02-25 16:48:52 +08:00
|
|
|
## Configure -- OpenSSL source tree configuration script
|
1998-12-29 01:08:48 +08:00
|
|
|
|
2017-03-31 20:37:10 +08:00
|
|
|
use 5.10.0;
|
1998-12-29 01:08:48 +08:00
|
|
|
use strict;
|
2016-09-07 00:26:38 +08:00
|
|
|
use Config;
|
2017-08-02 04:10:39 +08:00
|
|
|
use FindBin;
|
|
|
|
use lib "$FindBin::Bin/util/perl";
|
2015-02-25 06:40:22 +08:00
|
|
|
use File::Basename;
|
2018-11-03 22:03:59 +08:00
|
|
|
use File::Spec::Functions qw/:DEFAULT abs2rel rel2abs splitdir/;
|
2016-02-08 23:27:15 +08:00
|
|
|
use File::Path qw/mkpath/;
|
2017-08-02 04:43:56 +08:00
|
|
|
use OpenSSL::Glob;
|
1998-12-29 01:08:48 +08:00
|
|
|
|
1999-04-19 21:54:11 +08:00
|
|
|
# see INSTALL for instructions.
|
1999-04-25 06:59:36 +08:00
|
|
|
|
2018-07-24 16:45:05 +08:00
|
|
|
my $orig_death_handler = $SIG{__DIE__};
|
|
|
|
$SIG{__DIE__} = \&death_handler;
|
|
|
|
|
2016-02-11 00:10:39 +08:00
|
|
|
my $usage="Usage: Configure [no-<cipher> ...] [enable-<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-25 06:59:36 +08:00
|
|
|
|
1999-04-19 23:19:58 +08:00
|
|
|
# Options:
|
1999-04-30 05:52:08 +08:00
|
|
|
#
|
2015-02-25 06:40:22 +08: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-21 01:11:51 +08: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-30 05:52:08 +08:00
|
|
|
#
|
2006-10-21 21:38:16 +08:00
|
|
|
# --cross-compile-prefix Add specified prefix to binutils components.
|
|
|
|
#
|
2018-11-30 07:05:03 +08:00
|
|
|
# --api One of 0.9.8, 1.0.0, 1.0.1, 1.0.2, 1.1.0, 1.1.1, or 3.0.0 / 3.
|
|
|
|
# Do not compile support for interfaces deprecated as of the
|
|
|
|
# specified OpenSSL version.
|
2016-01-05 12:00:33 +08:00
|
|
|
#
|
2000-10-27 05:07:28 +08: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-30 00:10:09 +08: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 12:19:50 +08:00
|
|
|
# [no-]shared [don't] try to create shared libraries when supported.
|
2016-02-22 09:09:11 +08:00
|
|
|
# [no-]pic [don't] try to build position independent code when supported.
|
2016-02-22 22:57:25 +08:00
|
|
|
# If disabled, it also disables shared and dynamic-engine.
|
1999-04-19 22:55:56 +08:00
|
|
|
# no-asm do not use assembler
|
2000-04-06 15:09:45 +08:00
|
|
|
# no-dso do not compile in any native shared-library methods. This
|
|
|
|
# will ensure that all methods just return NULL.
|
2016-01-13 08:02:16 +08:00
|
|
|
# no-egd do not compile support for the entropy-gathering daemon APIs
|
2001-07-12 17:11:14 +08: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 22:45:15 +08:00
|
|
|
# sctp include SCTP support
|
2016-03-03 23:40:51 +08:00
|
|
|
# enable-weak-ssl-ciphers
|
2017-06-17 22:17:44 +08:00
|
|
|
# Enable weak ciphers that are disabled by default.
|
2016-11-21 04:52:41 +08:00
|
|
|
# 386 generate 80386 code in assembly modules
|
|
|
|
# no-sse2 disables IA-32 SSE2 code in assembly modules, the above
|
|
|
|
# mentioned '386' option implies this one
|
1999-04-27 11:19:12 +08:00
|
|
|
# no-<cipher> build without specified algorithm (rsa, idea, rc5, ...)
|
2014-05-27 00:19:28 +08:00
|
|
|
# -<xxx> +<xxx> compiler options are passed through
|
2016-09-02 03:36:13 +08:00
|
|
|
# -static while -static is also a pass-through compiler option (and
|
|
|
|
# as such is limited to environments where it's actually
|
|
|
|
# meaningful), it triggers a number configuration options,
|
|
|
|
# namely no-dso, no-pic, no-shared and no-threads. It is
|
|
|
|
# argued that the only reason to produce statically linked
|
|
|
|
# binaries (and in context it means executables linked with
|
|
|
|
# -static flag, and not just executables linked with static
|
|
|
|
# libcrypto.a) is to eliminate dependency on specific run-time,
|
|
|
|
# a.k.a. libc version. The mentioned config options are meant
|
|
|
|
# to achieve just that. Unfortunately on Linux it's impossible
|
|
|
|
# to eliminate the dependency completely for openssl executable
|
|
|
|
# because of getaddrinfo and gethostbyname calls, which can
|
|
|
|
# invoke dynamically loadable library facility anyway to meet
|
|
|
|
# the lookup requests. For this reason on Linux statically
|
|
|
|
# linked openssl executable has rather debugging value than
|
|
|
|
# production quality.
|
2000-06-01 13:13:52 +08: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 18:52:47 +08: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-19 00:19:34 +08:00
|
|
|
# Following are set automatically by this script
|
|
|
|
#
|
2016-03-11 04:34:48 +08:00
|
|
|
# MD5_ASM use some extra md5 assembler,
|
|
|
|
# SHA1_ASM use some extra sha1 assembler, must define L_ENDIAN for x86
|
|
|
|
# RMD160_ASM use some extra ripemd160 assembler,
|
2004-07-19 00:19:34 +08:00
|
|
|
# SHA256_ASM sha256_block is implemented in assembler
|
|
|
|
# SHA512_ASM sha512_block is implemented in assembler
|
2016-06-21 19:30:54 +08:00
|
|
|
# AES_ASM AES_[en|de]crypt is implemented in assembler
|
1998-12-21 18:52:47 +08:00
|
|
|
|
2009-01-11 23:56:32 +08:00
|
|
|
# Minimum warning options... any contributions to OpenSSL should at least get
|
2014-05-27 00:19:28 +08:00
|
|
|
# past these.
|
2009-01-11 23:56:32 +08:00
|
|
|
|
2016-04-06 18:47:35 +08:00
|
|
|
# DEBUG_UNUSED enables __owur (warn unused result) checks.
|
2017-01-31 05:13:41 +08:00
|
|
|
# -DPEDANTIC complements -pedantic and is meant to mask code that
|
|
|
|
# is not strictly standard-compliant and/or implementation-specific,
|
|
|
|
# e.g. inline assembly, disregards to alignment requirements, such
|
|
|
|
# that -pedantic would complain about. Incidentally -DPEDANTIC has
|
|
|
|
# to be used even in sanitized builds, because sanitizer too is
|
|
|
|
# supposed to and does take notice of non-standard behaviour. Then
|
|
|
|
# -pedantic with pre-C9x compiler would also complain about 'long
|
|
|
|
# long' not being supported. As 64-bit algorithms are common now,
|
|
|
|
# it grew impossible to resolve this without sizeable additional
|
|
|
|
# code, so we just tell compiler to be pedantic about everything
|
|
|
|
# but 'long long' type.
|
|
|
|
|
2016-04-06 18:47:35 +08:00
|
|
|
my $gcc_devteam_warn = "-DDEBUG_UNUSED"
|
|
|
|
. " -DPEDANTIC -pedantic -Wno-long-long"
|
2016-02-14 01:27:11 +08:00
|
|
|
. " -Wall"
|
2017-04-18 23:48:11 +08:00
|
|
|
. " -Wextra"
|
|
|
|
. " -Wno-unused-parameter"
|
|
|
|
. " -Wno-missing-field-initializers"
|
2017-08-29 21:47:08 +08:00
|
|
|
. " -Wswitch"
|
2016-02-14 01:27:11 +08:00
|
|
|
. " -Wsign-compare"
|
|
|
|
. " -Wmissing-prototypes"
|
2018-06-21 03:41:05 +08:00
|
|
|
. " -Wstrict-prototypes"
|
2016-02-14 01:27:11 +08:00
|
|
|
. " -Wshadow"
|
|
|
|
. " -Wformat"
|
|
|
|
. " -Wtype-limits"
|
2017-02-23 21:52:23 +08:00
|
|
|
. " -Wundef"
|
2016-02-14 01:27:11 +08:00
|
|
|
. " -Werror"
|
|
|
|
;
|
2009-01-11 23:56:32 +08:00
|
|
|
|
2015-04-19 21:10:54 +08: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 09:45:44 +08:00
|
|
|
# following warnings can also be enabled:
|
2016-02-14 01:27:11 +08:00
|
|
|
# -Wcast-align
|
2017-01-31 05:13:41 +08:00
|
|
|
# -Wunreachable-code -- no, too ugly/compiler-specific
|
2016-02-14 11:33:56 +08:00
|
|
|
# -Wlanguage-extension-token -- no, we use asm()
|
|
|
|
# -Wunused-macros -- no, too tricky for BN and _XOPEN_SOURCE etc
|
|
|
|
# -Wextended-offsetof -- no, needed in CMS ASN1 code
|
2016-02-14 01:27:11 +08:00
|
|
|
my $clang_devteam_warn = ""
|
2017-05-02 01:39:20 +08:00
|
|
|
. " -Wswitch-default"
|
2017-01-31 05:13:41 +08:00
|
|
|
. " -Wno-parentheses-equality"
|
2016-02-14 01:27:11 +08:00
|
|
|
. " -Wno-language-extension-token"
|
|
|
|
. " -Wno-extended-offsetof"
|
|
|
|
. " -Wconditional-uninitialized"
|
|
|
|
. " -Wincompatible-pointer-types-discards-qualifiers"
|
|
|
|
. " -Wmissing-variable-declarations"
|
2017-09-22 04:47:12 +08:00
|
|
|
. " -Wno-unknown-warning-option"
|
2016-02-14 01:27:11 +08:00
|
|
|
;
|
2015-01-05 20:46:26 +08:00
|
|
|
|
2016-02-14 19:16:52 +08: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-03 01:44:26 +08:00
|
|
|
|
2009-09-10 00:31:32 +08:00
|
|
|
my $strict_warnings = 0;
|
|
|
|
|
2005-01-24 22:38:14 +08:00
|
|
|
# As for $BSDthreads. Idea is to maintain "collective" set of flags,
|
2014-05-27 00:19:28 +08:00
|
|
|
# which would cover all BSD flavors. -pthread applies to them all,
|
2005-01-24 22:38:14 +08: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?
|
Configure - Get rid of the special thread_cflag, replace with thread_scheme
The thread_cflag setting filled a double role, as kinda sorta an
indicator of thread scheme, and as cflags. Some configs also added
lflags and ex_libs for multithreading regardless of if threading would
be enabled or not.
Instead of this, add threading cflags among in the cflag setting,
threading lflags in the lflag setting and so on if and only if threads
are enabled (which they are by default).
Also, for configs where there are no special cflags for threading (the
VMS configs are of that kind), this makes it possible to still clearly
mention what thread scheme is used.
The exact value of thread scheme is currently ignored except when it's
"(unknown)", and thereby only serves as a flag to tell if we know how
to build for multi-threading in a particular config. Yet, the
currently used values are "(unknown)", "pthreads", "uithreads" (a.k.a
solaris threads) and "winthreads".
Reviewed-by: Andy Polyakov <appro@openssl.org>
2016-02-27 23:51:34 +08:00
|
|
|
our $BSDthreads="-pthread -D_THREAD_SAFE -D_REENTRANT";
|
1998-12-21 18:52:47 +08:00
|
|
|
|
2016-01-05 12:00:33 +08:00
|
|
|
#
|
2016-06-20 01:39:01 +08:00
|
|
|
# API compatibility name to version number mapping.
|
2016-01-05 12:00:33 +08:00
|
|
|
#
|
2018-09-27 22:14:45 +08:00
|
|
|
my $maxapi = "3.0.0"; # API for "no-deprecated" builds
|
2016-01-05 12:00:33 +08:00
|
|
|
my $apitable = {
|
2018-11-30 07:05:03 +08:00
|
|
|
"3.0.0" => 3,
|
|
|
|
"1.1.1" => 2,
|
|
|
|
"1.1.0" => 2,
|
|
|
|
"1.0.2" => 1,
|
|
|
|
"1.0.1" => 1,
|
|
|
|
"1.0.0" => 1,
|
|
|
|
"0.9.8" => 0,
|
2016-01-05 12:00:33 +08:00
|
|
|
};
|
|
|
|
|
2015-05-18 08:54:28 +08:00
|
|
|
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-19 04:35:23 +08:00
|
|
|
our %config = ();
|
2016-02-27 18:37:33 +08:00
|
|
|
our %withargs = ();
|
2018-03-26 18:35:57 +08:00
|
|
|
our $now_printing; # set to current entry's name in print_table_entry
|
|
|
|
# (todo: right thing would be to encapsulate name
|
|
|
|
# into %target [class] and make print_table_entry
|
|
|
|
# a method)
|
2002-02-14 23:37:38 +08:00
|
|
|
|
2015-05-18 08:57:24 +08:00
|
|
|
# Forward declarations ###############################################
|
2015-03-17 05:33:36 +08:00
|
|
|
|
2015-05-18 08:57:24 +08: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 17:01:08 +08:00
|
|
|
|
2015-05-18 08:57:24 +08:00
|
|
|
# resolve_config(target)
|
|
|
|
#
|
2016-03-11 04:34:48 +08:00
|
|
|
# Resolves all the late evaluations, inheritances and so on for the
|
2015-05-18 08:57:24 +08:00
|
|
|
# chosen target and any target it inherits from.
|
|
|
|
sub resolve_config;
|
2015-03-06 17:01:08 +08:00
|
|
|
|
2009-07-01 19:46:03 +08:00
|
|
|
|
2015-05-21 02:03:20 +08:00
|
|
|
# Information collection #############################################
|
|
|
|
|
2016-01-30 02:45:51 +08:00
|
|
|
# Unified build supports separate build dir
|
2016-02-09 17:15:13 +08:00
|
|
|
my $srcdir = catdir(absolutedir(dirname($0))); # catdir ensures local syntax
|
|
|
|
my $blddir = catdir(absolutedir(".")); # catdir ensures local syntax
|
2016-01-30 02:45:51 +08:00
|
|
|
my $dofile = abs2rel(catfile($srcdir, "util/dofile.pl"));
|
|
|
|
|
2016-05-02 22:50:51 +08:00
|
|
|
my $local_config_envname = 'OPENSSL_LOCAL_CONFIG_DIR';
|
|
|
|
|
2016-01-30 02:45:51 +08:00
|
|
|
$config{sourcedir} = abs2rel($srcdir);
|
|
|
|
$config{builddir} = abs2rel($blddir);
|
|
|
|
|
2016-08-30 04:11:36 +08:00
|
|
|
# Collect reconfiguration information if needed
|
|
|
|
my @argvcopy=@ARGV;
|
|
|
|
|
|
|
|
if (grep /^reconf(igure)?$/, @argvcopy) {
|
2017-12-01 04:46:53 +08:00
|
|
|
die "reconfiguring with other arguments present isn't supported"
|
|
|
|
if scalar @argvcopy > 1;
|
2016-08-30 04:11:36 +08: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;
|
|
|
|
}
|
|
|
|
|
|
|
|
@argvcopy = defined($configdata::config{perlargv}) ?
|
|
|
|
@{$configdata::config{perlargv}} : ();
|
|
|
|
die "Incorrect data to reconfigure, please do a normal configuration\n"
|
|
|
|
if (grep(/^reconf/,@argvcopy));
|
2017-11-29 20:09:01 +08:00
|
|
|
$config{perlenv} = $configdata::config{perlenv} // {};
|
2016-08-30 04:11:36 +08:00
|
|
|
} else {
|
|
|
|
die "Insufficient data to reconfigure, please do a normal configuration\n";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
$config{perlargv} = [ @argvcopy ];
|
|
|
|
|
2015-05-21 02:03:20 +08:00
|
|
|
# Collect version numbers
|
Switch to MAJOR.MINOR.PATCH versioning and version 3.0.0-dev
We're strictly use version numbers of the form MAJOR.MINOR.PATCH.
Letter releases are things of days past.
The most central change is that we now express the version number with
three macros, one for each part of the version number:
OPENSSL_VERSION_MAJOR
OPENSSL_VERSION_MINOR
OPENSSL_VERSION_PATCH
We also provide two additional macros to express pre-release and build
metadata information (also specified in semantic versioning):
OPENSSL_VERSION_PRE_RELEASE
OPENSSL_VERSION_BUILD_METADATA
To get the library's idea of all those values, we introduce the
following functions:
unsigned int OPENSSL_version_major(void);
unsigned int OPENSSL_version_minor(void);
unsigned int OPENSSL_version_patch(void);
const char *OPENSSL_version_pre_release(void);
const char *OPENSSL_version_build_metadata(void);
Additionally, for shared library versioning (which is out of scope in
semantic versioning, but that we still need):
OPENSSL_SHLIB_VERSION
We also provide a macro that contains the release date. This is not
part of the version number, but is extra information that we want to
be able to display:
OPENSSL_RELEASE_DATE
Finally, also provide the following convenience functions:
const char *OPENSSL_version_text(void);
const char *OPENSSL_version_text_full(void);
The following macros and functions are deprecated, and while currently
existing for backward compatibility, they are expected to disappear:
OPENSSL_VERSION_NUMBER
OPENSSL_VERSION_TEXT
OPENSSL_VERSION
OpenSSL_version_num()
OpenSSL_version()
Also, this function is introduced to replace OpenSSL_version() for all
indexes except for OPENSSL_VERSION:
OPENSSL_info()
For configuration, the option 'newversion-only' is added to disable all
the macros and functions that are mentioned as deprecated above.
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7724)
2018-09-27 21:56:35 +08:00
|
|
|
$config{major} = "unknown";
|
|
|
|
$config{minor} = "unknown";
|
|
|
|
$config{patch} = "unknown";
|
|
|
|
$config{prerelease} = "";
|
|
|
|
$config{build_metadata} = "";
|
|
|
|
$config{shlib_version} = "unknown";
|
2015-05-21 02:03:20 +08:00
|
|
|
|
|
|
|
collect_information(
|
2016-01-30 02:45:51 +08:00
|
|
|
collect_from_file(catfile($srcdir,'include/openssl/opensslv.h')),
|
Switch to MAJOR.MINOR.PATCH versioning and version 3.0.0-dev
We're strictly use version numbers of the form MAJOR.MINOR.PATCH.
Letter releases are things of days past.
The most central change is that we now express the version number with
three macros, one for each part of the version number:
OPENSSL_VERSION_MAJOR
OPENSSL_VERSION_MINOR
OPENSSL_VERSION_PATCH
We also provide two additional macros to express pre-release and build
metadata information (also specified in semantic versioning):
OPENSSL_VERSION_PRE_RELEASE
OPENSSL_VERSION_BUILD_METADATA
To get the library's idea of all those values, we introduce the
following functions:
unsigned int OPENSSL_version_major(void);
unsigned int OPENSSL_version_minor(void);
unsigned int OPENSSL_version_patch(void);
const char *OPENSSL_version_pre_release(void);
const char *OPENSSL_version_build_metadata(void);
Additionally, for shared library versioning (which is out of scope in
semantic versioning, but that we still need):
OPENSSL_SHLIB_VERSION
We also provide a macro that contains the release date. This is not
part of the version number, but is extra information that we want to
be able to display:
OPENSSL_RELEASE_DATE
Finally, also provide the following convenience functions:
const char *OPENSSL_version_text(void);
const char *OPENSSL_version_text_full(void);
The following macros and functions are deprecated, and while currently
existing for backward compatibility, they are expected to disappear:
OPENSSL_VERSION_NUMBER
OPENSSL_VERSION_TEXT
OPENSSL_VERSION
OpenSSL_version_num()
OpenSSL_version()
Also, this function is introduced to replace OpenSSL_version() for all
indexes except for OPENSSL_VERSION:
OPENSSL_info()
For configuration, the option 'newversion-only' is added to disable all
the macros and functions that are mentioned as deprecated above.
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7724)
2018-09-27 21:56:35 +08:00
|
|
|
qr/#\s+define\s+OPENSSL_VERSION_MAJOR\s+(\d+)/ =>
|
|
|
|
sub { $config{major} = $1; },
|
|
|
|
qr/#\s+define\s+OPENSSL_VERSION_MINOR\s+(\d+)/ =>
|
|
|
|
sub { $config{minor} = $1; },
|
|
|
|
qr/#\s+define\s+OPENSSL_VERSION_PATCH\s+(\d+)/ =>
|
|
|
|
sub { $config{patch} = $1; },
|
|
|
|
qr/#\s+define\s+OPENSSL_VERSION_PRE_RELEASE\s+"((?:\\.|[^"])*)"/ =>
|
|
|
|
sub { $config{prerelease} = $1; },
|
|
|
|
qr/#\s+define\s+OPENSSL_VERSION_BUILD_METADATA\s+"((?:\\.|[^"])*)"/ =>
|
|
|
|
sub { $config{build_metadata} = $1; },
|
|
|
|
qr/#\s+define\s+OPENSSL_SHLIB_VERSION\s+([\d\.]+)/ =>
|
|
|
|
sub { $config{shlib_version} = $1; },
|
2015-05-21 02:03:20 +08:00
|
|
|
);
|
|
|
|
die "erroneous version information in opensslv.h: ",
|
Switch to MAJOR.MINOR.PATCH versioning and version 3.0.0-dev
We're strictly use version numbers of the form MAJOR.MINOR.PATCH.
Letter releases are things of days past.
The most central change is that we now express the version number with
three macros, one for each part of the version number:
OPENSSL_VERSION_MAJOR
OPENSSL_VERSION_MINOR
OPENSSL_VERSION_PATCH
We also provide two additional macros to express pre-release and build
metadata information (also specified in semantic versioning):
OPENSSL_VERSION_PRE_RELEASE
OPENSSL_VERSION_BUILD_METADATA
To get the library's idea of all those values, we introduce the
following functions:
unsigned int OPENSSL_version_major(void);
unsigned int OPENSSL_version_minor(void);
unsigned int OPENSSL_version_patch(void);
const char *OPENSSL_version_pre_release(void);
const char *OPENSSL_version_build_metadata(void);
Additionally, for shared library versioning (which is out of scope in
semantic versioning, but that we still need):
OPENSSL_SHLIB_VERSION
We also provide a macro that contains the release date. This is not
part of the version number, but is extra information that we want to
be able to display:
OPENSSL_RELEASE_DATE
Finally, also provide the following convenience functions:
const char *OPENSSL_version_text(void);
const char *OPENSSL_version_text_full(void);
The following macros and functions are deprecated, and while currently
existing for backward compatibility, they are expected to disappear:
OPENSSL_VERSION_NUMBER
OPENSSL_VERSION_TEXT
OPENSSL_VERSION
OpenSSL_version_num()
OpenSSL_version()
Also, this function is introduced to replace OpenSSL_version() for all
indexes except for OPENSSL_VERSION:
OPENSSL_info()
For configuration, the option 'newversion-only' is added to disable all
the macros and functions that are mentioned as deprecated above.
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7724)
2018-09-27 21:56:35 +08:00
|
|
|
"$config{major}.$config{minor}.$config{patch}, $config{shlib_version}\n"
|
|
|
|
if ($config{major} eq "unknown"
|
|
|
|
|| $config{minor} eq "unknown"
|
|
|
|
|| $config{patch} eq "unknown"
|
|
|
|
|| $config{shlib_version} eq "unknown");
|
2015-05-21 02:03:20 +08:00
|
|
|
|
|
|
|
# Collect target configurations
|
|
|
|
|
2016-02-03 02:47:05 +08:00
|
|
|
my $pattern = catfile(dirname($0), "Configurations", "*.conf");
|
2016-05-28 22:11:01 +08:00
|
|
|
foreach (sort glob($pattern)) {
|
2015-02-25 06:40:22 +08:00
|
|
|
&read_config($_);
|
|
|
|
}
|
1998-12-21 18:52:47 +08:00
|
|
|
|
2017-11-29 20:09:01 +08:00
|
|
|
if (defined env($local_config_envname)) {
|
2016-05-02 22:50:51 +08:00
|
|
|
if ($^O eq 'VMS') {
|
|
|
|
# VMS environment variables are logical names,
|
|
|
|
# which can be used as is
|
|
|
|
$pattern = $local_config_envname . ':' . '*.conf';
|
|
|
|
} else {
|
2017-11-29 20:09:01 +08:00
|
|
|
$pattern = catfile(env($local_config_envname), '*.conf');
|
2016-05-02 22:50:51 +08:00
|
|
|
}
|
|
|
|
|
2016-05-28 22:11:01 +08:00
|
|
|
foreach (sort glob($pattern)) {
|
2016-05-02 22:50:51 +08:00
|
|
|
&read_config($_);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-02-02 19:21:27 +08:00
|
|
|
# Save away perl command information
|
|
|
|
$config{perl_cmd} = $^X;
|
|
|
|
$config{perl_version} = $Config{version};
|
|
|
|
$config{perl_archname} = $Config{archname};
|
|
|
|
|
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-19 04:35:23 +08:00
|
|
|
$config{prefix}="";
|
|
|
|
$config{openssldir}="";
|
2015-05-19 07:40:54 +08:00
|
|
|
$config{processor}="";
|
2015-05-21 02:03:20 +08:00
|
|
|
$config{libdir}="";
|
Configure - Get rid of the special thread_cflag, replace with thread_scheme
The thread_cflag setting filled a double role, as kinda sorta an
indicator of thread scheme, and as cflags. Some configs also added
lflags and ex_libs for multithreading regardless of if threading would
be enabled or not.
Instead of this, add threading cflags among in the cflag setting,
threading lflags in the lflag setting and so on if and only if threads
are enabled (which they are by default).
Also, for configs where there are no special cflags for threading (the
VMS configs are of that kind), this makes it possible to still clearly
mention what thread scheme is used.
The exact value of thread scheme is currently ignored except when it's
"(unknown)", and thereby only serves as a flag to tell if we know how
to build for multi-threading in a particular config. Yet, the
currently used values are "(unknown)", "pthreads", "uithreads" (a.k.a
solaris threads) and "winthreads".
Reviewed-by: Andy Polyakov <appro@openssl.org>
2016-02-27 23:51:34 +08:00
|
|
|
my $auto_threads=1; # enable threads automatically? true by default
|
2001-03-09 21:04:06 +08:00
|
|
|
my $default_ranlib;
|
2015-05-21 02:03:20 +08:00
|
|
|
|
2016-01-19 02:10:21 +08:00
|
|
|
# Known TLS and DTLS protocols
|
2016-10-30 16:38:52 +08:00
|
|
|
my @tls = qw(ssl3 tls1 tls1_1 tls1_2 tls1_3);
|
2016-01-19 02:10:21 +08:00
|
|
|
my @dtls = qw(dtls1 dtls1_2);
|
|
|
|
|
2016-03-11 04:34:48 +08:00
|
|
|
# Explicitly known options that are possible to disable. They can
|
2015-10-22 23:09:14 +08:00
|
|
|
# be regexps, and will be used like this: /^no-${option}$/
|
|
|
|
# For developers: keep it sorted alphabetically
|
|
|
|
|
|
|
|
my @disablables = (
|
2016-03-14 19:21:44 +08:00
|
|
|
"afalgeng",
|
2017-02-01 08:10:13 +08:00
|
|
|
"aria",
|
2016-03-27 01:19:14 +08:00
|
|
|
"asan",
|
2015-10-22 23:09:14 +08:00
|
|
|
"asm",
|
2016-02-05 00:41:25 +08:00
|
|
|
"async",
|
2016-02-09 19:26:14 +08:00
|
|
|
"autoalginit",
|
2016-02-09 17:39:07 +08:00
|
|
|
"autoerrinit",
|
2018-04-15 18:02:25 +08:00
|
|
|
"autoload-config",
|
2015-10-22 23:09:14 +08:00
|
|
|
"bf",
|
2016-03-10 06:08:31 +08:00
|
|
|
"blake2",
|
2015-10-22 23:09:14 +08:00
|
|
|
"camellia",
|
|
|
|
"capieng",
|
|
|
|
"cast",
|
2015-12-10 06:02:11 +08:00
|
|
|
"chacha",
|
2015-10-22 23:09:14 +08:00
|
|
|
"cmac",
|
|
|
|
"cms",
|
|
|
|
"comp",
|
2016-01-10 06:55:57 +08:00
|
|
|
"crypto-mdebug",
|
2016-02-14 19:16:52 +08:00
|
|
|
"crypto-mdebug-backtrace",
|
2015-10-22 23:09:14 +08:00
|
|
|
"ct",
|
|
|
|
"deprecated",
|
|
|
|
"des",
|
2017-03-24 23:19:00 +08:00
|
|
|
"devcryptoeng",
|
2015-10-22 23:09:14 +08:00
|
|
|
"dgram",
|
|
|
|
"dh",
|
|
|
|
"dsa",
|
|
|
|
"dso",
|
2015-12-12 18:12:22 +08:00
|
|
|
"dtls",
|
2016-02-20 05:08:37 +08:00
|
|
|
"dynamic-engine",
|
2015-10-22 23:09:14 +08:00
|
|
|
"ec",
|
|
|
|
"ec2m",
|
2016-01-19 02:10:21 +08:00
|
|
|
"ecdh",
|
|
|
|
"ecdsa",
|
2015-10-22 23:09:14 +08:00
|
|
|
"ec_nistp_64_gcc_128",
|
2016-02-04 04:08:17 +08:00
|
|
|
"egd",
|
2015-10-22 23:09:14 +08:00
|
|
|
"engine",
|
2016-02-18 02:33:51 +08:00
|
|
|
"err",
|
2016-10-12 23:21:13 +08:00
|
|
|
"external-tests",
|
2015-07-30 18:45:25 +08:00
|
|
|
"filenames",
|
2016-05-08 04:09:13 +08:00
|
|
|
"fuzz-libfuzzer",
|
|
|
|
"fuzz-afl",
|
2016-03-21 23:04:08 +08:00
|
|
|
"gost",
|
2016-11-15 21:53:33 +08:00
|
|
|
"heartbeats",
|
2015-10-22 23:09:14 +08:00
|
|
|
"hw(-.+)?",
|
|
|
|
"idea",
|
2016-03-09 08:14:29 +08:00
|
|
|
"makedepend",
|
2015-10-22 23:09:14 +08:00
|
|
|
"md2",
|
|
|
|
"md4",
|
|
|
|
"mdc2",
|
2016-07-29 02:24:28 +08:00
|
|
|
"msan",
|
2016-03-08 07:26:32 +08:00
|
|
|
"multiblock",
|
2015-10-22 23:09:14 +08:00
|
|
|
"nextprotoneg",
|
|
|
|
"ocb",
|
|
|
|
"ocsp",
|
2016-02-22 09:09:11 +08:00
|
|
|
"pic",
|
2015-12-10 06:02:11 +08:00
|
|
|
"poly1305",
|
2015-10-22 23:09:14 +08:00
|
|
|
"posix-io",
|
|
|
|
"psk",
|
|
|
|
"rc2",
|
|
|
|
"rc4",
|
|
|
|
"rc5",
|
|
|
|
"rdrand",
|
|
|
|
"rfc3779",
|
|
|
|
"rmd160",
|
|
|
|
"scrypt",
|
|
|
|
"sctp",
|
|
|
|
"seed",
|
|
|
|
"shared",
|
2017-01-12 05:38:44 +08:00
|
|
|
"siphash",
|
2018-03-20 00:17:58 +08:00
|
|
|
"sm2",
|
2017-10-26 01:19:02 +08:00
|
|
|
"sm3",
|
2017-10-31 13:19:14 +08:00
|
|
|
"sm4",
|
2015-10-22 23:09:14 +08:00
|
|
|
"sock",
|
|
|
|
"srp",
|
|
|
|
"srtp",
|
|
|
|
"sse2",
|
|
|
|
"ssl",
|
|
|
|
"ssl-trace",
|
|
|
|
"static-engine",
|
|
|
|
"stdio",
|
2016-08-30 12:02:50 +08:00
|
|
|
"tests",
|
2015-10-22 23:09:14 +08:00
|
|
|
"threads",
|
|
|
|
"tls",
|
2016-02-18 02:33:51 +08:00
|
|
|
"ts",
|
2016-03-27 01:19:14 +08:00
|
|
|
"ubsan",
|
2017-07-01 18:14:37 +08:00
|
|
|
"ui-console",
|
2015-10-22 23:09:14 +08:00
|
|
|
"unit-test",
|
|
|
|
"whirlpool",
|
2016-03-03 23:40:51 +08:00
|
|
|
"weak-ssl-ciphers",
|
2015-10-22 23:09:14 +08:00
|
|
|
"zlib",
|
|
|
|
"zlib-dynamic",
|
|
|
|
);
|
2016-01-19 02:10:21 +08:00
|
|
|
foreach my $proto ((@tls, @dtls))
|
|
|
|
{
|
|
|
|
push(@disablables, $proto);
|
2017-06-29 22:03:14 +08:00
|
|
|
push(@disablables, "$proto-method") unless $proto eq "tls1_3";
|
2016-01-19 02:10:21 +08:00
|
|
|
}
|
2015-10-22 23:09:14 +08:00
|
|
|
|
2016-06-16 18:45:24 +08:00
|
|
|
my %deprecated_disablables = (
|
|
|
|
"ssl2" => undef,
|
|
|
|
"buf-freelists" => undef,
|
2017-07-01 18:14:37 +08:00
|
|
|
"ripemd" => "rmd160",
|
|
|
|
"ui" => "ui-console",
|
2016-02-22 17:42:53 +08:00
|
|
|
);
|
|
|
|
|
2018-04-01 06:29:12 +08:00
|
|
|
# All of the following are disabled by default:
|
2005-02-22 18:29:51 +08:00
|
|
|
|
2016-02-22 20:45:46 +08:00
|
|
|
our %disabled = ( # "what" => "comment"
|
2018-04-15 18:02:25 +08:00
|
|
|
"asan" => "default",
|
2016-08-19 04:47:04 +08:00
|
|
|
"crypto-mdebug" => "default",
|
|
|
|
"crypto-mdebug-backtrace" => "default",
|
2017-03-24 23:19:00 +08:00
|
|
|
"devcryptoeng" => "default",
|
2016-02-22 20:45:46 +08:00
|
|
|
"ec_nistp_64_gcc_128" => "default",
|
2016-03-03 23:40:51 +08:00
|
|
|
"egd" => "default",
|
2016-10-12 23:21:13 +08:00
|
|
|
"external-tests" => "default",
|
2016-05-08 04:09:13 +08:00
|
|
|
"fuzz-libfuzzer" => "default",
|
|
|
|
"fuzz-afl" => "default",
|
2016-11-15 21:53:33 +08:00
|
|
|
"heartbeats" => "default",
|
2016-03-03 23:40:51 +08:00
|
|
|
"md2" => "default",
|
2016-07-29 02:24:28 +08:00
|
|
|
"msan" => "default",
|
2016-03-03 23:40:51 +08:00
|
|
|
"rc5" => "default",
|
|
|
|
"sctp" => "default",
|
|
|
|
"ssl-trace" => "default",
|
2016-03-04 05:45:57 +08:00
|
|
|
"ssl3" => "default",
|
|
|
|
"ssl3-method" => "default",
|
2016-03-27 01:19:14 +08:00
|
|
|
"ubsan" => "default",
|
2016-03-03 23:40:51 +08:00
|
|
|
"unit-test" => "default",
|
|
|
|
"weak-ssl-ciphers" => "default",
|
|
|
|
"zlib" => "default",
|
|
|
|
"zlib-dynamic" => "default",
|
2016-02-22 20:45:46 +08:00
|
|
|
);
|
2005-02-22 18:29:51 +08:00
|
|
|
|
2015-05-18 17:03:47 +08:00
|
|
|
# Note: => pair form used for aesthetics, not to truly make a hash table
|
|
|
|
my @disable_cascades = (
|
|
|
|
# "what" => [ "cascade", ... ]
|
2015-05-19 07:40:54 +08:00
|
|
|
sub { $config{processor} eq "386" }
|
2015-05-18 17:03:47 +08:00
|
|
|
=> [ "sse2" ],
|
|
|
|
"ssl" => [ "ssl3" ],
|
|
|
|
"ssl3-method" => [ "ssl3" ],
|
|
|
|
"zlib" => [ "zlib-dynamic" ],
|
|
|
|
"des" => [ "mdc2" ],
|
2016-01-24 05:58:51 +08:00
|
|
|
"ec" => [ "ecdsa", "ecdh" ],
|
2015-05-18 17:03:47 +08:00
|
|
|
|
2016-03-18 02:17:03 +08:00
|
|
|
"dgram" => [ "dtls", "sctp" ],
|
2016-04-20 18:24:49 +08:00
|
|
|
"sock" => [ "dgram" ],
|
2015-05-18 17:03:47 +08:00
|
|
|
"dtls" => [ @dtls ],
|
2017-02-18 03:48:28 +08:00
|
|
|
sub { 0 == scalar grep { !$disabled{$_} } @dtls }
|
|
|
|
=> [ "dtls" ],
|
2015-05-18 17:03:47 +08:00
|
|
|
|
|
|
|
"tls" => [ @tls ],
|
2017-02-18 03:48:28 +08:00
|
|
|
sub { 0 == scalar grep { !$disabled{$_} } @tls }
|
|
|
|
=> [ "tls" ],
|
2015-05-18 17:03:47 +08:00
|
|
|
|
2016-02-14 19:16:52 +08:00
|
|
|
"crypto-mdebug" => [ "crypto-mdebug-backtrace" ],
|
2016-02-20 05:08:37 +08:00
|
|
|
|
|
|
|
# Without DSO, we can't load dynamic engines, so don't build them dynamic
|
|
|
|
"dso" => [ "dynamic-engine" ],
|
2016-02-22 09:09:11 +08:00
|
|
|
|
|
|
|
# Without position independent code, there can be no shared libraries or DSOs
|
2016-03-11 19:58:15 +08:00
|
|
|
"pic" => [ "shared" ],
|
|
|
|
"shared" => [ "dynamic-engine" ],
|
2017-03-24 23:19:00 +08:00
|
|
|
"engine" => [ "afalgeng", "devcryptoeng" ],
|
2016-04-14 20:44:15 +08:00
|
|
|
|
|
|
|
# no-autoalginit is only useful when building non-shared
|
|
|
|
"autoalginit" => [ "shared", "apps" ],
|
|
|
|
|
2017-09-12 13:47:05 +08:00
|
|
|
"stdio" => [ "apps", "capieng", "egd" ],
|
2016-04-14 20:44:15 +08:00
|
|
|
"apps" => [ "tests" ],
|
2017-08-28 21:41:49 +08:00
|
|
|
"tests" => [ "external-tests" ],
|
2016-12-28 23:32:39 +08:00
|
|
|
"comp" => [ "zlib" ],
|
2018-03-20 00:24:49 +08:00
|
|
|
"ec" => [ "tls1_3", "sm2" ],
|
2018-03-20 01:21:13 +08:00
|
|
|
"sm3" => [ "sm2" ],
|
2016-11-15 21:53:33 +08:00
|
|
|
sub { !$disabled{"unit-test"} } => [ "heartbeats" ],
|
2016-07-29 02:24:28 +08:00
|
|
|
|
|
|
|
sub { !$disabled{"msan"} } => [ "asm" ],
|
2015-05-18 17:03:47 +08: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;
|
|
|
|
}
|
|
|
|
|
2008-12-02 09:21:39 +08:00
|
|
|
# Explicit "no-..." options will be collected in %disabled along with the defaults.
|
2016-02-11 00:10:39 +08:00
|
|
|
# To remove something from %disabled, use "enable-foo".
|
2008-12-02 09:21:39 +08:00
|
|
|
# For symmetry, "disable-foo" is a synonym for "no-foo".
|
|
|
|
|
1999-04-25 06:59:36 +08:00
|
|
|
&usage if ($#ARGV < 0);
|
1998-12-21 18:52:47 +08:00
|
|
|
|
2018-01-27 02:56:44 +08:00
|
|
|
# For the "make variables" CINCLUDES and CDEFINES, we support lists with
|
|
|
|
# platform specific list separators. Users from those platforms should
|
|
|
|
# recognise those separators from how you set up the PATH to find executables.
|
|
|
|
# The default is the Unix like separator, :, but as an exception, we also
|
|
|
|
# support the space as separator.
|
|
|
|
my $list_separator_re =
|
|
|
|
{ VMS => qr/(?<!\^),/,
|
|
|
|
MSWin32 => qr/(?<!\\);/ } -> {$^O} // qr/(?<!\\)[:\s]/;
|
|
|
|
# All the "make variables" we support
|
2018-03-16 15:59:03 +08:00
|
|
|
# Some get pre-populated for the sake of backward compatibility
|
|
|
|
# (we supported those before the change to "make variable" support.
|
2018-01-27 02:56:44 +08:00
|
|
|
my %user = (
|
2018-03-16 15:59:03 +08:00
|
|
|
AR => env('AR'),
|
2018-01-27 02:56:44 +08:00
|
|
|
ARFLAGS => [],
|
|
|
|
AS => undef,
|
|
|
|
ASFLAGS => [],
|
2018-03-16 15:59:03 +08:00
|
|
|
CC => env('CC'),
|
2018-01-27 02:56:44 +08:00
|
|
|
CFLAGS => [],
|
2018-03-16 15:59:03 +08:00
|
|
|
CXX => env('CXX'),
|
2018-01-27 02:56:44 +08:00
|
|
|
CXXFLAGS => [],
|
|
|
|
CPP => undef,
|
|
|
|
CPPFLAGS => [], # -D, -I, -Wp,
|
|
|
|
CPPDEFINES => [], # Alternative for -D
|
|
|
|
CPPINCLUDES => [], # Alternative for -I
|
2018-03-16 15:59:03 +08:00
|
|
|
CROSS_COMPILE => env('CROSS_COMPILE'),
|
|
|
|
HASHBANGPERL=> env('HASHBANGPERL') || env('PERL'),
|
2018-01-27 02:56:44 +08:00
|
|
|
LD => undef,
|
|
|
|
LDFLAGS => [], # -L, -Wl,
|
|
|
|
LDLIBS => [], # -l
|
|
|
|
MT => undef,
|
|
|
|
MTFLAGS => [],
|
2018-07-08 18:00:06 +08:00
|
|
|
PERL => env('PERL') || ($^O ne "VMS" ? $^X : "perl"),
|
2018-03-16 15:59:03 +08:00
|
|
|
RANLIB => env('RANLIB'),
|
|
|
|
RC => env('RC') || env('WINDRES'),
|
2018-01-27 02:56:44 +08:00
|
|
|
RCFLAGS => [],
|
|
|
|
RM => undef,
|
|
|
|
);
|
2018-02-02 19:27:29 +08:00
|
|
|
# Info about what "make variables" may be prefixed with the cross compiler
|
|
|
|
# prefix. This should NEVER mention any such variable with a list for value.
|
|
|
|
my @user_crossable = qw ( AR AS CC CXX CPP LD MT RANLIB RC );
|
2018-01-27 02:56:44 +08:00
|
|
|
# The same but for flags given as Configure options. These are *additional*
|
|
|
|
# input, as opposed to the VAR=string option that override the corresponding
|
|
|
|
# config target attributes
|
|
|
|
my %useradd = (
|
|
|
|
CPPDEFINES => [],
|
|
|
|
CPPINCLUDES => [],
|
|
|
|
CPPFLAGS => [],
|
|
|
|
CFLAGS => [],
|
|
|
|
CXXFLAGS => [],
|
|
|
|
LDFLAGS => [],
|
|
|
|
LDLIBS => [],
|
|
|
|
);
|
|
|
|
|
|
|
|
my %user_synonyms = (
|
|
|
|
HASHBANGPERL=> 'PERL',
|
|
|
|
RC => 'WINDRES',
|
|
|
|
);
|
Make "make variables" config attributes for overridable flags
With the support of "make variables" comes the possibility for the
user to override them. However, we need to make a difference between
defaults that we use (and that should be overridable by the user) and
flags that are crucial for building OpenSSL (should not be
overridable).
Typically, overridable flags are those setting optimization levels,
warnings levels, that kind of thing, while non-overridable flags are,
for example, macros that indicate aspects of how the config target
should be treated, such as L_ENDIAN and B_ENDIAN.
We do that differentiation by allowing upper case attributes in the
config targets, named exactly like the "make variables" we support,
and reserving the lower case attributes for non-overridable project
flags.
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5534)
2018-03-07 03:35:30 +08:00
|
|
|
|
|
|
|
# Some target attributes have been renamed, this is the translation table
|
|
|
|
my %target_attr_translate =(
|
|
|
|
ar => 'AR',
|
|
|
|
as => 'AS',
|
|
|
|
cc => 'CC',
|
|
|
|
cxx => 'CXX',
|
|
|
|
cpp => 'CPP',
|
|
|
|
hashbangperl => 'HASHBANGPERL',
|
|
|
|
ld => 'LD',
|
|
|
|
mt => 'MT',
|
|
|
|
ranlib => 'RANLIB',
|
|
|
|
rc => 'RC',
|
|
|
|
rm => 'RM',
|
2018-01-27 02:56:44 +08:00
|
|
|
);
|
|
|
|
|
config: Pass diverse flags to Configure via the environment
Passing flags "discovered" by 'config' on the command line to
'Configure' mixes them up with flags given by the user. That is
contrary to their intention, so they need to be passed in a different
manner.
Enter the environment variables __CNF_CPPDEFINES, __CNF_CPPINCLUDES,
__CNF_CPPFLAGS, __CNF_CFLAGS, __CNF_CXXFLAGS, __CNF_LDFLAGS, and
__CNF_LDLIBS, initialised by 'config', and then used by Configure to
initialise these %config values: defines, includes, cppflags, cflags,
cxxflags, lflags, and ex_libs.
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5534)
2018-03-08 05:44:59 +08:00
|
|
|
# Initialisers coming from 'config' scripts
|
2018-03-28 16:06:32 +08:00
|
|
|
$config{defines} = [ split(/$list_separator_re/, env('__CNF_CPPDEFINES')) ];
|
|
|
|
$config{includes} = [ split(/$list_separator_re/, env('__CNF_CPPINCLUDES')) ];
|
|
|
|
$config{cppflags} = [ env('__CNF_CPPFLAGS') || () ];
|
|
|
|
$config{cflags} = [ env('__CNF_CFLAGS') || () ];
|
|
|
|
$config{cxxflags} = [ env('__CNF_CXXFLAGS') || () ];
|
|
|
|
$config{lflags} = [ env('__CNF_LDFLAGS') || () ];
|
|
|
|
$config{ex_libs} = [ env('__CNF_LDLIBS') || () ];
|
config: Pass diverse flags to Configure via the environment
Passing flags "discovered" by 'config' on the command line to
'Configure' mixes them up with flags given by the user. That is
contrary to their intention, so they need to be passed in a different
manner.
Enter the environment variables __CNF_CPPDEFINES, __CNF_CPPINCLUDES,
__CNF_CPPFLAGS, __CNF_CFLAGS, __CNF_CXXFLAGS, __CNF_LDFLAGS, and
__CNF_LDLIBS, initialised by 'config', and then used by Configure to
initialise these %config values: defines, includes, cppflags, cflags,
cxxflags, lflags, and ex_libs.
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5534)
2018-03-08 05:44:59 +08:00
|
|
|
|
2015-05-19 07:40:54 +08:00
|
|
|
$config{openssl_api_defines}=[];
|
|
|
|
$config{openssl_sys_defines}=[];
|
2018-11-04 01:34:09 +08:00
|
|
|
$config{openssl_feature_defines}=[];
|
2016-01-12 07:17:12 +08:00
|
|
|
$config{options}="";
|
2016-03-03 02:13:26 +08:00
|
|
|
$config{build_type} = "release";
|
2018-01-27 02:56:44 +08:00
|
|
|
my $target="";
|
2000-08-17 18:23:45 +08:00
|
|
|
|
Configure: Don't fail if there were "make variables" set in env
The original intent was that if someone had a "make variable" set in
any kind of way, be it as an environment variable or as an argument to
Configure, we wouldn't allow compiler or linker flags as arguments as
well. That made both of these configurations equivalently impossible:
./Configure target CFLAGS=-foo -lextra
CFLAGS=-foo ./Configure target -lextra
While this makes things look nice and consistent, real world use makes
this hard, as many projects where OpenSSL is a component also set
these variables for other components that use GNU autotools.
Therefore, we need to adapt our Configure accordingly. By
consequence, the two Configure lines above will not be equivalent any
more:
./Configure target CFLAGS=-foo -lextra
This command line will still fail, because the "make variable" was
given as a command line argument. This cannot be a mistake and is
therefore not allowed.
CFLAGS=-foo ./Configure target -lextra
This command line will work, but because there is a linker flag as
a command line argument, the environment (i.e. CFLAGS) is ignored.
That isn't quite consistent with the previous command, but is the old
Configure behavior, before the support for "make variables" was added,
and is therefore the backward compatible behavior.
Fixes google/oss-fuzz#1244
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5641)
2018-03-16 15:24:50 +08:00
|
|
|
my %cmdvars = (); # Stores FOO='blah' type arguments
|
2015-05-18 09:33:55 +08:00
|
|
|
my %unsupported_options = ();
|
2016-02-22 17:42:53 +08:00
|
|
|
my %deprecated_options = ();
|
2017-07-18 21:39:21 +08:00
|
|
|
# If you change this, update apps/version.c
|
|
|
|
my @known_seed_sources = qw(getrandom devrandom os egd none rdcpu librandom);
|
|
|
|
my @seed_sources = ();
|
2016-10-12 23:05:35 +08:00
|
|
|
while (@argvcopy)
|
2015-12-03 01:54:15 +08:00
|
|
|
{
|
2016-10-12 23:05:35 +08:00
|
|
|
$_ = shift @argvcopy;
|
2017-11-29 20:16:53 +08:00
|
|
|
|
|
|
|
# Support env variable assignments among the options
|
|
|
|
if (m|^(\w+)=(.+)?$|)
|
|
|
|
{
|
Configure: Don't fail if there were "make variables" set in env
The original intent was that if someone had a "make variable" set in
any kind of way, be it as an environment variable or as an argument to
Configure, we wouldn't allow compiler or linker flags as arguments as
well. That made both of these configurations equivalently impossible:
./Configure target CFLAGS=-foo -lextra
CFLAGS=-foo ./Configure target -lextra
While this makes things look nice and consistent, real world use makes
this hard, as many projects where OpenSSL is a component also set
these variables for other components that use GNU autotools.
Therefore, we need to adapt our Configure accordingly. By
consequence, the two Configure lines above will not be equivalent any
more:
./Configure target CFLAGS=-foo -lextra
This command line will still fail, because the "make variable" was
given as a command line argument. This cannot be a mistake and is
therefore not allowed.
CFLAGS=-foo ./Configure target -lextra
This command line will work, but because there is a linker flag as
a command line argument, the environment (i.e. CFLAGS) is ignored.
That isn't quite consistent with the previous command, but is the old
Configure behavior, before the support for "make variables" was added,
and is therefore the backward compatible behavior.
Fixes google/oss-fuzz#1244
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5641)
2018-03-16 15:24:50 +08:00
|
|
|
$cmdvars{$1} = $2;
|
2018-01-27 02:56:44 +08:00
|
|
|
# Every time a variable is given as a configuration argument,
|
|
|
|
# it acts as a reset if the variable.
|
|
|
|
if (exists $user{$1})
|
|
|
|
{
|
|
|
|
$user{$1} = ref $user{$1} eq "ARRAY" ? [] : undef;
|
|
|
|
}
|
2018-03-08 21:16:18 +08:00
|
|
|
#if (exists $useradd{$1})
|
|
|
|
# {
|
|
|
|
# $useradd{$1} = [];
|
|
|
|
# }
|
2017-11-29 20:16:53 +08:00
|
|
|
next;
|
|
|
|
}
|
|
|
|
|
2016-02-16 23:07:05 +08:00
|
|
|
# VMS is a case insensitive environment, and depending on settings
|
|
|
|
# out of our control, we may receive options uppercased. Let's
|
|
|
|
# downcase at least the part before any equal sign.
|
|
|
|
if ($^O eq "VMS")
|
|
|
|
{
|
|
|
|
s/^([^=]*)/lc($1)/e;
|
|
|
|
}
|
2018-03-14 16:42:42 +08:00
|
|
|
|
|
|
|
# some people just can't read the instructions, clang people have to...
|
|
|
|
s/^-no-(?!integrated-as)/no-/;
|
2005-02-22 18:29:51 +08:00
|
|
|
|
2015-05-18 09:33:55 +08: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 18:29:51 +08:00
|
|
|
|
2016-02-11 00:10:39 +08:00
|
|
|
if (/^(no|disable|enable)-(.+)$/)
|
2016-06-16 18:45:24 +08:00
|
|
|
{
|
|
|
|
my $word = $2;
|
|
|
|
if (!exists $deprecated_disablables{$word}
|
|
|
|
&& !grep { $word =~ /^${_}$/ } @disablables)
|
|
|
|
{
|
|
|
|
$unsupported_options{$_} = 1;
|
|
|
|
next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (/^no-(.+)$/ || /^disable-(.+)$/)
|
|
|
|
{
|
2016-02-11 00:10:39 +08:00
|
|
|
foreach my $proto ((@tls, @dtls))
|
|
|
|
{
|
|
|
|
if ($1 eq "$proto-method")
|
|
|
|
{
|
|
|
|
$disabled{"$proto"} = "option($proto-method)";
|
|
|
|
last;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if ($1 eq "dtls")
|
|
|
|
{
|
|
|
|
foreach my $proto (@dtls)
|
|
|
|
{
|
|
|
|
$disabled{$proto} = "option(dtls)";
|
|
|
|
}
|
2016-03-28 06:31:23 +08:00
|
|
|
$disabled{"dtls"} = "option(dtls)";
|
2016-02-11 00:10:39 +08: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)
|
|
|
|
{
|
|
|
|
$disabled{$proto} = "option(tls)";
|
|
|
|
}
|
|
|
|
}
|
2016-02-20 05:08:37 +08:00
|
|
|
elsif ($1 eq "static-engine")
|
|
|
|
{
|
2016-02-22 09:06:05 +08:00
|
|
|
delete $disabled{"dynamic-engine"};
|
2016-02-20 05:08:37 +08:00
|
|
|
}
|
|
|
|
elsif ($1 eq "dynamic-engine")
|
|
|
|
{
|
2016-02-22 09:06:05 +08:00
|
|
|
$disabled{"dynamic-engine"} = "option";
|
2016-02-20 05:08:37 +08:00
|
|
|
}
|
2016-06-16 18:45:24 +08:00
|
|
|
elsif (exists $deprecated_disablables{$1})
|
|
|
|
{
|
|
|
|
$deprecated_options{$_} = 1;
|
|
|
|
if (defined $deprecated_disablables{$1})
|
|
|
|
{
|
|
|
|
$disabled{$deprecated_disablables{$1}} = "option";
|
|
|
|
}
|
|
|
|
}
|
2016-02-11 00:10:39 +08:00
|
|
|
else
|
|
|
|
{
|
|
|
|
$disabled{$1} = "option";
|
|
|
|
}
|
Configure - Get rid of the special thread_cflag, replace with thread_scheme
The thread_cflag setting filled a double role, as kinda sorta an
indicator of thread scheme, and as cflags. Some configs also added
lflags and ex_libs for multithreading regardless of if threading would
be enabled or not.
Instead of this, add threading cflags among in the cflag setting,
threading lflags in the lflag setting and so on if and only if threads
are enabled (which they are by default).
Also, for configs where there are no special cflags for threading (the
VMS configs are of that kind), this makes it possible to still clearly
mention what thread scheme is used.
The exact value of thread scheme is currently ignored except when it's
"(unknown)", and thereby only serves as a flag to tell if we know how
to build for multi-threading in a particular config. Yet, the
currently used values are "(unknown)", "pthreads", "uithreads" (a.k.a
solaris threads) and "winthreads".
Reviewed-by: Andy Polyakov <appro@openssl.org>
2016-02-27 23:51:34 +08:00
|
|
|
# No longer an automatic choice
|
|
|
|
$auto_threads = 0 if ($1 eq "threads");
|
2015-05-18 09:33:55 +08:00
|
|
|
}
|
2016-02-11 00:10:39 +08:00
|
|
|
elsif (/^enable-(.+)$/)
|
2015-05-18 09:33:55 +08:00
|
|
|
{
|
2016-02-20 05:08:37 +08:00
|
|
|
if ($1 eq "static-engine")
|
|
|
|
{
|
2016-02-22 09:06:05 +08:00
|
|
|
$disabled{"dynamic-engine"} = "option";
|
2016-02-20 05:08:37 +08:00
|
|
|
}
|
|
|
|
elsif ($1 eq "dynamic-engine")
|
|
|
|
{
|
2016-02-22 09:06:05 +08:00
|
|
|
delete $disabled{"dynamic-engine"};
|
2016-02-20 05:08:37 +08:00
|
|
|
}
|
2016-03-03 17:07:29 +08:00
|
|
|
elsif ($1 eq "zlib-dynamic")
|
|
|
|
{
|
|
|
|
delete $disabled{"zlib"};
|
|
|
|
}
|
2015-05-18 09:33:55 +08:00
|
|
|
my $algo = $1;
|
|
|
|
delete $disabled{$algo};
|
2005-02-22 18:29:51 +08:00
|
|
|
|
Configure - Get rid of the special thread_cflag, replace with thread_scheme
The thread_cflag setting filled a double role, as kinda sorta an
indicator of thread scheme, and as cflags. Some configs also added
lflags and ex_libs for multithreading regardless of if threading would
be enabled or not.
Instead of this, add threading cflags among in the cflag setting,
threading lflags in the lflag setting and so on if and only if threads
are enabled (which they are by default).
Also, for configs where there are no special cflags for threading (the
VMS configs are of that kind), this makes it possible to still clearly
mention what thread scheme is used.
The exact value of thread scheme is currently ignored except when it's
"(unknown)", and thereby only serves as a flag to tell if we know how
to build for multi-threading in a particular config. Yet, the
currently used values are "(unknown)", "pthreads", "uithreads" (a.k.a
solaris threads) and "winthreads".
Reviewed-by: Andy Polyakov <appro@openssl.org>
2016-02-27 23:51:34 +08:00
|
|
|
# No longer an automatic choice
|
|
|
|
$auto_threads = 0 if ($1 eq "threads");
|
2015-05-18 09:33:55 +08:00
|
|
|
}
|
|
|
|
elsif (/^--strict-warnings$/)
|
|
|
|
{
|
|
|
|
$strict_warnings = 1;
|
|
|
|
}
|
|
|
|
elsif (/^--debug$/)
|
|
|
|
{
|
2016-03-03 02:13:26 +08:00
|
|
|
$config{build_type} = "debug";
|
2015-05-18 09:33:55 +08:00
|
|
|
}
|
|
|
|
elsif (/^--release$/)
|
|
|
|
{
|
2016-03-03 02:13:26 +08:00
|
|
|
$config{build_type} = "release";
|
2015-05-18 09:33:55 +08:00
|
|
|
}
|
|
|
|
elsif (/^386$/)
|
2015-05-19 07:40:54 +08:00
|
|
|
{ $config{processor}=386; }
|
2015-05-18 09:33:55 +08:00
|
|
|
elsif (/^fips$/)
|
|
|
|
{
|
2017-02-28 19:30:28 +08:00
|
|
|
die "FIPS mode not supported\n";
|
2015-05-18 09:33:55 +08: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$/)
|
|
|
|
{
|
2017-02-28 19:30:28 +08:00
|
|
|
die "FIPS mode not supported\n";
|
2015-05-18 09:33:55 +08:00
|
|
|
}
|
|
|
|
elsif (/^[-+]/)
|
|
|
|
{
|
2016-04-03 00:36:52 +08:00
|
|
|
if (/^--prefix=(.*)$/)
|
2015-05-18 09:33:55 +08: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-19 04:35:23 +08:00
|
|
|
$config{prefix}=$1;
|
2016-01-30 09:57:19 +08:00
|
|
|
die "Directory given with --prefix MUST be absolute\n"
|
|
|
|
unless file_name_is_absolute($config{prefix});
|
2005-02-22 18:29:51 +08:00
|
|
|
}
|
2015-05-18 09:33:55 +08:00
|
|
|
elsif (/^--api=(.*)$/)
|
2009-09-10 00:31:32 +08:00
|
|
|
{
|
2015-05-21 02:03:20 +08:00
|
|
|
$config{api}=$1;
|
2009-09-10 00:31:32 +08:00
|
|
|
}
|
2015-05-18 09:33:55 +08:00
|
|
|
elsif (/^--libdir=(.*)$/)
|
2015-03-17 23:30:54 +08:00
|
|
|
{
|
2015-05-21 02:03:20 +08:00
|
|
|
$config{libdir}=$1;
|
2015-03-17 23:30:54 +08:00
|
|
|
}
|
2015-05-18 09:33:55 +08:00
|
|
|
elsif (/^--openssldir=(.*)$/)
|
2015-03-17 23:30:54 +08: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-19 04:35:23 +08:00
|
|
|
$config{openssldir}=$1;
|
2015-03-17 23:30:54 +08:00
|
|
|
}
|
2015-05-18 09:33:55 +08:00
|
|
|
elsif (/^--with-zlib-lib=(.*)$/)
|
2011-01-30 08:01:09 +08:00
|
|
|
{
|
2016-02-04 00:31:40 +08:00
|
|
|
$withargs{zlib_lib}=$1;
|
2011-10-19 17:24:22 +08:00
|
|
|
}
|
2015-05-18 09:33:55 +08:00
|
|
|
elsif (/^--with-zlib-include=(.*)$/)
|
1999-03-06 22:35:03 +08:00
|
|
|
{
|
2016-04-12 22:35:32 +08:00
|
|
|
$withargs{zlib_include}=$1;
|
1999-04-25 06:59:36 +08:00
|
|
|
}
|
2016-05-08 04:09:13 +08:00
|
|
|
elsif (/^--with-fuzzer-lib=(.*)$/)
|
|
|
|
{
|
|
|
|
$withargs{fuzzer_lib}=$1;
|
|
|
|
}
|
|
|
|
elsif (/^--with-fuzzer-include=(.*)$/)
|
|
|
|
{
|
|
|
|
$withargs{fuzzer_include}=$1;
|
|
|
|
}
|
2017-07-18 21:39:21 +08:00
|
|
|
elsif (/^--with-rand-seed=(.*)$/)
|
|
|
|
{
|
|
|
|
foreach my $x (split(m|,|, $1))
|
|
|
|
{
|
|
|
|
die "Unknown --with-rand-seed choice $x\n"
|
|
|
|
if ! grep { $x eq $_ } @known_seed_sources;
|
|
|
|
push @seed_sources, $x;
|
|
|
|
}
|
|
|
|
}
|
2015-05-18 09:33:55 +08:00
|
|
|
elsif (/^--cross-compile-prefix=(.*)$/)
|
1999-04-30 05:52:08 +08:00
|
|
|
{
|
2018-02-02 19:27:29 +08:00
|
|
|
$user{CROSS_COMPILE}=$1;
|
1999-04-30 05:52:08 +08:00
|
|
|
}
|
2015-05-18 09:33:55 +08:00
|
|
|
elsif (/^--config=(.*)$/)
|
1998-12-21 18:52:47 +08:00
|
|
|
{
|
2015-05-18 09:33:55 +08:00
|
|
|
read_config $1;
|
2000-08-17 18:23:45 +08:00
|
|
|
}
|
2018-06-19 01:08:50 +08:00
|
|
|
elsif (/^-l(.*)$/)
|
2005-02-22 18:29:51 +08:00
|
|
|
{
|
2018-01-27 02:56:44 +08:00
|
|
|
push @{$useradd{LDLIBS}}, $_;
|
1998-12-21 18:52:47 +08:00
|
|
|
}
|
2017-04-04 04:31:05 +08:00
|
|
|
elsif (/^-framework$/)
|
|
|
|
{
|
2018-01-27 02:56:44 +08:00
|
|
|
push @{$useradd{LDLIBS}}, $_, shift(@argvcopy);
|
2017-04-04 04:31:05 +08:00
|
|
|
}
|
2018-06-19 01:08:50 +08:00
|
|
|
elsif (/^-L(.*)$/ or /^-Wl,/)
|
|
|
|
{
|
|
|
|
push @{$useradd{LDFLAGS}}, $_;
|
|
|
|
}
|
2016-10-12 23:05:35 +08:00
|
|
|
elsif (/^-rpath$/ or /^-R$/)
|
|
|
|
# -rpath is the OSF1 rpath flag
|
|
|
|
# -R is the old Solaris rpath flag
|
|
|
|
{
|
|
|
|
my $rpath = shift(@argvcopy) || "";
|
|
|
|
$rpath .= " " if $rpath ne "";
|
2018-01-27 02:56:44 +08:00
|
|
|
push @{$useradd{LDFLAGS}}, $_, $rpath;
|
2016-10-12 23:05:35 +08:00
|
|
|
}
|
2016-08-14 23:24:10 +08:00
|
|
|
elsif (/^-static$/)
|
|
|
|
{
|
2018-01-27 02:56:44 +08:00
|
|
|
push @{$useradd{LDFLAGS}}, $_;
|
2016-09-02 03:36:13 +08:00
|
|
|
$disabled{"dso"} = "forced";
|
2016-08-14 23:24:10 +08:00
|
|
|
$disabled{"pic"} = "forced";
|
|
|
|
$disabled{"shared"} = "forced";
|
|
|
|
$disabled{"threads"} = "forced";
|
|
|
|
}
|
2016-01-30 09:17:05 +08:00
|
|
|
elsif (/^-D(.*)$/)
|
|
|
|
{
|
2018-01-27 02:56:44 +08:00
|
|
|
push @{$useradd{CPPDEFINES}}, $1;
|
2016-01-30 09:17:05 +08:00
|
|
|
}
|
2018-01-23 20:54:55 +08:00
|
|
|
elsif (/^-I(.*)$/)
|
|
|
|
{
|
2018-01-27 02:56:44 +08:00
|
|
|
push @{$useradd{CPPINCLUDES}}, $1;
|
2018-01-23 20:54:55 +08:00
|
|
|
}
|
|
|
|
elsif (/^-Wp,$/)
|
|
|
|
{
|
2018-01-27 02:56:44 +08:00
|
|
|
push @{$useradd{CPPFLAGS}}, $1;
|
2018-01-23 20:54:55 +08:00
|
|
|
}
|
2015-05-18 09:33:55 +08:00
|
|
|
else # common if (/^[-+]/), just pass down...
|
|
|
|
{
|
|
|
|
$_ =~ s/%([0-9a-f]{1,2})/chr(hex($1))/gei;
|
2018-01-27 02:56:44 +08:00
|
|
|
push @{$useradd{CFLAGS}}, $_;
|
|
|
|
push @{$useradd{CXXFLAGS}}, $_;
|
2015-05-18 09:33:55 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
die "target already defined - $target (offending arg: $_)\n" if ($target ne "");
|
|
|
|
$target=$_;
|
|
|
|
}
|
|
|
|
unless ($_ eq $target || /^no-/ || /^disable-/)
|
|
|
|
{
|
2017-11-12 08:03:10 +08:00
|
|
|
# "no-..." follows later after implied deactivations
|
2016-03-11 04:34:48 +08:00
|
|
|
# have been derived. (Don't take this too seriously,
|
2015-05-18 09:33:55 +08:00
|
|
|
# we really only write OPTIONS to the Makefile out of
|
|
|
|
# nostalgia.)
|
|
|
|
|
2016-01-12 07:17:12 +08:00
|
|
|
if ($config{options} eq "")
|
|
|
|
{ $config{options} = $_; }
|
2015-05-18 09:33:55 +08:00
|
|
|
else
|
2016-01-12 07:17:12 +08:00
|
|
|
{ $config{options} .= " ".$_; }
|
1999-07-09 20:00:34 +08:00
|
|
|
}
|
2018-07-22 16:56:25 +08:00
|
|
|
}
|
2015-10-22 23:33:47 +08:00
|
|
|
|
2018-07-22 16:56:25 +08:00
|
|
|
if (defined($config{api}) && !exists $apitable->{$config{api}}) {
|
|
|
|
die "***** Unsupported api compatibility level: $config{api}\n",
|
|
|
|
}
|
2016-01-05 12:00:33 +08:00
|
|
|
|
2018-07-22 16:56:25 +08:00
|
|
|
if (keys %deprecated_options)
|
|
|
|
{
|
|
|
|
warn "***** Deprecated options: ",
|
|
|
|
join(", ", keys %deprecated_options), "\n";
|
|
|
|
}
|
|
|
|
if (keys %unsupported_options)
|
|
|
|
{
|
|
|
|
die "***** Unsupported options: ",
|
|
|
|
join(", ", keys %unsupported_options), "\n";
|
1999-07-09 20:00:34 +08:00
|
|
|
}
|
2001-11-27 19:48:30 +08:00
|
|
|
|
Configure: Don't fail if there were "make variables" set in env
The original intent was that if someone had a "make variable" set in
any kind of way, be it as an environment variable or as an argument to
Configure, we wouldn't allow compiler or linker flags as arguments as
well. That made both of these configurations equivalently impossible:
./Configure target CFLAGS=-foo -lextra
CFLAGS=-foo ./Configure target -lextra
While this makes things look nice and consistent, real world use makes
this hard, as many projects where OpenSSL is a component also set
these variables for other components that use GNU autotools.
Therefore, we need to adapt our Configure accordingly. By
consequence, the two Configure lines above will not be equivalent any
more:
./Configure target CFLAGS=-foo -lextra
This command line will still fail, because the "make variable" was
given as a command line argument. This cannot be a mistake and is
therefore not allowed.
CFLAGS=-foo ./Configure target -lextra
This command line will work, but because there is a linker flag as
a command line argument, the environment (i.e. CFLAGS) is ignored.
That isn't quite consistent with the previous command, but is the old
Configure behavior, before the support for "make variables" was added,
and is therefore the backward compatible behavior.
Fixes google/oss-fuzz#1244
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5641)
2018-03-16 15:24:50 +08:00
|
|
|
# If any %useradd entry has been set, we must check that the "make
|
|
|
|
# variables" haven't been set. We start by checking of any %useradd entry
|
2018-03-09 01:49:37 +08:00
|
|
|
# is set.
|
2018-03-08 21:16:18 +08:00
|
|
|
if (grep { scalar @$_ > 0 } values %useradd) {
|
2018-03-09 01:49:37 +08:00
|
|
|
# Hash of env / make variables names. The possible values are:
|
Configure: Don't fail if there were "make variables" set in env
The original intent was that if someone had a "make variable" set in
any kind of way, be it as an environment variable or as an argument to
Configure, we wouldn't allow compiler or linker flags as arguments as
well. That made both of these configurations equivalently impossible:
./Configure target CFLAGS=-foo -lextra
CFLAGS=-foo ./Configure target -lextra
While this makes things look nice and consistent, real world use makes
this hard, as many projects where OpenSSL is a component also set
these variables for other components that use GNU autotools.
Therefore, we need to adapt our Configure accordingly. By
consequence, the two Configure lines above will not be equivalent any
more:
./Configure target CFLAGS=-foo -lextra
This command line will still fail, because the "make variable" was
given as a command line argument. This cannot be a mistake and is
therefore not allowed.
CFLAGS=-foo ./Configure target -lextra
This command line will work, but because there is a linker flag as
a command line argument, the environment (i.e. CFLAGS) is ignored.
That isn't quite consistent with the previous command, but is the old
Configure behavior, before the support for "make variables" was added,
and is therefore the backward compatible behavior.
Fixes google/oss-fuzz#1244
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5641)
2018-03-16 15:24:50 +08:00
|
|
|
# 1 - "make vars"
|
2018-03-09 01:49:37 +08:00
|
|
|
# 2 - %useradd entry set
|
|
|
|
# 3 - both set
|
Configure: Don't fail if there were "make variables" set in env
The original intent was that if someone had a "make variable" set in
any kind of way, be it as an environment variable or as an argument to
Configure, we wouldn't allow compiler or linker flags as arguments as
well. That made both of these configurations equivalently impossible:
./Configure target CFLAGS=-foo -lextra
CFLAGS=-foo ./Configure target -lextra
While this makes things look nice and consistent, real world use makes
this hard, as many projects where OpenSSL is a component also set
these variables for other components that use GNU autotools.
Therefore, we need to adapt our Configure accordingly. By
consequence, the two Configure lines above will not be equivalent any
more:
./Configure target CFLAGS=-foo -lextra
This command line will still fail, because the "make variable" was
given as a command line argument. This cannot be a mistake and is
therefore not allowed.
CFLAGS=-foo ./Configure target -lextra
This command line will work, but because there is a linker flag as
a command line argument, the environment (i.e. CFLAGS) is ignored.
That isn't quite consistent with the previous command, but is the old
Configure behavior, before the support for "make variables" was added,
and is therefore the backward compatible behavior.
Fixes google/oss-fuzz#1244
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5641)
2018-03-16 15:24:50 +08:00
|
|
|
my %detected_vars =
|
2018-03-09 01:49:37 +08:00
|
|
|
map { my $v = 0;
|
Configure: Don't fail if there were "make variables" set in env
The original intent was that if someone had a "make variable" set in
any kind of way, be it as an environment variable or as an argument to
Configure, we wouldn't allow compiler or linker flags as arguments as
well. That made both of these configurations equivalently impossible:
./Configure target CFLAGS=-foo -lextra
CFLAGS=-foo ./Configure target -lextra
While this makes things look nice and consistent, real world use makes
this hard, as many projects where OpenSSL is a component also set
these variables for other components that use GNU autotools.
Therefore, we need to adapt our Configure accordingly. By
consequence, the two Configure lines above will not be equivalent any
more:
./Configure target CFLAGS=-foo -lextra
This command line will still fail, because the "make variable" was
given as a command line argument. This cannot be a mistake and is
therefore not allowed.
CFLAGS=-foo ./Configure target -lextra
This command line will work, but because there is a linker flag as
a command line argument, the environment (i.e. CFLAGS) is ignored.
That isn't quite consistent with the previous command, but is the old
Configure behavior, before the support for "make variables" was added,
and is therefore the backward compatible behavior.
Fixes google/oss-fuzz#1244
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5641)
2018-03-16 15:24:50 +08:00
|
|
|
$v += 1 if $cmdvars{$_};
|
2018-03-09 01:49:37 +08:00
|
|
|
$v += 2 if @{$useradd{$_}};
|
|
|
|
$_ => $v }
|
|
|
|
keys %useradd;
|
|
|
|
|
Configure: Don't fail if there were "make variables" set in env
The original intent was that if someone had a "make variable" set in
any kind of way, be it as an environment variable or as an argument to
Configure, we wouldn't allow compiler or linker flags as arguments as
well. That made both of these configurations equivalently impossible:
./Configure target CFLAGS=-foo -lextra
CFLAGS=-foo ./Configure target -lextra
While this makes things look nice and consistent, real world use makes
this hard, as many projects where OpenSSL is a component also set
these variables for other components that use GNU autotools.
Therefore, we need to adapt our Configure accordingly. By
consequence, the two Configure lines above will not be equivalent any
more:
./Configure target CFLAGS=-foo -lextra
This command line will still fail, because the "make variable" was
given as a command line argument. This cannot be a mistake and is
therefore not allowed.
CFLAGS=-foo ./Configure target -lextra
This command line will work, but because there is a linker flag as
a command line argument, the environment (i.e. CFLAGS) is ignored.
That isn't quite consistent with the previous command, but is the old
Configure behavior, before the support for "make variables" was added,
and is therefore the backward compatible behavior.
Fixes google/oss-fuzz#1244
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5641)
2018-03-16 15:24:50 +08:00
|
|
|
# If any of the corresponding "make variables" is set, we error
|
|
|
|
if (grep { $_ & 1 } values %detected_vars) {
|
|
|
|
my $names = join(', ', grep { $detected_vars{$_} > 0 }
|
|
|
|
sort keys %detected_vars);
|
2018-03-08 21:16:18 +08:00
|
|
|
die <<"_____";
|
Configure: Don't fail if there were "make variables" set in env
The original intent was that if someone had a "make variable" set in
any kind of way, be it as an environment variable or as an argument to
Configure, we wouldn't allow compiler or linker flags as arguments as
well. That made both of these configurations equivalently impossible:
./Configure target CFLAGS=-foo -lextra
CFLAGS=-foo ./Configure target -lextra
While this makes things look nice and consistent, real world use makes
this hard, as many projects where OpenSSL is a component also set
these variables for other components that use GNU autotools.
Therefore, we need to adapt our Configure accordingly. By
consequence, the two Configure lines above will not be equivalent any
more:
./Configure target CFLAGS=-foo -lextra
This command line will still fail, because the "make variable" was
given as a command line argument. This cannot be a mistake and is
therefore not allowed.
CFLAGS=-foo ./Configure target -lextra
This command line will work, but because there is a linker flag as
a command line argument, the environment (i.e. CFLAGS) is ignored.
That isn't quite consistent with the previous command, but is the old
Configure behavior, before the support for "make variables" was added,
and is therefore the backward compatible behavior.
Fixes google/oss-fuzz#1244
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5641)
2018-03-16 15:24:50 +08:00
|
|
|
***** Mixing make variables and additional compiler/linker flags as
|
2018-03-08 21:16:18 +08:00
|
|
|
***** configure command line option is not permitted.
|
Configure: Don't fail if there were "make variables" set in env
The original intent was that if someone had a "make variable" set in
any kind of way, be it as an environment variable or as an argument to
Configure, we wouldn't allow compiler or linker flags as arguments as
well. That made both of these configurations equivalently impossible:
./Configure target CFLAGS=-foo -lextra
CFLAGS=-foo ./Configure target -lextra
While this makes things look nice and consistent, real world use makes
this hard, as many projects where OpenSSL is a component also set
these variables for other components that use GNU autotools.
Therefore, we need to adapt our Configure accordingly. By
consequence, the two Configure lines above will not be equivalent any
more:
./Configure target CFLAGS=-foo -lextra
This command line will still fail, because the "make variable" was
given as a command line argument. This cannot be a mistake and is
therefore not allowed.
CFLAGS=-foo ./Configure target -lextra
This command line will work, but because there is a linker flag as
a command line argument, the environment (i.e. CFLAGS) is ignored.
That isn't quite consistent with the previous command, but is the old
Configure behavior, before the support for "make variables" was added,
and is therefore the backward compatible behavior.
Fixes google/oss-fuzz#1244
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5641)
2018-03-16 15:24:50 +08:00
|
|
|
***** Affected make variables: $names
|
2018-03-08 21:16:18 +08:00
|
|
|
_____
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Configure: Don't fail if there were "make variables" set in env
The original intent was that if someone had a "make variable" set in
any kind of way, be it as an environment variable or as an argument to
Configure, we wouldn't allow compiler or linker flags as arguments as
well. That made both of these configurations equivalently impossible:
./Configure target CFLAGS=-foo -lextra
CFLAGS=-foo ./Configure target -lextra
While this makes things look nice and consistent, real world use makes
this hard, as many projects where OpenSSL is a component also set
these variables for other components that use GNU autotools.
Therefore, we need to adapt our Configure accordingly. By
consequence, the two Configure lines above will not be equivalent any
more:
./Configure target CFLAGS=-foo -lextra
This command line will still fail, because the "make variable" was
given as a command line argument. This cannot be a mistake and is
therefore not allowed.
CFLAGS=-foo ./Configure target -lextra
This command line will work, but because there is a linker flag as
a command line argument, the environment (i.e. CFLAGS) is ignored.
That isn't quite consistent with the previous command, but is the old
Configure behavior, before the support for "make variables" was added,
and is therefore the backward compatible behavior.
Fixes google/oss-fuzz#1244
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5641)
2018-03-16 15:24:50 +08:00
|
|
|
# Check through all supported command line variables to see if any of them
|
|
|
|
# were set, and canonicalise the values we got. If no compiler or linker
|
|
|
|
# flag or anything else that affects %useradd was set, we also check the
|
|
|
|
# environment for values.
|
|
|
|
my $anyuseradd =
|
|
|
|
grep { defined $_ && (ref $_ ne 'ARRAY' || @$_) } values %useradd;
|
2018-01-27 02:56:44 +08:00
|
|
|
foreach (keys %user) {
|
Configure: Don't fail if there were "make variables" set in env
The original intent was that if someone had a "make variable" set in
any kind of way, be it as an environment variable or as an argument to
Configure, we wouldn't allow compiler or linker flags as arguments as
well. That made both of these configurations equivalently impossible:
./Configure target CFLAGS=-foo -lextra
CFLAGS=-foo ./Configure target -lextra
While this makes things look nice and consistent, real world use makes
this hard, as many projects where OpenSSL is a component also set
these variables for other components that use GNU autotools.
Therefore, we need to adapt our Configure accordingly. By
consequence, the two Configure lines above will not be equivalent any
more:
./Configure target CFLAGS=-foo -lextra
This command line will still fail, because the "make variable" was
given as a command line argument. This cannot be a mistake and is
therefore not allowed.
CFLAGS=-foo ./Configure target -lextra
This command line will work, but because there is a linker flag as
a command line argument, the environment (i.e. CFLAGS) is ignored.
That isn't quite consistent with the previous command, but is the old
Configure behavior, before the support for "make variables" was added,
and is therefore the backward compatible behavior.
Fixes google/oss-fuzz#1244
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5641)
2018-03-16 15:24:50 +08:00
|
|
|
my $value = $cmdvars{$_};
|
|
|
|
$value //= env($_) unless $anyuseradd;
|
|
|
|
$value //=
|
|
|
|
defined $user_synonyms{$_} ? $cmdvars{$user_synonyms{$_}} : undef;
|
|
|
|
$value //= defined $user_synonyms{$_} ? env($user_synonyms{$_}) : undef
|
|
|
|
unless $anyuseradd;
|
2018-01-27 02:56:44 +08:00
|
|
|
|
|
|
|
if (defined $value) {
|
|
|
|
if (ref $user{$_} eq 'ARRAY') {
|
|
|
|
$user{$_} = [ split /$list_separator_re/, $value ];
|
|
|
|
} elsif (!defined $user{$_}) {
|
|
|
|
$user{$_} = $value;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-06-19 01:08:50 +08:00
|
|
|
if (grep { /-rpath\b/ } ($user{LDFLAGS} ? @{$user{LDFLAGS}} : ())
|
2016-09-08 02:56:20 +08:00
|
|
|
&& !$disabled{shared}
|
|
|
|
&& !($disabled{asan} && $disabled{msan} && $disabled{ubsan})) {
|
|
|
|
die "***** Cannot simultaneously use -rpath, shared libraries, and\n",
|
|
|
|
"***** any of asan, msan or ubsan\n";
|
|
|
|
}
|
|
|
|
|
2015-05-18 17:03:47 +08: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})) {
|
2016-04-06 21:02:57 +08:00
|
|
|
foreach(grep { !defined($disabled{$_}) } @$descendents) {
|
2016-03-14 17:02:13 +08:00
|
|
|
$new_tocheckfor{$_} = 1; $disabled{$_} = "forced";
|
2016-04-06 21:02:57 +08:00
|
|
|
}
|
2009-04-24 00:32:42 +08:00
|
|
|
}
|
2015-05-18 17:03:47 +08:00
|
|
|
}
|
|
|
|
@tocheckfor = (keys %new_tocheckfor);
|
|
|
|
}
|
2011-03-13 01:01:19 +08:00
|
|
|
|
2016-09-01 01:47:35 +08:00
|
|
|
our $die = sub { die @_; };
|
1999-05-29 07:18:51 +08:00
|
|
|
if ($target eq "TABLE") {
|
2016-09-01 01:47:35 +08:00
|
|
|
local $die = sub { warn @_; };
|
2015-05-18 18:53:38 +08:00
|
|
|
foreach (sort keys %table) {
|
|
|
|
print_table_entry($_, "TABLE");
|
|
|
|
}
|
|
|
|
exit 0;
|
1999-05-29 07:18:51 +08:00
|
|
|
}
|
|
|
|
|
2000-02-21 08:55:45 +08:00
|
|
|
if ($target eq "LIST") {
|
2015-05-18 18:53:38 +08:00
|
|
|
foreach (sort keys %table) {
|
|
|
|
print $_,"\n" unless $table{$_}->{template};
|
|
|
|
}
|
|
|
|
exit 0;
|
2000-02-21 08:55:45 +08:00
|
|
|
}
|
|
|
|
|
2015-03-06 09:00:21 +08:00
|
|
|
if ($target eq "HASH") {
|
2016-09-01 01:47:35 +08:00
|
|
|
local $die = sub { warn @_; };
|
2015-05-18 18:53:38 +08:00
|
|
|
print "%table = (\n";
|
|
|
|
foreach (sort keys %table) {
|
|
|
|
print_table_entry($_, "HASH");
|
|
|
|
}
|
|
|
|
exit 0;
|
2015-03-06 09:00:21 +08:00
|
|
|
}
|
|
|
|
|
2018-02-02 02:18:32 +08:00
|
|
|
print "Configuring OpenSSL version $config{version} ($config{version_num}) ";
|
2016-10-03 23:39:11 +08:00
|
|
|
print "for $target\n";
|
|
|
|
|
2018-02-16 01:08:54 +08:00
|
|
|
if (scalar(@seed_sources) == 0) {
|
|
|
|
print "Using os-specific seed configuration\n";
|
|
|
|
push @seed_sources, 'os';
|
|
|
|
}
|
2018-08-16 22:01:58 +08:00
|
|
|
if (scalar(grep { $_ eq 'none' } @seed_sources) > 0) {
|
|
|
|
die "Cannot seed with none and anything else" if scalar(@seed_sources) > 1;
|
|
|
|
warn <<_____ if scalar(@seed_sources) == 1;
|
|
|
|
|
2018-10-28 19:38:49 +08:00
|
|
|
============================== WARNING ===============================
|
|
|
|
You have selected the --with-rand-seed=none option, which effectively
|
|
|
|
disables automatic reseeding of the OpenSSL random generator.
|
|
|
|
All operations depending on the random generator such as creating keys
|
|
|
|
will not work unless the random generator is seeded manually by the
|
|
|
|
application.
|
|
|
|
|
|
|
|
Please read the 'Note on random number generation' section in the
|
|
|
|
INSTALL instructions and the RAND_DRBG(7) manual page for more details.
|
|
|
|
============================== WARNING ===============================
|
|
|
|
|
2018-08-16 22:01:58 +08:00
|
|
|
_____
|
|
|
|
}
|
2018-11-04 01:34:09 +08:00
|
|
|
push @{$config{openssl_feature_defines}},
|
2018-02-16 01:08:54 +08:00
|
|
|
map { (my $x = $_) =~ tr|[\-a-z]|[_A-Z]|; "OPENSSL_RAND_SEED_$x" }
|
|
|
|
@seed_sources;
|
|
|
|
|
2015-05-18 18:53:38 +08:00
|
|
|
# Backward compatibility?
|
2002-02-14 20:28:24 +08:00
|
|
|
if ($target =~ m/^CygWin32(-.*)$/) {
|
2015-05-18 18:53:38 +08:00
|
|
|
$target = "Cygwin".$1;
|
2002-02-14 20:28:24 +08:00
|
|
|
}
|
|
|
|
|
2017-06-22 06:47:49 +08:00
|
|
|
# Support for legacy targets having a name starting with 'debug-'
|
|
|
|
my ($d, $t) = $target =~ m/^(debug-)?(.*)$/;
|
|
|
|
if ($d) {
|
|
|
|
$config{build_type} = "debug";
|
|
|
|
|
|
|
|
# If we do not find debug-foo in the table, the target is set to foo.
|
|
|
|
if (!$table{$target}) {
|
|
|
|
$target = $t;
|
|
|
|
}
|
|
|
|
}
|
2018-08-07 18:38:16 +08:00
|
|
|
|
|
|
|
&usage if !$table{$target} || $table{$target}->{template};
|
|
|
|
|
2017-06-22 06:47:49 +08:00
|
|
|
$config{target} = $target;
|
|
|
|
my %target = resolve_config($target);
|
|
|
|
|
Make "make variables" config attributes for overridable flags
With the support of "make variables" comes the possibility for the
user to override them. However, we need to make a difference between
defaults that we use (and that should be overridable by the user) and
flags that are crucial for building OpenSSL (should not be
overridable).
Typically, overridable flags are those setting optimization levels,
warnings levels, that kind of thing, while non-overridable flags are,
for example, macros that indicate aspects of how the config target
should be treated, such as L_ENDIAN and B_ENDIAN.
We do that differentiation by allowing upper case attributes in the
config targets, named exactly like the "make variables" we support,
and reserving the lower case attributes for non-overridable project
flags.
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5534)
2018-03-07 03:35:30 +08:00
|
|
|
foreach (keys %target_attr_translate) {
|
|
|
|
$target{$target_attr_translate{$_}} = $target{$_}
|
|
|
|
if $target{$_};
|
|
|
|
delete $target{$_};
|
|
|
|
}
|
|
|
|
|
2017-12-01 22:40:43 +08:00
|
|
|
%target = ( %{$table{DEFAULTS}}, %target );
|
|
|
|
|
|
|
|
# Make the flags to build DSOs the same as for shared libraries unless they
|
|
|
|
# are already defined
|
2018-03-08 03:31:15 +08:00
|
|
|
$target{module_cflags} = $target{shared_cflag} unless defined $target{module_cflags};
|
|
|
|
$target{module_cxxflags} = $target{shared_cxxflag} unless defined $target{module_cxxflags};
|
|
|
|
$target{module_ldflags} = $target{shared_ldflag} unless defined $target{module_ldflags};
|
2017-12-01 22:40:43 +08:00
|
|
|
{
|
|
|
|
my $shared_info_pl =
|
|
|
|
catfile(dirname($0), "Configurations", "shared-info.pl");
|
|
|
|
my %shared_info = read_eval_file($shared_info_pl);
|
|
|
|
push @{$target{_conf_fname_int}}, $shared_info_pl;
|
|
|
|
my $si = $target{shared_target};
|
|
|
|
while (ref $si ne "HASH") {
|
|
|
|
last if ! defined $si;
|
|
|
|
if (ref $si eq "CODE") {
|
|
|
|
$si = $si->();
|
|
|
|
} else {
|
|
|
|
$si = $shared_info{$si};
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
# Some of the 'shared_target' values don't have any entried in
|
|
|
|
# %shared_info. That's perfectly fine, AS LONG AS the build file
|
|
|
|
# template knows how to handle this. That is currently the case for
|
|
|
|
# Windows and VMS.
|
|
|
|
if (defined $si) {
|
|
|
|
# Just as above, copy certain shared_* attributes to the corresponding
|
2018-03-08 03:31:15 +08:00
|
|
|
# module_ attribute unless the latter is already defined
|
|
|
|
$si->{module_cflags} = $si->{shared_cflag} unless defined $si->{module_cflags};
|
|
|
|
$si->{module_cxxflags} = $si->{shared_cxxflag} unless defined $si->{module_cxxflags};
|
|
|
|
$si->{module_ldflags} = $si->{shared_ldflag} unless defined $si->{module_ldflags};
|
2017-12-01 22:40:43 +08:00
|
|
|
foreach (sort keys %$si) {
|
|
|
|
$target{$_} = defined $target{$_}
|
|
|
|
? add($si->{$_})->($target{$_})
|
|
|
|
: $si->{$_};
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-06-22 06:47:49 +08:00
|
|
|
my %conf_files = map { $_ => 1 } (@{$target{_conf_fname_int}});
|
|
|
|
$config{conf_files} = [ sort keys %conf_files ];
|
|
|
|
|
|
|
|
foreach my $feature (@{$target{disable}}) {
|
|
|
|
if (exists $deprecated_disablables{$feature}) {
|
|
|
|
warn "***** config $target disables deprecated feature $feature\n";
|
|
|
|
} elsif (!grep { $feature eq $_ } @disablables) {
|
|
|
|
die "***** config $target disables unknown feature $feature\n";
|
|
|
|
}
|
|
|
|
$disabled{$feature} = 'config';
|
|
|
|
}
|
|
|
|
foreach my $feature (@{$target{enable}}) {
|
|
|
|
if ("default" eq ($disabled{$_} // "")) {
|
|
|
|
if (exists $deprecated_disablables{$feature}) {
|
|
|
|
warn "***** config $target enables deprecated feature $feature\n";
|
|
|
|
} elsif (!grep { $feature eq $_ } @disablables) {
|
|
|
|
die "***** config $target enables unknown feature $feature\n";
|
|
|
|
}
|
|
|
|
delete $disabled{$_};
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Make "make variables" config attributes for overridable flags
With the support of "make variables" comes the possibility for the
user to override them. However, we need to make a difference between
defaults that we use (and that should be overridable by the user) and
flags that are crucial for building OpenSSL (should not be
overridable).
Typically, overridable flags are those setting optimization levels,
warnings levels, that kind of thing, while non-overridable flags are,
for example, macros that indicate aspects of how the config target
should be treated, such as L_ENDIAN and B_ENDIAN.
We do that differentiation by allowing upper case attributes in the
config targets, named exactly like the "make variables" we support,
and reserving the lower case attributes for non-overridable project
flags.
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5534)
2018-03-07 03:35:30 +08:00
|
|
|
$target{CXXFLAGS}//=$target{CFLAGS} if $target{CXX};
|
|
|
|
$target{cxxflags}//=$target{cflags} if $target{CXX};
|
2015-05-21 02:03:20 +08:00
|
|
|
$target{exe_extension}="";
|
2016-02-16 05:13:41 +08:00
|
|
|
$target{exe_extension}=".exe" if ($config{target} eq "DJGPP"
|
|
|
|
|| $config{target} =~ /^(?:Cygwin|mingw)/);
|
2015-05-21 02:03:20 +08:00
|
|
|
$target{exe_extension}=".pm" if ($config{target} =~ /vos/);
|
2018-09-30 20:44:59 +08:00
|
|
|
$target{def_extension}=".ld";
|
|
|
|
$target{def_extension}=".def" if $config{target} =~ /^mingw|VC-/;
|
|
|
|
$target{def_extension}=".opt" if $config{target} =~ /^vms/;
|
2016-02-16 00:20:15 +08:00
|
|
|
($target{shared_extension_simple}=$target{shared_extension})
|
2018-06-15 04:07:48 +08:00
|
|
|
=~ s|\.\$\(SHLIB_VERSION_NUMBER\)||
|
|
|
|
unless defined($target{shared_extension_simple});
|
|
|
|
$target{dso_extension}//=$target{shared_extension_simple};
|
2016-02-16 00:20:15 +08:00
|
|
|
($target{shared_import_extension}=$target{shared_extension_simple}.".a")
|
|
|
|
if ($config{target} =~ /^(?:Cygwin|mingw)/);
|
|
|
|
|
2018-07-08 18:00:06 +08:00
|
|
|
# Fill %config with values from %user, and in case those are undefined or
|
|
|
|
# empty, use values from %target (acting as a default).
|
2018-01-27 02:56:44 +08:00
|
|
|
foreach (keys %user) {
|
|
|
|
my $ref_type = ref $user{$_};
|
|
|
|
|
|
|
|
# Temporary function. Takes an intended ref type (empty string or "ARRAY")
|
|
|
|
# and a value that's to be coerced into that type.
|
|
|
|
my $mkvalue = sub {
|
|
|
|
my $type = shift;
|
|
|
|
my $value = shift;
|
|
|
|
my $undef_p = shift;
|
|
|
|
|
|
|
|
die "Too many arguments for \$mkvalue" if @_;
|
|
|
|
|
|
|
|
while (ref $value eq 'CODE') {
|
|
|
|
$value = $value->();
|
|
|
|
}
|
|
|
|
|
|
|
|
if ($type eq 'ARRAY') {
|
|
|
|
return undef unless defined $value;
|
|
|
|
return undef if ref $value ne 'ARRAY' && !$value;
|
|
|
|
return undef if ref $value eq 'ARRAY' && !@$value;
|
|
|
|
return [ $value ] unless ref $value eq 'ARRAY';
|
|
|
|
}
|
|
|
|
return undef unless $value;
|
|
|
|
return $value;
|
|
|
|
};
|
|
|
|
|
Make "make variables" config attributes for overridable flags
With the support of "make variables" comes the possibility for the
user to override them. However, we need to make a difference between
defaults that we use (and that should be overridable by the user) and
flags that are crucial for building OpenSSL (should not be
overridable).
Typically, overridable flags are those setting optimization levels,
warnings levels, that kind of thing, while non-overridable flags are,
for example, macros that indicate aspects of how the config target
should be treated, such as L_ENDIAN and B_ENDIAN.
We do that differentiation by allowing upper case attributes in the
config targets, named exactly like the "make variables" we support,
and reserving the lower case attributes for non-overridable project
flags.
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5534)
2018-03-07 03:35:30 +08:00
|
|
|
$config{$_} =
|
2018-01-27 02:56:44 +08:00
|
|
|
$mkvalue->($ref_type, $user{$_})
|
Make "make variables" config attributes for overridable flags
With the support of "make variables" comes the possibility for the
user to override them. However, we need to make a difference between
defaults that we use (and that should be overridable by the user) and
flags that are crucial for building OpenSSL (should not be
overridable).
Typically, overridable flags are those setting optimization levels,
warnings levels, that kind of thing, while non-overridable flags are,
for example, macros that indicate aspects of how the config target
should be treated, such as L_ENDIAN and B_ENDIAN.
We do that differentiation by allowing upper case attributes in the
config targets, named exactly like the "make variables" we support,
and reserving the lower case attributes for non-overridable project
flags.
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5534)
2018-03-07 03:35:30 +08:00
|
|
|
|| $mkvalue->($ref_type, $target{$_});
|
|
|
|
delete $config{$_} unless defined $config{$_};
|
2018-01-27 02:56:44 +08:00
|
|
|
}
|
2015-03-06 09:00:21 +08:00
|
|
|
|
2016-08-30 03:45:19 +08:00
|
|
|
# Allow overriding the build file name
|
2018-01-27 02:56:44 +08:00
|
|
|
$config{build_file} = env('BUILDFILE') || $target{build_file} || "Makefile";
|
2015-05-18 08:57:24 +08:00
|
|
|
|
2018-11-04 01:38:04 +08:00
|
|
|
######################################################################
|
|
|
|
# Build up information for skipping certain directories depending on disabled
|
|
|
|
# features, as well as setting up macros for disabled features.
|
|
|
|
|
|
|
|
# This is a tentative database of directories to skip. Some entries may not
|
|
|
|
# correspond to anything real, but that's ok, they will simply be ignored.
|
|
|
|
# The actual processing of these entries is done in the build.info lookup
|
|
|
|
# loop further down.
|
|
|
|
#
|
|
|
|
# The key is a Unix formated path in the source tree, the value is an index
|
|
|
|
# into %disabled_info, so any existing path gets added to a corresponding
|
|
|
|
# 'skipped' entry in there with the list of skipped directories.
|
|
|
|
my %skipdir = ();
|
2018-01-30 00:33:58 +08:00
|
|
|
my %disabled_info = (); # For configdata.pm
|
|
|
|
foreach my $what (sort keys %disabled) {
|
|
|
|
$config{options} .= " no-$what";
|
|
|
|
|
|
|
|
if (!grep { $what eq $_ } ( 'dso', 'threads', 'shared', 'pic',
|
|
|
|
'dynamic-engine', 'makedepend',
|
|
|
|
'zlib-dynamic', 'zlib', 'sse2' )) {
|
|
|
|
(my $WHAT = uc $what) =~ s|-|_|g;
|
2018-11-04 01:38:04 +08:00
|
|
|
my $skipdir = $what;
|
2018-01-30 00:33:58 +08:00
|
|
|
|
|
|
|
# fix-up crypto/directory name(s)
|
2018-11-04 01:38:04 +08:00
|
|
|
$skipdir = "ripemd" if $what eq "rmd160";
|
|
|
|
$skipdir = "whrlpool" if $what eq "whirlpool";
|
2018-01-30 00:33:58 +08:00
|
|
|
|
|
|
|
my $macro = $disabled_info{$what}->{macro} = "OPENSSL_NO_$WHAT";
|
2018-11-04 01:38:04 +08:00
|
|
|
push @{$config{openssl_feature_defines}}, $macro;
|
2018-01-30 00:33:58 +08:00
|
|
|
|
2018-11-04 01:38:04 +08:00
|
|
|
$skipdir{engines} = $what if $what eq 'engine';
|
|
|
|
$skipdir{"crypto/$skipdir"} = $what
|
|
|
|
unless $what eq 'async' || $what eq 'err';
|
2018-01-30 00:33:58 +08: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-19 04:35:23 +08:00
|
|
|
# Make sure build_scheme is consistent.
|
|
|
|
$target{build_scheme} = [ $target{build_scheme} ]
|
|
|
|
if ref($target{build_scheme}) ne "ARRAY";
|
|
|
|
|
2016-01-30 07:57:33 +08:00
|
|
|
my ($builder, $builder_platform, @builder_opts) =
|
|
|
|
@{$target{build_scheme}};
|
|
|
|
|
2017-03-06 04:51:18 +08:00
|
|
|
foreach my $checker (($builder_platform."-".$target{build_file}."-checker.pm",
|
|
|
|
$builder_platform."-checker.pm")) {
|
|
|
|
my $checker_path = catfile($srcdir, "Configurations", $checker);
|
|
|
|
if (-f $checker_path) {
|
|
|
|
my $fn = $ENV{CONFIGURE_CHECKER_WARN}
|
|
|
|
? sub { warn $@; } : sub { die $@; };
|
|
|
|
if (! do $checker_path) {
|
|
|
|
if ($@) {
|
|
|
|
$fn->($@);
|
|
|
|
} elsif ($!) {
|
|
|
|
$fn->($!);
|
|
|
|
} else {
|
|
|
|
$fn->("The detected tools didn't match the platform\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
last;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-04-01 22:03:46 +08:00
|
|
|
push @{$config{defines}}, "NDEBUG" if $config{build_type} eq "release";
|
|
|
|
|
Make "make variables" config attributes for overridable flags
With the support of "make variables" comes the possibility for the
user to override them. However, we need to make a difference between
defaults that we use (and that should be overridable by the user) and
flags that are crucial for building OpenSSL (should not be
overridable).
Typically, overridable flags are those setting optimization levels,
warnings levels, that kind of thing, while non-overridable flags are,
for example, macros that indicate aspects of how the config target
should be treated, such as L_ENDIAN and B_ENDIAN.
We do that differentiation by allowing upper case attributes in the
config targets, named exactly like the "make variables" we support,
and reserving the lower case attributes for non-overridable project
flags.
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5534)
2018-03-07 03:35:30 +08:00
|
|
|
if ($target =~ /^mingw/ && `$config{CC} --target-help 2>&1` =~ m/-mno-cygwin/m)
|
2010-12-01 06:18:02 +08:00
|
|
|
{
|
2018-01-27 02:56:44 +08:00
|
|
|
push @{$config{cflags}}, "-mno-cygwin";
|
Make "make variables" config attributes for overridable flags
With the support of "make variables" comes the possibility for the
user to override them. However, we need to make a difference between
defaults that we use (and that should be overridable by the user) and
flags that are crucial for building OpenSSL (should not be
overridable).
Typically, overridable flags are those setting optimization levels,
warnings levels, that kind of thing, while non-overridable flags are,
for example, macros that indicate aspects of how the config target
should be treated, such as L_ENDIAN and B_ENDIAN.
We do that differentiation by allowing upper case attributes in the
config targets, named exactly like the "make variables" we support,
and reserving the lower case attributes for non-overridable project
flags.
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5534)
2018-03-07 03:35:30 +08:00
|
|
|
push @{$config{cxxflags}}, "-mno-cygwin" if $config{CXX};
|
2018-01-27 02:56:44 +08:00
|
|
|
push @{$config{shared_ldflag}}, "-mno-cygwin";
|
2010-12-01 06:18:02 +08:00
|
|
|
}
|
|
|
|
|
2018-01-27 02:56:44 +08:00
|
|
|
if ($target =~ /linux.*-mips/ && !$disabled{asm}
|
2018-01-31 00:21:12 +08:00
|
|
|
&& !grep { $_ !~ /-m(ips|arch=)/ } (@{$user{CFLAGS}},
|
2018-01-31 02:13:11 +08:00
|
|
|
@{$useradd{CFLAGS}})) {
|
2012-09-15 19:21:50 +08:00
|
|
|
# minimally required architecture flags for assembly modules
|
2018-01-27 21:56:06 +08:00
|
|
|
my $value;
|
|
|
|
$value = '-mips2' if ($target =~ /mips32/);
|
|
|
|
$value = '-mips3' if ($target =~ /mips64/);
|
|
|
|
unshift @{$config{cflags}}, $value;
|
Make "make variables" config attributes for overridable flags
With the support of "make variables" comes the possibility for the
user to override them. However, we need to make a difference between
defaults that we use (and that should be overridable by the user) and
flags that are crucial for building OpenSSL (should not be
overridable).
Typically, overridable flags are those setting optimization levels,
warnings levels, that kind of thing, while non-overridable flags are,
for example, macros that indicate aspects of how the config target
should be treated, such as L_ENDIAN and B_ENDIAN.
We do that differentiation by allowing upper case attributes in the
config targets, named exactly like the "make variables" we support,
and reserving the lower case attributes for non-overridable project
flags.
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5534)
2018-03-07 03:35:30 +08:00
|
|
|
unshift @{$config{cxxflags}}, $value if $config{CXX};
|
2012-09-15 19:21:50 +08:00
|
|
|
}
|
|
|
|
|
Configure - Get rid of the special thread_cflag, replace with thread_scheme
The thread_cflag setting filled a double role, as kinda sorta an
indicator of thread scheme, and as cflags. Some configs also added
lflags and ex_libs for multithreading regardless of if threading would
be enabled or not.
Instead of this, add threading cflags among in the cflag setting,
threading lflags in the lflag setting and so on if and only if threads
are enabled (which they are by default).
Also, for configs where there are no special cflags for threading (the
VMS configs are of that kind), this makes it possible to still clearly
mention what thread scheme is used.
The exact value of thread scheme is currently ignored except when it's
"(unknown)", and thereby only serves as a flag to tell if we know how
to build for multi-threading in a particular config. Yet, the
currently used values are "(unknown)", "pthreads", "uithreads" (a.k.a
solaris threads) and "winthreads".
Reviewed-by: Andy Polyakov <appro@openssl.org>
2016-02-27 23:51:34 +08:00
|
|
|
# If threads aren't disabled, check how possible they are
|
|
|
|
unless ($disabled{threads}) {
|
|
|
|
if ($auto_threads) {
|
|
|
|
# Enabled by default, disable it forcibly if unavailable
|
|
|
|
if ($target{thread_scheme} eq "(unknown)") {
|
|
|
|
$disabled{threads} = "unavailable";
|
|
|
|
}
|
|
|
|
} else {
|
2016-03-11 04:34:48 +08:00
|
|
|
# The user chose to enable threads explicitly, let's see
|
Configure - Get rid of the special thread_cflag, replace with thread_scheme
The thread_cflag setting filled a double role, as kinda sorta an
indicator of thread scheme, and as cflags. Some configs also added
lflags and ex_libs for multithreading regardless of if threading would
be enabled or not.
Instead of this, add threading cflags among in the cflag setting,
threading lflags in the lflag setting and so on if and only if threads
are enabled (which they are by default).
Also, for configs where there are no special cflags for threading (the
VMS configs are of that kind), this makes it possible to still clearly
mention what thread scheme is used.
The exact value of thread scheme is currently ignored except when it's
"(unknown)", and thereby only serves as a flag to tell if we know how
to build for multi-threading in a particular config. Yet, the
currently used values are "(unknown)", "pthreads", "uithreads" (a.k.a
solaris threads) and "winthreads".
Reviewed-by: Andy Polyakov <appro@openssl.org>
2016-02-27 23:51:34 +08:00
|
|
|
# if there's a chance that's possible
|
|
|
|
if ($target{thread_scheme} eq "(unknown)") {
|
|
|
|
# If the user asked for "threads" and we don't have internal
|
|
|
|
# knowledge how to do it, [s]he is expected to provide any
|
|
|
|
# system-dependent compiler options that are necessary. We
|
|
|
|
# can't truly check that the given options are correct, but
|
|
|
|
# we expect the user to know what [s]He is doing.
|
2018-01-31 00:21:12 +08:00
|
|
|
if (!@{$user{CFLAGS}} && !@{$useradd{CFLAGS}}
|
|
|
|
&& !@{$user{CPPDEFINES}} && !@{$useradd{CPPDEFINES}}) {
|
Configure - Get rid of the special thread_cflag, replace with thread_scheme
The thread_cflag setting filled a double role, as kinda sorta an
indicator of thread scheme, and as cflags. Some configs also added
lflags and ex_libs for multithreading regardless of if threading would
be enabled or not.
Instead of this, add threading cflags among in the cflag setting,
threading lflags in the lflag setting and so on if and only if threads
are enabled (which they are by default).
Also, for configs where there are no special cflags for threading (the
VMS configs are of that kind), this makes it possible to still clearly
mention what thread scheme is used.
The exact value of thread scheme is currently ignored except when it's
"(unknown)", and thereby only serves as a flag to tell if we know how
to build for multi-threading in a particular config. Yet, the
currently used values are "(unknown)", "pthreads", "uithreads" (a.k.a
solaris threads) and "winthreads".
Reviewed-by: Andy Polyakov <appro@openssl.org>
2016-02-27 23:51:34 +08:00
|
|
|
die "You asked for multi-threading support, but didn't\n"
|
|
|
|
,"provide any system-specific compiler options\n";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
# If threads still aren't disabled, add a C macro to ensure the source
|
|
|
|
# code knows about it. Any other flag is taken care of by the configs.
|
|
|
|
unless($disabled{threads}) {
|
2018-11-04 01:34:09 +08:00
|
|
|
push @{$config{openssl_feature_defines}}, "OPENSSL_THREADS";
|
Configure - Get rid of the special thread_cflag, replace with thread_scheme
The thread_cflag setting filled a double role, as kinda sorta an
indicator of thread scheme, and as cflags. Some configs also added
lflags and ex_libs for multithreading regardless of if threading would
be enabled or not.
Instead of this, add threading cflags among in the cflag setting,
threading lflags in the lflag setting and so on if and only if threads
are enabled (which they are by default).
Also, for configs where there are no special cflags for threading (the
VMS configs are of that kind), this makes it possible to still clearly
mention what thread scheme is used.
The exact value of thread scheme is currently ignored except when it's
"(unknown)", and thereby only serves as a flag to tell if we know how
to build for multi-threading in a particular config. Yet, the
currently used values are "(unknown)", "pthreads", "uithreads" (a.k.a
solaris threads) and "winthreads".
Reviewed-by: Andy Polyakov <appro@openssl.org>
2016-02-27 23:51:34 +08:00
|
|
|
}
|
2001-07-12 17:11:14 +08:00
|
|
|
|
2016-01-05 12:00:33 +08:00
|
|
|
# With "deprecated" disable all deprecated features.
|
|
|
|
if (defined($disabled{"deprecated"})) {
|
2015-05-21 02:03:20 +08:00
|
|
|
$config{api} = $maxapi;
|
2016-01-05 12:00:33 +08:00
|
|
|
}
|
2014-12-17 21:17:26 +08:00
|
|
|
|
2018-01-23 20:54:55 +08:00
|
|
|
my $no_shared_warn=0;
|
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-19 04:35:23 +08:00
|
|
|
if ($target{shared_target} eq "")
|
2002-12-14 01:56:14 +08:00
|
|
|
{
|
2016-02-22 09:09:11 +08:00
|
|
|
$no_shared_warn = 1
|
2017-02-28 19:30:28 +08:00
|
|
|
if (!$disabled{shared} || !$disabled{"dynamic-engine"});
|
2016-02-22 20:52:46 +08:00
|
|
|
$disabled{shared} = "no-shared-target";
|
2016-02-22 09:09:11 +08:00
|
|
|
$disabled{pic} = $disabled{shared} = $disabled{"dynamic-engine"} =
|
|
|
|
"no-shared-target";
|
2002-12-14 01:56:14 +08:00
|
|
|
}
|
2000-07-21 23:08:53 +08:00
|
|
|
|
2016-02-22 09:06:05 +08:00
|
|
|
if ($disabled{"dynamic-engine"}) {
|
2018-11-04 01:34:09 +08:00
|
|
|
push @{$config{openssl_feature_defines}}, "OPENSSL_NO_DYNAMIC_ENGINE";
|
2016-02-20 05:08:37 +08:00
|
|
|
$config{dynamic_engines} = 0;
|
2016-02-22 09:06:05 +08:00
|
|
|
} else {
|
2018-11-04 01:34:09 +08:00
|
|
|
push @{$config{openssl_feature_defines}}, "OPENSSL_NO_STATIC_ENGINE";
|
2016-02-22 09:06:05 +08:00
|
|
|
$config{dynamic_engines} = 1;
|
2016-02-20 05:08:37 +08:00
|
|
|
}
|
2002-10-12 02:06:08 +08:00
|
|
|
|
2016-03-27 01:19:14 +08:00
|
|
|
unless ($disabled{asan}) {
|
2018-01-27 02:56:44 +08:00
|
|
|
push @{$config{cflags}}, "-fsanitize=address";
|
Make "make variables" config attributes for overridable flags
With the support of "make variables" comes the possibility for the
user to override them. However, we need to make a difference between
defaults that we use (and that should be overridable by the user) and
flags that are crucial for building OpenSSL (should not be
overridable).
Typically, overridable flags are those setting optimization levels,
warnings levels, that kind of thing, while non-overridable flags are,
for example, macros that indicate aspects of how the config target
should be treated, such as L_ENDIAN and B_ENDIAN.
We do that differentiation by allowing upper case attributes in the
config targets, named exactly like the "make variables" we support,
and reserving the lower case attributes for non-overridable project
flags.
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5534)
2018-03-07 03:35:30 +08:00
|
|
|
push @{$config{cxxflags}}, "-fsanitize=address" if $config{CXX};
|
2016-03-27 01:19:14 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
unless ($disabled{ubsan}) {
|
2016-06-20 01:39:01 +08:00
|
|
|
# -DPEDANTIC or -fnosanitize=alignment may also be required on some
|
2016-03-27 01:19:14 +08:00
|
|
|
# platforms.
|
2018-01-27 02:56:44 +08:00
|
|
|
push @{$config{cflags}}, "-fsanitize=undefined", "-fno-sanitize-recover=all";
|
2018-01-27 21:56:06 +08:00
|
|
|
push @{$config{cxxflags}}, "-fsanitize=undefined", "-fno-sanitize-recover=all"
|
Make "make variables" config attributes for overridable flags
With the support of "make variables" comes the possibility for the
user to override them. However, we need to make a difference between
defaults that we use (and that should be overridable by the user) and
flags that are crucial for building OpenSSL (should not be
overridable).
Typically, overridable flags are those setting optimization levels,
warnings levels, that kind of thing, while non-overridable flags are,
for example, macros that indicate aspects of how the config target
should be treated, such as L_ENDIAN and B_ENDIAN.
We do that differentiation by allowing upper case attributes in the
config targets, named exactly like the "make variables" we support,
and reserving the lower case attributes for non-overridable project
flags.
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5534)
2018-03-07 03:35:30 +08:00
|
|
|
if $config{CXX};
|
2016-03-27 01:19:14 +08:00
|
|
|
}
|
|
|
|
|
2016-07-29 02:24:28 +08:00
|
|
|
unless ($disabled{msan}) {
|
2018-01-27 02:56:44 +08:00
|
|
|
push @{$config{cflags}}, "-fsanitize=memory";
|
Make "make variables" config attributes for overridable flags
With the support of "make variables" comes the possibility for the
user to override them. However, we need to make a difference between
defaults that we use (and that should be overridable by the user) and
flags that are crucial for building OpenSSL (should not be
overridable).
Typically, overridable flags are those setting optimization levels,
warnings levels, that kind of thing, while non-overridable flags are,
for example, macros that indicate aspects of how the config target
should be treated, such as L_ENDIAN and B_ENDIAN.
We do that differentiation by allowing upper case attributes in the
config targets, named exactly like the "make variables" we support,
and reserving the lower case attributes for non-overridable project
flags.
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5534)
2018-03-07 03:35:30 +08:00
|
|
|
push @{$config{cxxflags}}, "-fsanitize=memory" if $config{CXX};
|
2016-07-29 02:24:28 +08:00
|
|
|
}
|
|
|
|
|
2016-06-05 16:59:31 +08:00
|
|
|
unless ($disabled{"fuzz-libfuzzer"} && $disabled{"fuzz-afl"}
|
2016-07-29 02:24:28 +08:00
|
|
|
&& $disabled{asan} && $disabled{ubsan} && $disabled{msan}) {
|
2018-01-27 02:56:44 +08:00
|
|
|
push @{$config{cflags}}, "-fno-omit-frame-pointer", "-g";
|
Make "make variables" config attributes for overridable flags
With the support of "make variables" comes the possibility for the
user to override them. However, we need to make a difference between
defaults that we use (and that should be overridable by the user) and
flags that are crucial for building OpenSSL (should not be
overridable).
Typically, overridable flags are those setting optimization levels,
warnings levels, that kind of thing, while non-overridable flags are,
for example, macros that indicate aspects of how the config target
should be treated, such as L_ENDIAN and B_ENDIAN.
We do that differentiation by allowing upper case attributes in the
config targets, named exactly like the "make variables" we support,
and reserving the lower case attributes for non-overridable project
flags.
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5534)
2018-03-07 03:35:30 +08:00
|
|
|
push @{$config{cxxflags}}, "-fno-omit-frame-pointer", "-g" if $config{CXX};
|
2016-03-27 01:19:14 +08:00
|
|
|
}
|
2007-09-16 20:23:47 +08:00
|
|
|
#
|
|
|
|
# Platform fix-ups
|
|
|
|
#
|
2016-02-22 09:09:11 +08:00
|
|
|
|
|
|
|
# This saves the build files from having to check
|
|
|
|
if ($disabled{pic})
|
|
|
|
{
|
2018-01-23 20:54:55 +08:00
|
|
|
foreach (qw(shared_cflag shared_cxxflag shared_cppflag
|
2018-03-08 03:31:15 +08:00
|
|
|
shared_defines shared_includes shared_ldflag
|
|
|
|
module_cflags module_cxxflags module_cppflags
|
|
|
|
module_defines module_includes module_lflags))
|
2017-12-01 22:40:43 +08:00
|
|
|
{
|
2018-01-27 02:56:44 +08:00
|
|
|
delete $config{$_};
|
2017-12-01 22:40:43 +08:00
|
|
|
$target{$_} = "";
|
|
|
|
}
|
2016-02-22 09:09:11 +08:00
|
|
|
}
|
2016-02-22 03:52:39 +08:00
|
|
|
else
|
|
|
|
{
|
2018-03-07 04:09:05 +08:00
|
|
|
push @{$config{lib_defines}}, "OPENSSL_PIC";
|
2016-02-22 03:52:39 +08:00
|
|
|
}
|
2016-02-22 09:09:11 +08: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-19 04:35:23 +08:00
|
|
|
if ($target{sys_id} ne "")
|
2001-02-20 00:06:34 +08:00
|
|
|
{
|
2015-12-27 09:27:30 +08:00
|
|
|
push @{$config{openssl_sys_defines}}, "OPENSSL_SYS_$target{sys_id}";
|
2001-02-20 00:06:34 +08:00
|
|
|
}
|
|
|
|
|
2016-02-22 21:10:45 +08:00
|
|
|
unless ($disabled{asm}) {
|
2016-02-27 18:25:33 +08:00
|
|
|
$target{cpuid_asm_src}=$table{DEFAULTS}->{cpuid_asm_src} if ($config{processor} eq "386");
|
2018-03-07 04:09:05 +08:00
|
|
|
push @{$config{lib_defines}}, "OPENSSL_CPUID_OBJ" if ($target{cpuid_asm_src} ne "mem_clr.c");
|
2018-02-06 05:15:53 +08:00
|
|
|
|
2016-01-30 02:45:51 +08:00
|
|
|
$target{bn_asm_src} =~ s/\w+-gf2m.c// if (defined($disabled{ec2m}));
|
2004-08-03 06:41:19 +08:00
|
|
|
|
2015-05-18 08:54:28 +08:00
|
|
|
# bn-586 is the only one implementing bn_*_part_words
|
2018-03-07 04:09:05 +08:00
|
|
|
push @{$config{lib_defines}}, "OPENSSL_BN_ASM_PART_WORDS" if ($target{bn_asm_src} =~ /bn-586/);
|
|
|
|
push @{$config{lib_defines}}, "OPENSSL_IA32_SSE2" if (!$disabled{sse2} && $target{bn_asm_src} =~ /86/);
|
1998-12-21 19:00:56 +08:00
|
|
|
|
2018-03-07 04:09:05 +08:00
|
|
|
push @{$config{lib_defines}}, "OPENSSL_BN_ASM_MONT" if ($target{bn_asm_src} =~ /-mont/);
|
|
|
|
push @{$config{lib_defines}}, "OPENSSL_BN_ASM_MONT5" if ($target{bn_asm_src} =~ /-mont5/);
|
|
|
|
push @{$config{lib_defines}}, "OPENSSL_BN_ASM_GF2m" if ($target{bn_asm_src} =~ /-gf2m/);
|
2018-11-12 22:13:48 +08:00
|
|
|
push @{$config{lib_defines}}, "BN_DIV3W" if ($target{bn_asm_src} =~ /-div3w/);
|
2005-10-07 22:18:06 +08:00
|
|
|
|
2016-01-30 02:45:51 +08:00
|
|
|
if ($target{sha1_asm_src}) {
|
2018-03-07 04:09:05 +08:00
|
|
|
push @{$config{lib_defines}}, "SHA1_ASM" if ($target{sha1_asm_src} =~ /sx86/ || $target{sha1_asm_src} =~ /sha1/);
|
|
|
|
push @{$config{lib_defines}}, "SHA256_ASM" if ($target{sha1_asm_src} =~ /sha256/);
|
|
|
|
push @{$config{lib_defines}}, "SHA512_ASM" if ($target{sha1_asm_src} =~ /sha512/);
|
2015-05-18 08:54:28 +08:00
|
|
|
}
|
2018-04-22 16:42:59 +08:00
|
|
|
if ($target{keccak1600_asm_src} ne $table{DEFAULTS}->{keccak1600_asm_src}) {
|
|
|
|
push @{$config{lib_defines}}, "KECCAK1600_ASM";
|
|
|
|
}
|
2016-08-26 15:59:55 +08:00
|
|
|
if ($target{rc4_asm_src} ne $table{DEFAULTS}->{rc4_asm_src}) {
|
2018-03-07 04:09:05 +08:00
|
|
|
push @{$config{lib_defines}}, "RC4_ASM";
|
2016-08-26 15:59:55 +08:00
|
|
|
}
|
2016-01-30 02:45:51 +08:00
|
|
|
if ($target{md5_asm_src}) {
|
2018-03-07 04:09:05 +08:00
|
|
|
push @{$config{lib_defines}}, "MD5_ASM";
|
2015-05-18 08:54:28 +08:00
|
|
|
}
|
2016-02-27 18:25:33 +08:00
|
|
|
$target{cast_asm_src}=$table{DEFAULTS}->{cast_asm_src} unless $disabled{pic}; # CAST assembler is not PIC
|
2016-01-30 02:45:51 +08:00
|
|
|
if ($target{rmd160_asm_src}) {
|
2018-03-07 04:09:05 +08:00
|
|
|
push @{$config{lib_defines}}, "RMD160_ASM";
|
2015-05-18 08:54:28 +08:00
|
|
|
}
|
2016-01-30 02:45:51 +08:00
|
|
|
if ($target{aes_asm_src}) {
|
2018-03-07 04:09:05 +08:00
|
|
|
push @{$config{lib_defines}}, "AES_ASM" if ($target{aes_asm_src} =~ m/\baes-/);;
|
2016-01-30 02:45:51 +08:00
|
|
|
# aes-ctr.fake is not a real file, only indication that assembler
|
2010-07-09 20:21:52 +08:00
|
|
|
# module implements AES_ctr32_encrypt...
|
2018-03-07 04:09:05 +08:00
|
|
|
push @{$config{lib_defines}}, "AES_CTR_ASM" if ($target{aes_asm_src} =~ s/\s*aes-ctr\.fake//);
|
2016-01-30 02:45:51 +08:00
|
|
|
# aes-xts.fake indicates presence of AES_xts_[en|de]crypt...
|
2018-03-07 04:09:05 +08:00
|
|
|
push @{$config{lib_defines}}, "AES_XTS_ASM" if ($target{aes_asm_src} =~ s/\s*aes-xts\.fake//);
|
2018-01-29 17:21:46 +08:00
|
|
|
$target{aes_asm_src} =~ s/\s*(vpaes|aesni)-x86\.s//g if ($disabled{sse2});
|
2018-03-07 04:09:05 +08:00
|
|
|
push @{$config{lib_defines}}, "VPAES_ASM" if ($target{aes_asm_src} =~ m/vpaes/);
|
|
|
|
push @{$config{lib_defines}}, "BSAES_ASM" if ($target{aes_asm_src} =~ m/bsaes/);
|
2015-05-18 08:54:28 +08:00
|
|
|
}
|
2016-01-30 02:45:51 +08:00
|
|
|
if ($target{wp_asm_src} =~ /mmx/) {
|
2016-01-29 21:23:24 +08:00
|
|
|
if ($config{processor} eq "386") {
|
2016-02-27 18:25:33 +08:00
|
|
|
$target{wp_asm_src}=$table{DEFAULTS}->{wp_asm_src};
|
2016-01-29 21:23:24 +08:00
|
|
|
} elsif (!$disabled{"whirlpool"}) {
|
2018-03-07 04:09:05 +08:00
|
|
|
push @{$config{lib_defines}}, "WHIRLPOOL_ASM";
|
2016-01-29 21:23:24 +08:00
|
|
|
}
|
2015-05-18 08:54:28 +08:00
|
|
|
}
|
2016-01-30 02:45:51 +08:00
|
|
|
if ($target{modes_asm_src} =~ /ghash-/) {
|
2018-03-07 04:09:05 +08:00
|
|
|
push @{$config{lib_defines}}, "GHASH_ASM";
|
2015-05-18 08:54:28 +08:00
|
|
|
}
|
2016-01-30 02:45:51 +08:00
|
|
|
if ($target{ec_asm_src} =~ /ecp_nistz256/) {
|
2018-03-07 04:09:05 +08:00
|
|
|
push @{$config{lib_defines}}, "ECP_NISTZ256_ASM";
|
2015-05-18 08:54:28 +08:00
|
|
|
}
|
2018-02-19 22:19:49 +08:00
|
|
|
if ($target{ec_asm_src} =~ /x25519/) {
|
2018-03-07 04:09:05 +08:00
|
|
|
push @{$config{lib_defines}}, "X25519_ASM";
|
2018-02-19 22:19:49 +08:00
|
|
|
}
|
2016-08-29 22:58:31 +08:00
|
|
|
if ($target{padlock_asm_src} ne $table{DEFAULTS}->{padlock_asm_src}) {
|
2018-03-07 04:09:05 +08:00
|
|
|
push @{$config{lib_defines}}, "PADLOCK_ASM";
|
2016-08-29 22:58:31 +08:00
|
|
|
}
|
2016-01-30 02:45:51 +08:00
|
|
|
if ($target{poly1305_asm_src} ne "") {
|
2018-03-07 04:09:05 +08:00
|
|
|
push @{$config{lib_defines}}, "POLY1305_ASM";
|
2015-05-18 08:54:28 +08:00
|
|
|
}
|
|
|
|
}
|
1998-12-21 18:52:47 +08:00
|
|
|
|
2018-05-04 20:25:45 +08:00
|
|
|
my %predefined = compiler_predefined($config{CROSS_COMPILE}.$config{CC});
|
2017-08-29 21:47:08 +08:00
|
|
|
|
2017-12-12 03:54:07 +08:00
|
|
|
# Check for makedepend capabilities.
|
2017-11-07 00:11:03 +08:00
|
|
|
if (!$disabled{makedepend}) {
|
2017-12-12 03:54:07 +08:00
|
|
|
if ($config{target} =~ /^(VC|vms)-/) {
|
|
|
|
# For VC- and vms- targets, there's nothing more to do here. The
|
|
|
|
# functionality is hard coded in the corresponding build files for
|
|
|
|
# cl (Windows) and CC/DECC (VMS).
|
2018-05-03 23:17:49 +08:00
|
|
|
} elsif (($predefined{__GNUC__} // -1) >= 3
|
|
|
|
&& !($predefined{__APPLE_CC__} && !$predefined{__clang__})) {
|
2017-12-12 03:54:07 +08:00
|
|
|
# We know that GNU C version 3 and up as well as all clang
|
2018-05-03 23:17:49 +08:00
|
|
|
# versions support dependency generation, but Xcode did not
|
|
|
|
# handle $cc -M before clang support (but claims __GNUC__ = 3)
|
Make "make variables" config attributes for overridable flags
With the support of "make variables" comes the possibility for the
user to override them. However, we need to make a difference between
defaults that we use (and that should be overridable by the user) and
flags that are crucial for building OpenSSL (should not be
overridable).
Typically, overridable flags are those setting optimization levels,
warnings levels, that kind of thing, while non-overridable flags are,
for example, macros that indicate aspects of how the config target
should be treated, such as L_ENDIAN and B_ENDIAN.
We do that differentiation by allowing upper case attributes in the
config targets, named exactly like the "make variables" we support,
and reserving the lower case attributes for non-overridable project
flags.
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5534)
2018-03-07 03:35:30 +08:00
|
|
|
$config{makedepprog} = "\$(CROSS_COMPILE)$config{CC}";
|
2017-11-07 00:11:03 +08:00
|
|
|
} else {
|
2017-12-12 03:54:07 +08:00
|
|
|
# In all other cases, we look for 'makedepend', and disable the
|
|
|
|
# capability if not found.
|
2017-11-07 00:11:03 +08:00
|
|
|
$config{makedepprog} = which('makedepend');
|
|
|
|
$disabled{makedepend} = "unavailable" unless $config{makedepprog};
|
2017-08-29 21:47:08 +08:00
|
|
|
}
|
2016-01-30 08:50:28 +08:00
|
|
|
}
|
2016-01-28 02:03:13 +08:00
|
|
|
|
2018-08-17 20:29:59 +08:00
|
|
|
if (!$disabled{asm} && !$predefined{__MACH__} && $^O ne 'VMS') {
|
2018-05-04 20:06:44 +08:00
|
|
|
# probe for -Wa,--noexecstack option...
|
|
|
|
if ($predefined{__clang__}) {
|
|
|
|
# clang has builtin assembler, which doesn't recognize --help,
|
|
|
|
# but it apparently recognizes the option in question on all
|
|
|
|
# supported platforms even when it's meaningless. In other words
|
|
|
|
# probe would fail, but probed option always accepted...
|
|
|
|
push @{$config{cflags}}, "-Wa,--noexecstack", "-Qunused-arguments";
|
2018-08-17 20:29:59 +08:00
|
|
|
} else {
|
2018-05-04 20:06:44 +08:00
|
|
|
my $cc = $config{CROSS_COMPILE}.$config{CC};
|
|
|
|
open(PIPE, "$cc -Wa,--help -c -o null.$$.o -x assembler /dev/null 2>&1 |");
|
|
|
|
while(<PIPE>) {
|
|
|
|
if (m/--noexecstack/) {
|
|
|
|
push @{$config{cflags}}, "-Wa,--noexecstack";
|
|
|
|
last;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
close(PIPE);
|
|
|
|
unlink("null.$$.o");
|
|
|
|
}
|
|
|
|
}
|
2015-05-19 07:40:54 +08: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-24 02:23:25 +08:00
|
|
|
($config{b64l},$config{b64},$config{b32})=(0,0,1);
|
2015-05-19 07:40:54 +08:00
|
|
|
|
2016-01-28 23:13:21 +08:00
|
|
|
my $count = 0;
|
2015-05-19 07:40:54 +08:00
|
|
|
foreach (sort split(/\s+/,$target{bn_ops})) {
|
2016-01-28 23:13:21 +08: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-19 07:40:54 +08:00
|
|
|
}
|
2016-01-28 23:13:21 +08: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-19 07:40:54 +08:00
|
|
|
|
|
|
|
|
|
|
|
# Hack cflags for better warnings (dev option) #######################
|
|
|
|
|
2018-01-27 21:56:06 +08:00
|
|
|
# "Stringify" the C and C++ flags string. This permits it to be made part of
|
|
|
|
# a string and works as well on command lines.
|
2018-01-27 02:56:44 +08:00
|
|
|
$config{cflags} = [ map { (my $x = $_) =~ s/([\\\"])/\\$1/g; $x }
|
|
|
|
@{$config{cflags}} ];
|
2018-01-27 21:56:06 +08:00
|
|
|
$config{cxxflags} = [ map { (my $x = $_) =~ s/([\\\"])/\\$1/g; $x }
|
Make "make variables" config attributes for overridable flags
With the support of "make variables" comes the possibility for the
user to override them. However, we need to make a difference between
defaults that we use (and that should be overridable by the user) and
flags that are crucial for building OpenSSL (should not be
overridable).
Typically, overridable flags are those setting optimization levels,
warnings levels, that kind of thing, while non-overridable flags are,
for example, macros that indicate aspects of how the config target
should be treated, such as L_ENDIAN and B_ENDIAN.
We do that differentiation by allowing upper case attributes in the
config targets, named exactly like the "make variables" we support,
and reserving the lower case attributes for non-overridable project
flags.
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5534)
2018-03-07 03:35:30 +08:00
|
|
|
@{$config{cxxflags}} ] if $config{CXX};
|
2000-07-21 23:08:53 +08:00
|
|
|
|
2018-11-30 07:05:03 +08:00
|
|
|
$config{openssl_api_defines} = [
|
|
|
|
"OPENSSL_MIN_API=".($apitable->{$config{api} // ""} // -1)
|
|
|
|
];
|
2016-01-05 12:00:33 +08:00
|
|
|
|
2009-09-10 00:31:32 +08:00
|
|
|
if ($strict_warnings)
|
|
|
|
{
|
|
|
|
my $wopt;
|
2017-09-22 04:47:12 +08:00
|
|
|
my $gccver = $predefined{__GNUC__} // -1;
|
|
|
|
|
|
|
|
die "ERROR --strict-warnings requires gcc[>=4] or gcc-alike"
|
|
|
|
unless $gccver >= 4;
|
2009-09-10 00:31:32 +08:00
|
|
|
foreach $wopt (split /\s+/, $gcc_devteam_warn)
|
|
|
|
{
|
2018-01-27 02:56:44 +08:00
|
|
|
push @{$config{cflags}}, $wopt
|
|
|
|
unless grep { $_ eq $wopt } @{$config{cflags}};
|
2018-01-27 21:56:06 +08:00
|
|
|
push @{$config{cxxflags}}, $wopt
|
Make "make variables" config attributes for overridable flags
With the support of "make variables" comes the possibility for the
user to override them. However, we need to make a difference between
defaults that we use (and that should be overridable by the user) and
flags that are crucial for building OpenSSL (should not be
overridable).
Typically, overridable flags are those setting optimization levels,
warnings levels, that kind of thing, while non-overridable flags are,
for example, macros that indicate aspects of how the config target
should be treated, such as L_ENDIAN and B_ENDIAN.
We do that differentiation by allowing upper case attributes in the
config targets, named exactly like the "make variables" we support,
and reserving the lower case attributes for non-overridable project
flags.
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5534)
2018-03-07 03:35:30 +08:00
|
|
|
if ($config{CXX}
|
2018-01-27 21:56:06 +08:00
|
|
|
&& !grep { $_ eq $wopt } @{$config{cxxflags}});
|
2009-09-10 00:31:32 +08:00
|
|
|
}
|
2017-08-29 21:47:08 +08:00
|
|
|
if (defined($predefined{__clang__}))
|
2015-04-19 21:10:54 +08:00
|
|
|
{
|
|
|
|
foreach $wopt (split /\s+/, $clang_devteam_warn)
|
|
|
|
{
|
2018-01-27 02:56:44 +08:00
|
|
|
push @{$config{cflags}}, $wopt
|
|
|
|
unless grep { $_ eq $wopt } @{$config{cflags}};
|
2018-01-27 21:56:06 +08:00
|
|
|
push @{$config{cxxflags}}, $wopt
|
Make "make variables" config attributes for overridable flags
With the support of "make variables" comes the possibility for the
user to override them. However, we need to make a difference between
defaults that we use (and that should be overridable by the user) and
flags that are crucial for building OpenSSL (should not be
overridable).
Typically, overridable flags are those setting optimization levels,
warnings levels, that kind of thing, while non-overridable flags are,
for example, macros that indicate aspects of how the config target
should be treated, such as L_ENDIAN and B_ENDIAN.
We do that differentiation by allowing upper case attributes in the
config targets, named exactly like the "make variables" we support,
and reserving the lower case attributes for non-overridable project
flags.
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5534)
2018-03-07 03:35:30 +08:00
|
|
|
if ($config{CXX}
|
2018-01-27 21:56:06 +08:00
|
|
|
&& !grep { $_ eq $wopt } @{$config{cxxflags}});
|
2015-04-19 21:10:54 +08:00
|
|
|
}
|
|
|
|
}
|
2016-02-14 19:16:52 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
unless ($disabled{"crypto-mdebug-backtrace"})
|
|
|
|
{
|
|
|
|
foreach my $wopt (split /\s+/, $memleak_devteam_backtrace)
|
2015-12-03 01:44:26 +08:00
|
|
|
{
|
2018-01-27 02:56:44 +08:00
|
|
|
push @{$config{cflags}}, $wopt
|
|
|
|
unless grep { $_ eq $wopt } @{$config{cflags}};
|
2018-01-27 21:56:06 +08:00
|
|
|
push @{$config{cxxflags}}, $wopt
|
Make "make variables" config attributes for overridable flags
With the support of "make variables" comes the possibility for the
user to override them. However, we need to make a difference between
defaults that we use (and that should be overridable by the user) and
flags that are crucial for building OpenSSL (should not be
overridable).
Typically, overridable flags are those setting optimization levels,
warnings levels, that kind of thing, while non-overridable flags are,
for example, macros that indicate aspects of how the config target
should be treated, such as L_ENDIAN and B_ENDIAN.
We do that differentiation by allowing upper case attributes in the
config targets, named exactly like the "make variables" we support,
and reserving the lower case attributes for non-overridable project
flags.
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5534)
2018-03-07 03:35:30 +08:00
|
|
|
if ($config{CXX}
|
2018-01-27 21:56:06 +08:00
|
|
|
&& !grep { $_ eq $wopt } @{$config{cxxflags}});
|
2016-02-14 19:16:52 +08:00
|
|
|
}
|
|
|
|
if ($target =~ /^BSD-/)
|
|
|
|
{
|
2018-01-27 02:56:44 +08:00
|
|
|
push @{$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-19 04:35:23 +08:00
|
|
|
}
|
2009-09-10 00:31:32 +08:00
|
|
|
}
|
|
|
|
|
2016-03-14 19:21:44 +08:00
|
|
|
unless ($disabled{afalgeng}) {
|
|
|
|
$config{afalgeng}="";
|
2018-01-26 05:50:55 +08:00
|
|
|
if (grep { $_ eq 'afalgeng' } @{$target{enable}}) {
|
2016-03-09 16:04:01 +08:00
|
|
|
my $minver = 4*10000 + 1*100 + 0;
|
Make "make variables" config attributes for overridable flags
With the support of "make variables" comes the possibility for the
user to override them. However, we need to make a difference between
defaults that we use (and that should be overridable by the user) and
flags that are crucial for building OpenSSL (should not be
overridable).
Typically, overridable flags are those setting optimization levels,
warnings levels, that kind of thing, while non-overridable flags are,
for example, macros that indicate aspects of how the config target
should be treated, such as L_ENDIAN and B_ENDIAN.
We do that differentiation by allowing upper case attributes in the
config targets, named exactly like the "make variables" we support,
and reserving the lower case attributes for non-overridable project
flags.
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5534)
2018-03-07 03:35:30 +08:00
|
|
|
if ($config{CROSS_COMPILE} eq "") {
|
2016-03-09 16:04:01 +08:00
|
|
|
my $verstr = `uname -r`;
|
|
|
|
my ($ma, $mi1, $mi2) = split("\\.", $verstr);
|
|
|
|
($mi2) = $mi2 =~ /(\d+)/;
|
|
|
|
my $ver = $ma*10000 + $mi1*100 + $mi2;
|
|
|
|
if ($ver < $minver) {
|
2016-03-14 19:21:44 +08:00
|
|
|
$disabled{afalgeng} = "too-old-kernel";
|
2016-03-09 16:04:01 +08:00
|
|
|
} else {
|
|
|
|
push @{$config{engdirs}}, "afalg";
|
|
|
|
}
|
2016-03-16 18:08:53 +08:00
|
|
|
} else {
|
|
|
|
$disabled{afalgeng} = "cross-compiling";
|
2016-02-23 16:01:01 +08:00
|
|
|
}
|
2016-03-09 16:04:01 +08:00
|
|
|
} else {
|
2016-03-14 19:21:44 +08:00
|
|
|
$disabled{afalgeng} = "not-linux";
|
2016-02-17 21:38:36 +08:00
|
|
|
}
|
|
|
|
}
|
2016-02-29 21:36:47 +08:00
|
|
|
|
2018-11-04 01:34:09 +08:00
|
|
|
push @{$config{openssl_feature_defines}}, "OPENSSL_NO_AFALGENG" if ($disabled{afalgeng});
|
2016-02-17 21:38:36 +08:00
|
|
|
|
2018-01-31 00:16:13 +08:00
|
|
|
# Finish up %config by appending things the user gave us on the command line
|
|
|
|
# apart from "make variables"
|
|
|
|
foreach (keys %useradd) {
|
|
|
|
# The must all be lists, so we assert that here
|
|
|
|
die "internal error: \$useradd{$_} isn't an ARRAY\n"
|
|
|
|
unless ref $useradd{$_} eq 'ARRAY';
|
|
|
|
|
Make "make variables" config attributes for overridable flags
With the support of "make variables" comes the possibility for the
user to override them. However, we need to make a difference between
defaults that we use (and that should be overridable by the user) and
flags that are crucial for building OpenSSL (should not be
overridable).
Typically, overridable flags are those setting optimization levels,
warnings levels, that kind of thing, while non-overridable flags are,
for example, macros that indicate aspects of how the config target
should be treated, such as L_ENDIAN and B_ENDIAN.
We do that differentiation by allowing upper case attributes in the
config targets, named exactly like the "make variables" we support,
and reserving the lower case attributes for non-overridable project
flags.
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5534)
2018-03-07 03:35:30 +08:00
|
|
|
if (defined $config{$_}) {
|
|
|
|
push @{$config{$_}}, @{$useradd{$_}};
|
2018-01-31 00:16:13 +08:00
|
|
|
} else {
|
Make "make variables" config attributes for overridable flags
With the support of "make variables" comes the possibility for the
user to override them. However, we need to make a difference between
defaults that we use (and that should be overridable by the user) and
flags that are crucial for building OpenSSL (should not be
overridable).
Typically, overridable flags are those setting optimization levels,
warnings levels, that kind of thing, while non-overridable flags are,
for example, macros that indicate aspects of how the config target
should be treated, such as L_ENDIAN and B_ENDIAN.
We do that differentiation by allowing upper case attributes in the
config targets, named exactly like the "make variables" we support,
and reserving the lower case attributes for non-overridable project
flags.
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5534)
2018-03-07 03:35:30 +08:00
|
|
|
$config{$_} = [ @{$useradd{$_}} ];
|
2018-01-31 00:16:13 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-01-27 02:56:44 +08:00
|
|
|
# ALL MODIFICATIONS TO %config and %target MUST BE DONE FROM HERE ON
|
|
|
|
|
2016-01-30 02:45:51 +08:00
|
|
|
# If we use the unified build, collect information from build.info files
|
|
|
|
my %unified_info = ();
|
|
|
|
|
2016-03-10 07:04:04 +08:00
|
|
|
my $buildinfo_debug = defined($ENV{CONFIGURE_DEBUG_BUILDINFO});
|
2016-01-30 07:57:33 +08:00
|
|
|
if ($builder eq "unified") {
|
2016-01-30 02:45:51 +08:00
|
|
|
use with_fallback qw(Text::Template);
|
|
|
|
|
|
|
|
sub cleandir {
|
2016-02-10 09:00:37 +08:00
|
|
|
my $base = shift;
|
2016-01-30 02:45:51 +08:00
|
|
|
my $dir = shift;
|
2016-02-10 09:00:37 +08:00
|
|
|
my $relativeto = shift || ".";
|
|
|
|
|
|
|
|
$dir = catdir($base,$dir) unless isabsolute($dir);
|
2016-01-30 02:45:51 +08:00
|
|
|
|
2016-02-09 17:15:13 +08:00
|
|
|
# Make sure the directories we're building in exists
|
|
|
|
mkpath($dir);
|
|
|
|
|
2016-02-10 09:00:37 +08:00
|
|
|
my $res = abs2rel(absolutedir($dir), rel2abs($relativeto));
|
2016-01-30 02:45:51 +08:00
|
|
|
#print STDERR "DEBUG[cleandir]: $dir , $base => $res\n";
|
|
|
|
return $res;
|
|
|
|
}
|
|
|
|
|
|
|
|
sub cleanfile {
|
2016-02-10 09:00:37 +08:00
|
|
|
my $base = shift;
|
2016-01-30 02:45:51 +08:00
|
|
|
my $file = shift;
|
2016-02-10 09:00:37 +08:00
|
|
|
my $relativeto = shift || ".";
|
|
|
|
|
|
|
|
$file = catfile($base,$file) unless isabsolute($file);
|
|
|
|
|
2016-01-30 02:45:51 +08:00
|
|
|
my $d = dirname($file);
|
|
|
|
my $f = basename($file);
|
|
|
|
|
2016-02-09 17:15:13 +08:00
|
|
|
# Make sure the directories we're building in exists
|
|
|
|
mkpath($d);
|
|
|
|
|
2016-02-10 09:00:37 +08:00
|
|
|
my $res = abs2rel(catfile(absolutedir($d), $f), rel2abs($relativeto));
|
2016-01-30 02:45:51 +08:00
|
|
|
#print STDERR "DEBUG[cleanfile]: $d , $f => $res\n";
|
|
|
|
return $res;
|
|
|
|
}
|
|
|
|
|
2016-09-16 05:55:24 +08:00
|
|
|
# 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_names =
|
|
|
|
( $builder_platform."-".$target{build_file}.".tmpl",
|
|
|
|
$target{build_file}.".tmpl" );
|
|
|
|
my @build_file_templates = ();
|
|
|
|
|
|
|
|
# First, look in the user provided directory, if given
|
2017-11-29 20:09:01 +08:00
|
|
|
if (defined env($local_config_envname)) {
|
2016-09-16 05:55:24 +08:00
|
|
|
@build_file_templates =
|
|
|
|
map {
|
|
|
|
if ($^O eq 'VMS') {
|
|
|
|
# VMS environment variables are logical names,
|
|
|
|
# which can be used as is
|
|
|
|
$local_config_envname . ':' . $_;
|
|
|
|
} else {
|
2017-11-29 20:09:01 +08:00
|
|
|
catfile(env($local_config_envname), $_);
|
2016-09-16 05:55:24 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
@build_file_template_names;
|
|
|
|
}
|
|
|
|
# Then, look in our standard directory
|
|
|
|
push @build_file_templates,
|
|
|
|
( map { cleanfile($srcdir, catfile("Configurations", $_), $blddir) }
|
|
|
|
@build_file_template_names );
|
|
|
|
|
|
|
|
my $build_file_template;
|
|
|
|
for $_ (@build_file_templates) {
|
|
|
|
$build_file_template = $_;
|
|
|
|
last if -f $build_file_template;
|
|
|
|
|
|
|
|
$build_file_template = undef;
|
|
|
|
}
|
|
|
|
if (!defined $build_file_template) {
|
|
|
|
die "*** Couldn't find any of:\n", join("\n", @build_file_templates), "\n";
|
|
|
|
}
|
|
|
|
$config{build_file_templates}
|
Configuration: Simplify generating list of generated files in build file templates
Computing the value of the GENERATED variable in the build file
templates is somewhat overcomplicated, and because of possible
duplication errors, changes are potentially error prone.
Looking more closely at how this list is determined, it can be
observed that the exact list of files to check is consistently
available in all the values found in the %unified_info tables
'depends', 'sources' and 'shared_sources', and all that's needed is to
filter those values so only those present as keys in the 'generate'
table are left.
This computation is also common for all build files, so due to its
apparent complexity, we move it to common0.tmpl, with the result left
in a global variable (@generated), to be consumed by all build file
templates.
common0.tmpl is included among the files to process when creating
build files, but unlike common.tmpl, it comes first of all.
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5930)
2018-04-11 19:13:22 +08:00
|
|
|
= [ cleanfile($srcdir, catfile("Configurations", "common0.tmpl"),
|
|
|
|
$blddir),
|
|
|
|
$build_file_template,
|
2016-09-16 05:55:24 +08:00
|
|
|
cleanfile($srcdir, catfile("Configurations", "common.tmpl"),
|
|
|
|
$blddir) ];
|
|
|
|
|
2018-11-03 22:03:59 +08:00
|
|
|
my @build_dirs = ( [ ] ); # current directory
|
2016-01-30 02:45:51 +08:00
|
|
|
|
2016-02-28 08:13:17 +08:00
|
|
|
$config{build_infos} = [ ];
|
|
|
|
|
2017-12-28 23:03:17 +08:00
|
|
|
my %ordinals = ();
|
2018-11-03 22:03:59 +08:00
|
|
|
while (@build_dirs) {
|
|
|
|
my @curd = @{shift @build_dirs};
|
|
|
|
my $sourced = catdir($srcdir, @curd);
|
|
|
|
my $buildd = catdir($blddir, @curd);
|
2016-01-30 02:45:51 +08:00
|
|
|
|
2018-11-04 01:38:04 +08:00
|
|
|
my $unixdir = join('/', @curd);
|
|
|
|
if (exists $skipdir{$unixdir}) {
|
|
|
|
my $what = $skipdir{$unixdir};
|
|
|
|
push @{$disabled_info{$what}->{skipped}}, catdir(@curd);
|
|
|
|
next;
|
|
|
|
}
|
|
|
|
|
2016-02-08 23:27:15 +08:00
|
|
|
mkpath($buildd);
|
2016-01-30 02:45:51 +08:00
|
|
|
|
2018-11-03 22:03:59 +08:00
|
|
|
my $f = 'build.info';
|
2016-01-30 02:45:51 +08:00
|
|
|
# The basic things we're trying to build
|
|
|
|
my @programs = ();
|
build.info: implement PROGRAM_NO_INST, and dito for ENGINES, SCRIPTS, LIBS
PROGRAM_NO_INST, ENGINES_NO_INST, SCRIPTS_NO_INST and LIBS_NO_INST are
to be used to specify program, engines, scripts and libraries that are
not to be installed in the system. Fuzzers, test programs, that sort
of things are of the _NO_INST type, for example.
For the benefit of build file templates and other templates that use
data from configdata.pm, a new hash table $unified_info{install} is
created. It contains a set of subhashes, one for each type of
installable, each having an array of file names as values. For
example, it can look like this:
"install" =>
{
"engines" =>
[
"engines/afalg/afalg",
"engines/capi",
"engines/dasync",
"engines/padlock",
],
"libraries" =>
[
"libcrypto",
"libssl",
],
"programs" =>
[
"apps/openssl",
],
"scripts" =>
[
"apps/CA.pl",
"apps/tsget",
"tools/c_rehash",
],
},
Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-07-08 20:28:58 +08:00
|
|
|
my @programs_install = ();
|
2016-01-30 02:45:51 +08:00
|
|
|
my @libraries = ();
|
build.info: implement PROGRAM_NO_INST, and dito for ENGINES, SCRIPTS, LIBS
PROGRAM_NO_INST, ENGINES_NO_INST, SCRIPTS_NO_INST and LIBS_NO_INST are
to be used to specify program, engines, scripts and libraries that are
not to be installed in the system. Fuzzers, test programs, that sort
of things are of the _NO_INST type, for example.
For the benefit of build file templates and other templates that use
data from configdata.pm, a new hash table $unified_info{install} is
created. It contains a set of subhashes, one for each type of
installable, each having an array of file names as values. For
example, it can look like this:
"install" =>
{
"engines" =>
[
"engines/afalg/afalg",
"engines/capi",
"engines/dasync",
"engines/padlock",
],
"libraries" =>
[
"libcrypto",
"libssl",
],
"programs" =>
[
"apps/openssl",
],
"scripts" =>
[
"apps/CA.pl",
"apps/tsget",
"tools/c_rehash",
],
},
Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-07-08 20:28:58 +08:00
|
|
|
my @libraries_install = ();
|
2016-01-30 02:45:51 +08:00
|
|
|
my @engines = ();
|
build.info: implement PROGRAM_NO_INST, and dito for ENGINES, SCRIPTS, LIBS
PROGRAM_NO_INST, ENGINES_NO_INST, SCRIPTS_NO_INST and LIBS_NO_INST are
to be used to specify program, engines, scripts and libraries that are
not to be installed in the system. Fuzzers, test programs, that sort
of things are of the _NO_INST type, for example.
For the benefit of build file templates and other templates that use
data from configdata.pm, a new hash table $unified_info{install} is
created. It contains a set of subhashes, one for each type of
installable, each having an array of file names as values. For
example, it can look like this:
"install" =>
{
"engines" =>
[
"engines/afalg/afalg",
"engines/capi",
"engines/dasync",
"engines/padlock",
],
"libraries" =>
[
"libcrypto",
"libssl",
],
"programs" =>
[
"apps/openssl",
],
"scripts" =>
[
"apps/CA.pl",
"apps/tsget",
"tools/c_rehash",
],
},
Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-07-08 20:28:58 +08:00
|
|
|
my @engines_install = ();
|
2016-01-30 02:45:51 +08:00
|
|
|
my @scripts = ();
|
build.info: implement PROGRAM_NO_INST, and dito for ENGINES, SCRIPTS, LIBS
PROGRAM_NO_INST, ENGINES_NO_INST, SCRIPTS_NO_INST and LIBS_NO_INST are
to be used to specify program, engines, scripts and libraries that are
not to be installed in the system. Fuzzers, test programs, that sort
of things are of the _NO_INST type, for example.
For the benefit of build file templates and other templates that use
data from configdata.pm, a new hash table $unified_info{install} is
created. It contains a set of subhashes, one for each type of
installable, each having an array of file names as values. For
example, it can look like this:
"install" =>
{
"engines" =>
[
"engines/afalg/afalg",
"engines/capi",
"engines/dasync",
"engines/padlock",
],
"libraries" =>
[
"libcrypto",
"libssl",
],
"programs" =>
[
"apps/openssl",
],
"scripts" =>
[
"apps/CA.pl",
"apps/tsget",
"tools/c_rehash",
],
},
Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-07-08 20:28:58 +08:00
|
|
|
my @scripts_install = ();
|
2016-01-30 02:45:51 +08:00
|
|
|
my @extra = ();
|
2016-03-07 21:50:37 +08:00
|
|
|
my @overrides = ();
|
2016-01-30 02:45:51 +08:00
|
|
|
my @intermediates = ();
|
|
|
|
my @rawlines = ();
|
|
|
|
|
|
|
|
my %sources = ();
|
2016-03-29 22:45:03 +08:00
|
|
|
my %shared_sources = ();
|
2016-01-30 02:45:51 +08:00
|
|
|
my %includes = ();
|
2016-10-14 22:56:34 +08:00
|
|
|
my %defines = ();
|
2016-01-30 02:45:51 +08:00
|
|
|
my %depends = ();
|
|
|
|
my %renames = ();
|
|
|
|
my %sharednames = ();
|
2016-03-07 21:37:00 +08:00
|
|
|
my %generate = ();
|
2016-01-30 02:45:51 +08:00
|
|
|
|
2018-03-08 19:01:28 +08:00
|
|
|
# We want to detect configdata.pm in the source tree, so we
|
|
|
|
# don't use it if the build tree is different.
|
|
|
|
my $src_configdata = cleanfile($srcdir, "configdata.pm", $blddir);
|
|
|
|
|
2016-02-28 08:13:17 +08:00
|
|
|
push @{$config{build_infos}}, catfile(abs2rel($sourced, $blddir), $f);
|
2017-08-02 04:10:39 +08:00
|
|
|
my $template =
|
|
|
|
Text::Template->new(TYPE => 'FILE',
|
|
|
|
SOURCE => catfile($sourced, $f),
|
|
|
|
PREPEND => qq{use lib "$FindBin::Bin/util/perl";});
|
2016-01-30 02:45:51 +08:00
|
|
|
die "Something went wrong with $sourced/$f: $!\n" unless $template;
|
|
|
|
my @text =
|
|
|
|
split /^/m,
|
|
|
|
$template->fill_in(HASH => { config => \%config,
|
|
|
|
target => \%target,
|
2016-02-22 20:45:46 +08:00
|
|
|
disabled => \%disabled,
|
2016-05-08 04:09:13 +08:00
|
|
|
withargs => \%withargs,
|
2016-01-30 02:45:51 +08:00
|
|
|
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*$/
|
2016-03-09 21:33:37 +08:00
|
|
|
=> sub {
|
2016-03-10 06:58:44 +08:00
|
|
|
if (! @skip || $skip[$#skip] > 0) {
|
2016-03-09 21:33:37 +08:00
|
|
|
push @skip, !! $1;
|
|
|
|
} else {
|
|
|
|
push @skip, -1;
|
|
|
|
}
|
|
|
|
},
|
2016-01-30 02:45:51 +08:00
|
|
|
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; },
|
2018-11-03 22:03:59 +08:00
|
|
|
qr/^\s*SUBDIRS\s*=\s*(.*)\s*$/
|
|
|
|
=> sub {
|
|
|
|
if (!@skip || $skip[$#skip] > 0) {
|
|
|
|
foreach (tokenize($1)) {
|
|
|
|
push @build_dirs, [ @curd, splitdir($_, 1) ];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
build.info: implement PROGRAM_NO_INST, and dito for ENGINES, SCRIPTS, LIBS
PROGRAM_NO_INST, ENGINES_NO_INST, SCRIPTS_NO_INST and LIBS_NO_INST are
to be used to specify program, engines, scripts and libraries that are
not to be installed in the system. Fuzzers, test programs, that sort
of things are of the _NO_INST type, for example.
For the benefit of build file templates and other templates that use
data from configdata.pm, a new hash table $unified_info{install} is
created. It contains a set of subhashes, one for each type of
installable, each having an array of file names as values. For
example, it can look like this:
"install" =>
{
"engines" =>
[
"engines/afalg/afalg",
"engines/capi",
"engines/dasync",
"engines/padlock",
],
"libraries" =>
[
"libcrypto",
"libssl",
],
"programs" =>
[
"apps/openssl",
],
"scripts" =>
[
"apps/CA.pl",
"apps/tsget",
"tools/c_rehash",
],
},
Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-07-08 20:28:58 +08:00
|
|
|
qr/^\s*PROGRAMS(_NO_INST)?\s*=\s*(.*)\s*$/
|
|
|
|
=> sub {
|
|
|
|
if (!@skip || $skip[$#skip] > 0) {
|
|
|
|
my $install = $1;
|
|
|
|
my @x = tokenize($2);
|
|
|
|
push @programs, @x;
|
|
|
|
push @programs_install, @x unless $install;
|
|
|
|
}
|
|
|
|
},
|
|
|
|
qr/^\s*LIBS(_NO_INST)?\s*=\s*(.*)\s*$/
|
|
|
|
=> sub {
|
|
|
|
if (!@skip || $skip[$#skip] > 0) {
|
|
|
|
my $install = $1;
|
|
|
|
my @x = tokenize($2);
|
|
|
|
push @libraries, @x;
|
|
|
|
push @libraries_install, @x unless $install;
|
|
|
|
}
|
|
|
|
},
|
|
|
|
qr/^\s*ENGINES(_NO_INST)?\s*=\s*(.*)\s*$/
|
|
|
|
=> sub {
|
|
|
|
if (!@skip || $skip[$#skip] > 0) {
|
|
|
|
my $install = $1;
|
|
|
|
my @x = tokenize($2);
|
|
|
|
push @engines, @x;
|
|
|
|
push @engines_install, @x unless $install;
|
|
|
|
}
|
|
|
|
},
|
|
|
|
qr/^\s*SCRIPTS(_NO_INST)?\s*=\s*(.*)\s*$/
|
|
|
|
=> sub {
|
|
|
|
if (!@skip || $skip[$#skip] > 0) {
|
|
|
|
my $install = $1;
|
|
|
|
my @x = tokenize($2);
|
|
|
|
push @scripts, @x;
|
|
|
|
push @scripts_install, @x unless $install;
|
|
|
|
}
|
|
|
|
},
|
2016-01-30 02:45:51 +08:00
|
|
|
qr/^\s*EXTRA\s*=\s*(.*)\s*$/
|
2016-05-24 23:39:52 +08:00
|
|
|
=> sub { push @extra, tokenize($1)
|
2016-01-30 02:45:51 +08:00
|
|
|
if !@skip || $skip[$#skip] > 0 },
|
2016-03-07 21:50:37 +08:00
|
|
|
qr/^\s*OVERRIDES\s*=\s*(.*)\s*$/
|
2016-05-24 23:39:52 +08:00
|
|
|
=> sub { push @overrides, tokenize($1)
|
2016-03-07 21:50:37 +08:00
|
|
|
if !@skip || $skip[$#skip] > 0 },
|
2016-01-30 02:45:51 +08:00
|
|
|
|
|
|
|
qr/^\s*ORDINALS\[((?:\\.|[^\\\]])+)\]\s*=\s*(.*)\s*$/,
|
2016-05-24 23:39:52 +08:00
|
|
|
=> sub { push @{$ordinals{$1}}, tokenize($2)
|
2016-01-30 02:45:51 +08:00
|
|
|
if !@skip || $skip[$#skip] > 0 },
|
|
|
|
qr/^\s*SOURCE\[((?:\\.|[^\\\]])+)\]\s*=\s*(.*)\s*$/
|
2016-05-24 23:39:52 +08:00
|
|
|
=> sub { push @{$sources{$1}}, tokenize($2)
|
2016-01-30 02:45:51 +08:00
|
|
|
if !@skip || $skip[$#skip] > 0 },
|
2016-03-29 22:45:03 +08:00
|
|
|
qr/^\s*SHARED_SOURCE\[((?:\\.|[^\\\]])+)\]\s*=\s*(.*)\s*$/
|
2016-05-24 23:39:52 +08:00
|
|
|
=> sub { push @{$shared_sources{$1}}, tokenize($2)
|
2016-03-29 22:45:03 +08:00
|
|
|
if !@skip || $skip[$#skip] > 0 },
|
2016-01-30 02:45:51 +08:00
|
|
|
qr/^\s*INCLUDE\[((?:\\.|[^\\\]])+)\]\s*=\s*(.*)\s*$/
|
2016-05-24 23:39:52 +08:00
|
|
|
=> sub { push @{$includes{$1}}, tokenize($2)
|
2016-01-30 02:45:51 +08:00
|
|
|
if !@skip || $skip[$#skip] > 0 },
|
2016-10-14 22:56:34 +08:00
|
|
|
qr/^\s*DEFINE\[((?:\\.|[^\\\]])+)\]\s*=\s*(.*)\s*$/
|
|
|
|
=> sub { push @{$defines{$1}}, tokenize($2)
|
|
|
|
if !@skip || $skip[$#skip] > 0 },
|
2016-06-14 03:57:51 +08:00
|
|
|
qr/^\s*DEPEND\[((?:\\.|[^\\\]])*)\]\s*=\s*(.*)\s*$/
|
2016-05-24 23:39:52 +08:00
|
|
|
=> sub { push @{$depends{$1}}, tokenize($2)
|
2016-01-30 02:45:51 +08:00
|
|
|
if !@skip || $skip[$#skip] > 0 },
|
2016-03-07 21:37:00 +08:00
|
|
|
qr/^\s*GENERATE\[((?:\\.|[^\\\]])+)\]\s*=\s*(.*)\s*$/
|
|
|
|
=> sub { push @{$generate{$1}}, $2
|
|
|
|
if !@skip || $skip[$#skip] > 0 },
|
2016-01-30 02:45:51 +08:00
|
|
|
qr/^\s*RENAME\[((?:\\.|[^\\\]])+)\]\s*=\s*(.*)\s*$/
|
2016-05-24 23:39:52 +08:00
|
|
|
=> sub { push @{$renames{$1}}, tokenize($2)
|
2016-01-30 02:45:51 +08:00
|
|
|
if !@skip || $skip[$#skip] > 0 },
|
|
|
|
qr/^\s*SHARED_NAME\[((?:\\.|[^\\\]])+)\]\s*=\s*(.*)\s*$/
|
2016-05-24 23:39:52 +08:00
|
|
|
=> sub { push @{$sharednames{$1}}, tokenize($2)
|
2016-01-30 02:45:51 +08:00
|
|
|
if !@skip || $skip[$#skip] > 0 },
|
|
|
|
qr/^\s*BEGINRAW\[((?:\\.|[^\\\]])+)\]\s*$/
|
|
|
|
=> sub {
|
|
|
|
my $lineiterator = shift;
|
|
|
|
my $target_kind = $1;
|
|
|
|
while (defined $lineiterator->()) {
|
2016-02-12 19:10:27 +08:00
|
|
|
s|\R$||;
|
2016-01-30 02:45:51 +08: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-30 07:57:33 +08:00
|
|
|
|| $target_kind eq $target{build_file}."(".$builder_platform.")");
|
2016-01-30 02:45:51 +08:00
|
|
|
}
|
|
|
|
},
|
2016-10-25 18:40:32 +08:00
|
|
|
qr/^\s*(?:#.*)?$/ => sub { },
|
2016-03-10 07:04:04 +08:00
|
|
|
"OTHERWISE" => sub { die "Something wrong with this line:\n$_\nat $sourced/$f" },
|
|
|
|
"BEFORE" => sub {
|
|
|
|
if ($buildinfo_debug) {
|
|
|
|
print STDERR "DEBUG: Parsing ",join(" ", @_),"\n";
|
|
|
|
print STDERR "DEBUG: ... before parsing, skip stack is ",join(" ", map { int($_) } @skip),"\n";
|
|
|
|
}
|
|
|
|
},
|
|
|
|
"AFTER" => sub {
|
|
|
|
if ($buildinfo_debug) {
|
|
|
|
print STDERR "DEBUG: .... after parsing, skip stack is ",join(" ", map { int($_) } @skip),"\n";
|
|
|
|
}
|
|
|
|
},
|
2016-01-30 02:45:51 +08:00
|
|
|
);
|
|
|
|
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 09:00:37 +08:00
|
|
|
my $dest = cleanfile($buildd, $_, $blddir);
|
|
|
|
my $to = cleanfile($buildd, $renames{$_}->[0], $blddir);
|
2016-01-30 02:45:51 +08: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 09:00:37 +08:00
|
|
|
my $program = cleanfile($buildd, $_, $blddir);
|
2016-01-30 02:45:51 +08:00
|
|
|
if ($unified_info{rename}->{$program}) {
|
|
|
|
$program = $unified_info{rename}->{$program};
|
|
|
|
}
|
|
|
|
$unified_info{programs}->{$program} = 1;
|
|
|
|
}
|
|
|
|
|
build.info: implement PROGRAM_NO_INST, and dito for ENGINES, SCRIPTS, LIBS
PROGRAM_NO_INST, ENGINES_NO_INST, SCRIPTS_NO_INST and LIBS_NO_INST are
to be used to specify program, engines, scripts and libraries that are
not to be installed in the system. Fuzzers, test programs, that sort
of things are of the _NO_INST type, for example.
For the benefit of build file templates and other templates that use
data from configdata.pm, a new hash table $unified_info{install} is
created. It contains a set of subhashes, one for each type of
installable, each having an array of file names as values. For
example, it can look like this:
"install" =>
{
"engines" =>
[
"engines/afalg/afalg",
"engines/capi",
"engines/dasync",
"engines/padlock",
],
"libraries" =>
[
"libcrypto",
"libssl",
],
"programs" =>
[
"apps/openssl",
],
"scripts" =>
[
"apps/CA.pl",
"apps/tsget",
"tools/c_rehash",
],
},
Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-07-08 20:28:58 +08:00
|
|
|
foreach (@programs_install) {
|
|
|
|
my $program = cleanfile($buildd, $_, $blddir);
|
|
|
|
if ($unified_info{rename}->{$program}) {
|
|
|
|
$program = $unified_info{rename}->{$program};
|
|
|
|
}
|
|
|
|
$unified_info{install}->{programs}->{$program} = 1;
|
|
|
|
}
|
|
|
|
|
2016-01-30 02:45:51 +08:00
|
|
|
foreach (@libraries) {
|
2016-02-10 09:00:37 +08:00
|
|
|
my $library = cleanfile($buildd, $_, $blddir);
|
2016-01-30 02:45:51 +08:00
|
|
|
if ($unified_info{rename}->{$library}) {
|
|
|
|
$library = $unified_info{rename}->{$library};
|
|
|
|
}
|
|
|
|
$unified_info{libraries}->{$library} = 1;
|
|
|
|
}
|
|
|
|
|
build.info: implement PROGRAM_NO_INST, and dito for ENGINES, SCRIPTS, LIBS
PROGRAM_NO_INST, ENGINES_NO_INST, SCRIPTS_NO_INST and LIBS_NO_INST are
to be used to specify program, engines, scripts and libraries that are
not to be installed in the system. Fuzzers, test programs, that sort
of things are of the _NO_INST type, for example.
For the benefit of build file templates and other templates that use
data from configdata.pm, a new hash table $unified_info{install} is
created. It contains a set of subhashes, one for each type of
installable, each having an array of file names as values. For
example, it can look like this:
"install" =>
{
"engines" =>
[
"engines/afalg/afalg",
"engines/capi",
"engines/dasync",
"engines/padlock",
],
"libraries" =>
[
"libcrypto",
"libssl",
],
"programs" =>
[
"apps/openssl",
],
"scripts" =>
[
"apps/CA.pl",
"apps/tsget",
"tools/c_rehash",
],
},
Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-07-08 20:28:58 +08:00
|
|
|
foreach (@libraries_install) {
|
|
|
|
my $library = cleanfile($buildd, $_, $blddir);
|
|
|
|
if ($unified_info{rename}->{$library}) {
|
|
|
|
$library = $unified_info{rename}->{$library};
|
|
|
|
}
|
|
|
|
$unified_info{install}->{libraries}->{$library} = 1;
|
|
|
|
}
|
|
|
|
|
2016-02-20 05:08:37 +08:00
|
|
|
die <<"EOF" if scalar @engines and !$config{dynamic_engines};
|
2016-02-22 09:06:05 +08:00
|
|
|
ENGINES can only be used if configured with 'dynamic-engine'.
|
2016-01-30 02:45:51 +08:00
|
|
|
This is usually a fault in a build.info file.
|
|
|
|
EOF
|
|
|
|
foreach (@engines) {
|
2016-02-10 09:00:37 +08:00
|
|
|
my $library = cleanfile($buildd, $_, $blddir);
|
2016-01-30 02:45:51 +08:00
|
|
|
if ($unified_info{rename}->{$library}) {
|
|
|
|
$library = $unified_info{rename}->{$library};
|
|
|
|
}
|
|
|
|
$unified_info{engines}->{$library} = 1;
|
|
|
|
}
|
|
|
|
|
build.info: implement PROGRAM_NO_INST, and dito for ENGINES, SCRIPTS, LIBS
PROGRAM_NO_INST, ENGINES_NO_INST, SCRIPTS_NO_INST and LIBS_NO_INST are
to be used to specify program, engines, scripts and libraries that are
not to be installed in the system. Fuzzers, test programs, that sort
of things are of the _NO_INST type, for example.
For the benefit of build file templates and other templates that use
data from configdata.pm, a new hash table $unified_info{install} is
created. It contains a set of subhashes, one for each type of
installable, each having an array of file names as values. For
example, it can look like this:
"install" =>
{
"engines" =>
[
"engines/afalg/afalg",
"engines/capi",
"engines/dasync",
"engines/padlock",
],
"libraries" =>
[
"libcrypto",
"libssl",
],
"programs" =>
[
"apps/openssl",
],
"scripts" =>
[
"apps/CA.pl",
"apps/tsget",
"tools/c_rehash",
],
},
Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-07-08 20:28:58 +08:00
|
|
|
foreach (@engines_install) {
|
|
|
|
my $library = cleanfile($buildd, $_, $blddir);
|
|
|
|
if ($unified_info{rename}->{$library}) {
|
|
|
|
$library = $unified_info{rename}->{$library};
|
|
|
|
}
|
|
|
|
$unified_info{install}->{engines}->{$library} = 1;
|
|
|
|
}
|
|
|
|
|
2016-01-30 02:45:51 +08:00
|
|
|
foreach (@scripts) {
|
2016-02-10 09:00:37 +08:00
|
|
|
my $script = cleanfile($buildd, $_, $blddir);
|
2016-01-30 02:45:51 +08:00
|
|
|
if ($unified_info{rename}->{$script}) {
|
|
|
|
$script = $unified_info{rename}->{$script};
|
|
|
|
}
|
|
|
|
$unified_info{scripts}->{$script} = 1;
|
|
|
|
}
|
|
|
|
|
build.info: implement PROGRAM_NO_INST, and dito for ENGINES, SCRIPTS, LIBS
PROGRAM_NO_INST, ENGINES_NO_INST, SCRIPTS_NO_INST and LIBS_NO_INST are
to be used to specify program, engines, scripts and libraries that are
not to be installed in the system. Fuzzers, test programs, that sort
of things are of the _NO_INST type, for example.
For the benefit of build file templates and other templates that use
data from configdata.pm, a new hash table $unified_info{install} is
created. It contains a set of subhashes, one for each type of
installable, each having an array of file names as values. For
example, it can look like this:
"install" =>
{
"engines" =>
[
"engines/afalg/afalg",
"engines/capi",
"engines/dasync",
"engines/padlock",
],
"libraries" =>
[
"libcrypto",
"libssl",
],
"programs" =>
[
"apps/openssl",
],
"scripts" =>
[
"apps/CA.pl",
"apps/tsget",
"tools/c_rehash",
],
},
Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-07-08 20:28:58 +08:00
|
|
|
foreach (@scripts_install) {
|
|
|
|
my $script = cleanfile($buildd, $_, $blddir);
|
|
|
|
if ($unified_info{rename}->{$script}) {
|
|
|
|
$script = $unified_info{rename}->{$script};
|
|
|
|
}
|
|
|
|
$unified_info{install}->{scripts}->{$script} = 1;
|
|
|
|
}
|
|
|
|
|
2016-01-30 02:45:51 +08:00
|
|
|
foreach (@extra) {
|
2016-02-10 09:00:37 +08:00
|
|
|
my $extra = cleanfile($buildd, $_, $blddir);
|
2016-01-30 02:45:51 +08:00
|
|
|
$unified_info{extra}->{$extra} = 1;
|
|
|
|
}
|
|
|
|
|
2016-03-07 21:50:37 +08:00
|
|
|
foreach (@overrides) {
|
|
|
|
my $override = cleanfile($buildd, $_, $blddir);
|
|
|
|
$unified_info{overrides}->{$override} = 1;
|
|
|
|
}
|
|
|
|
|
2016-01-30 02:45:51 +08:00
|
|
|
push @{$unified_info{rawlines}}, @rawlines;
|
|
|
|
|
2016-02-22 20:52:46 +08:00
|
|
|
unless ($disabled{shared}) {
|
2016-01-30 02:45:51 +08:00
|
|
|
# Check sharednames.
|
|
|
|
foreach (keys %sharednames) {
|
2016-02-10 09:00:37 +08:00
|
|
|
my $dest = cleanfile($buildd, $_, $blddir);
|
2016-01-30 02:45:51 +08: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 09:00:37 +08:00
|
|
|
my $to = cleanfile($buildd, $sharednames{$_}->[0], $blddir);
|
2016-01-30 02:45:51 +08: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
|
2017-04-18 22:24:23 +08:00
|
|
|
# have any, as themselves. Only for libraries that aren't
|
2017-11-12 08:03:10 +08:00
|
|
|
# explicitly static.
|
2017-04-18 22:24:23 +08:00
|
|
|
foreach (grep !/\.a$/, keys %{$unified_info{libraries}}) {
|
2016-01-30 02:45:51 +08:00
|
|
|
if (!defined $unified_info{sharednames}->{$_}) {
|
|
|
|
$unified_info{sharednames}->{$_} = $_
|
|
|
|
}
|
|
|
|
}
|
2017-04-18 22:24:23 +08:00
|
|
|
|
|
|
|
# Check that we haven't defined any library as both shared and
|
2017-11-12 08:03:10 +08:00
|
|
|
# explicitly static. That is forbidden.
|
2017-04-18 22:24:23 +08:00
|
|
|
my @doubles = ();
|
|
|
|
foreach (grep /\.a$/, keys %{$unified_info{libraries}}) {
|
|
|
|
(my $l = $_) =~ s/\.a$//;
|
|
|
|
push @doubles, $l if defined $unified_info{sharednames}->{$l};
|
|
|
|
}
|
2017-11-12 08:03:10 +08:00
|
|
|
die "these libraries are both explicitly static and shared:\n ",
|
2017-04-18 22:24:23 +08:00
|
|
|
join(" ", @doubles), "\n"
|
|
|
|
if @doubles;
|
2016-01-30 02:45:51 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
foreach (keys %sources) {
|
|
|
|
my $dest = $_;
|
2016-02-10 09:00:37 +08:00
|
|
|
my $ddest = cleanfile($buildd, $_, $blddir);
|
2016-01-30 02:45:51 +08:00
|
|
|
if ($unified_info{rename}->{$ddest}) {
|
|
|
|
$ddest = $unified_info{rename}->{$ddest};
|
|
|
|
}
|
|
|
|
foreach (@{$sources{$dest}}) {
|
2016-02-10 09:00:37 +08:00
|
|
|
my $s = cleanfile($sourced, $_, $blddir);
|
2016-01-30 02:45:51 +08:00
|
|
|
|
|
|
|
# If it isn't in the source tree, we assume it's generated
|
|
|
|
# in the build tree
|
2018-03-08 19:01:28 +08:00
|
|
|
if ($s eq $src_configdata || ! -f $s || $generate{$_}) {
|
2016-02-10 09:00:37 +08:00
|
|
|
$s = cleanfile($buildd, $_, $blddir);
|
2016-01-30 02:45:51 +08:00
|
|
|
}
|
2016-10-12 21:30:08 +08:00
|
|
|
# We recognise C++, C and asm files
|
|
|
|
if ($s =~ /\.(cc|cpp|c|s|S)$/) {
|
|
|
|
my $o = $_;
|
|
|
|
$o =~ s/\.[csS]$/.o/; # C and assembler
|
|
|
|
$o =~ s/\.(cc|cpp)$/_cc.o/; # C++
|
2016-02-10 09:00:37 +08:00
|
|
|
$o = cleanfile($buildd, $o, $blddir);
|
2018-09-10 08:21:40 +08:00
|
|
|
$unified_info{sources}->{$ddest}->{$o} = -1;
|
|
|
|
$unified_info{sources}->{$o}->{$s} = -1;
|
2018-03-22 22:21:33 +08:00
|
|
|
} elsif ($s =~ /\.rc$/) {
|
|
|
|
# We also recognise resource files
|
|
|
|
my $o = $_;
|
|
|
|
$o =~ s/\.rc$/.res/; # Resource configuration
|
|
|
|
my $o = cleanfile($buildd, $o, $blddir);
|
2018-09-10 08:21:40 +08:00
|
|
|
$unified_info{sources}->{$ddest}->{$o} = -1;
|
|
|
|
$unified_info{sources}->{$o}->{$s} = -1;
|
2016-01-30 02:45:51 +08:00
|
|
|
} else {
|
|
|
|
$unified_info{sources}->{$ddest}->{$s} = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-03-29 22:45:03 +08:00
|
|
|
foreach (keys %shared_sources) {
|
|
|
|
my $dest = $_;
|
|
|
|
my $ddest = cleanfile($buildd, $_, $blddir);
|
|
|
|
if ($unified_info{rename}->{$ddest}) {
|
|
|
|
$ddest = $unified_info{rename}->{$ddest};
|
|
|
|
}
|
|
|
|
foreach (@{$shared_sources{$dest}}) {
|
|
|
|
my $s = cleanfile($sourced, $_, $blddir);
|
|
|
|
|
|
|
|
# If it isn't in the source tree, we assume it's generated
|
|
|
|
# in the build tree
|
2018-03-08 19:01:28 +08:00
|
|
|
if ($s eq $src_configdata || ! -f $s || $generate{$_}) {
|
2016-03-29 22:45:03 +08:00
|
|
|
$s = cleanfile($buildd, $_, $blddir);
|
|
|
|
}
|
2017-12-01 22:43:43 +08:00
|
|
|
|
2016-10-12 21:30:08 +08:00
|
|
|
if ($s =~ /\.(cc|cpp|c|s|S)$/) {
|
2017-12-01 22:43:43 +08:00
|
|
|
# We recognise C++, C and asm files
|
2016-10-12 21:30:08 +08:00
|
|
|
my $o = $_;
|
|
|
|
$o =~ s/\.[csS]$/.o/; # C and assembler
|
|
|
|
$o =~ s/\.(cc|cpp)$/_cc.o/; # C++
|
2016-03-29 22:45:03 +08:00
|
|
|
$o = cleanfile($buildd, $o, $blddir);
|
2018-09-10 08:21:40 +08:00
|
|
|
$unified_info{shared_sources}->{$ddest}->{$o} = -1;
|
|
|
|
$unified_info{sources}->{$o}->{$s} = -1;
|
2017-12-01 22:43:43 +08:00
|
|
|
} elsif ($s =~ /\.rc$/) {
|
|
|
|
# We also recognise resource files
|
|
|
|
my $o = $_;
|
|
|
|
$o =~ s/\.rc$/.res/; # Resource configuration
|
|
|
|
my $o = cleanfile($buildd, $o, $blddir);
|
2018-09-10 08:21:40 +08:00
|
|
|
$unified_info{shared_sources}->{$ddest}->{$o} = -1;
|
|
|
|
$unified_info{sources}->{$o}->{$s} = -1;
|
2018-09-30 20:44:59 +08:00
|
|
|
} elsif ($s =~ /\.ld$/) {
|
|
|
|
# We also recognise linker scripts (or corresponding)
|
2017-12-01 22:43:43 +08:00
|
|
|
# We know they are generated files
|
2018-10-04 23:41:51 +08:00
|
|
|
my $ld = cleanfile($buildd, $_, $blddir);
|
2018-09-30 20:44:59 +08:00
|
|
|
$unified_info{shared_sources}->{$ddest}->{$ld} = 1;
|
2016-03-29 22:45:03 +08:00
|
|
|
} else {
|
|
|
|
die "unrecognised source file type for shared library: $s\n";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-03-07 21:37:00 +08:00
|
|
|
foreach (keys %generate) {
|
|
|
|
my $dest = $_;
|
|
|
|
my $ddest = cleanfile($buildd, $_, $blddir);
|
|
|
|
if ($unified_info{rename}->{$ddest}) {
|
|
|
|
$ddest = $unified_info{rename}->{$ddest};
|
|
|
|
}
|
|
|
|
die "more than one generator for $dest: "
|
|
|
|
,join(" ", @{$generate{$_}}),"\n"
|
|
|
|
if scalar @{$generate{$_}} > 1;
|
|
|
|
my @generator = split /\s+/, $generate{$dest}->[0];
|
|
|
|
$generator[0] = cleanfile($sourced, $generator[0], $blddir),
|
|
|
|
$unified_info{generate}->{$ddest} = [ @generator ];
|
|
|
|
}
|
|
|
|
|
2016-01-30 02:45:51 +08:00
|
|
|
foreach (keys %depends) {
|
|
|
|
my $dest = $_;
|
2016-06-14 03:57:51 +08:00
|
|
|
my $ddest = $dest eq "" ? "" : cleanfile($sourced, $_, $blddir);
|
2016-04-21 20:30:08 +08:00
|
|
|
|
|
|
|
# If the destination doesn't exist in source, it can only be
|
|
|
|
# a generated file in the build tree.
|
2018-03-08 19:01:28 +08:00
|
|
|
if ($ddest ne "" && ($ddest eq $src_configdata || ! -f $ddest)) {
|
2016-04-21 20:30:08 +08:00
|
|
|
$ddest = cleanfile($buildd, $_, $blddir);
|
|
|
|
if ($unified_info{rename}->{$ddest}) {
|
|
|
|
$ddest = $unified_info{rename}->{$ddest};
|
|
|
|
}
|
2016-01-30 02:45:51 +08:00
|
|
|
}
|
|
|
|
foreach (@{$depends{$dest}}) {
|
2016-02-10 09:00:37 +08:00
|
|
|
my $d = cleanfile($sourced, $_, $blddir);
|
2016-01-30 02:45:51 +08:00
|
|
|
|
2016-02-11 22:22:27 +08: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.
|
2018-03-08 19:01:28 +08:00
|
|
|
if ($d eq $src_configdata
|
|
|
|
|| ! -f $d
|
2016-03-19 08:29:01 +08:00
|
|
|
|| (grep { $d eq $_ }
|
|
|
|
map { cleanfile($srcdir, $_, $blddir) }
|
2016-06-14 03:57:51 +08:00
|
|
|
grep { /\.h$/ } keys %{$unified_info{generate}})) {
|
2016-02-10 09:00:37 +08:00
|
|
|
$d = cleanfile($buildd, $_, $blddir);
|
2016-01-30 02:45:51 +08:00
|
|
|
}
|
|
|
|
# Take note if the file to depend on is being renamed
|
2016-11-10 03:01:51 +08:00
|
|
|
# Take extra care with files ending with .a, they should
|
|
|
|
# be treated without that extension, and the extension
|
|
|
|
# should be added back after treatment.
|
|
|
|
$d =~ /(\.a)?$/;
|
|
|
|
my $e = $1 // "";
|
|
|
|
$d = $`;
|
2016-01-30 02:45:51 +08:00
|
|
|
if ($unified_info{rename}->{$d}) {
|
|
|
|
$d = $unified_info{rename}->{$d};
|
|
|
|
}
|
2016-11-10 03:01:51 +08:00
|
|
|
$d .= $e;
|
2016-01-30 02:45:51 +08:00
|
|
|
$unified_info{depends}->{$ddest}->{$d} = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
foreach (keys %includes) {
|
|
|
|
my $dest = $_;
|
2016-04-21 20:30:08 +08:00
|
|
|
my $ddest = cleanfile($sourced, $_, $blddir);
|
|
|
|
|
|
|
|
# If the destination doesn't exist in source, it can only be
|
|
|
|
# a generated file in the build tree.
|
2018-03-08 19:01:28 +08:00
|
|
|
if ($ddest eq $src_configdata || ! -f $ddest) {
|
2016-04-21 20:30:08 +08:00
|
|
|
$ddest = cleanfile($buildd, $_, $blddir);
|
|
|
|
if ($unified_info{rename}->{$ddest}) {
|
|
|
|
$ddest = $unified_info{rename}->{$ddest};
|
|
|
|
}
|
2016-01-30 02:45:51 +08:00
|
|
|
}
|
|
|
|
foreach (@{$includes{$dest}}) {
|
2016-06-30 04:51:42 +08:00
|
|
|
my $is = cleandir($sourced, $_, $blddir);
|
|
|
|
my $ib = cleandir($buildd, $_, $blddir);
|
|
|
|
push @{$unified_info{includes}->{$ddest}->{source}}, $is
|
|
|
|
unless grep { $_ eq $is } @{$unified_info{includes}->{$ddest}->{source}};
|
|
|
|
push @{$unified_info{includes}->{$ddest}->{build}}, $ib
|
|
|
|
unless grep { $_ eq $ib } @{$unified_info{includes}->{$ddest}->{build}};
|
2016-01-30 02:45:51 +08:00
|
|
|
}
|
|
|
|
}
|
2016-10-14 22:56:34 +08:00
|
|
|
|
|
|
|
foreach (keys %defines) {
|
|
|
|
my $dest = $_;
|
|
|
|
my $ddest = cleanfile($sourced, $_, $blddir);
|
|
|
|
|
|
|
|
# If the destination doesn't exist in source, it can only be
|
|
|
|
# a generated file in the build tree.
|
|
|
|
if (! -f $ddest) {
|
|
|
|
$ddest = cleanfile($buildd, $_, $blddir);
|
|
|
|
if ($unified_info{rename}->{$ddest}) {
|
|
|
|
$ddest = $unified_info{rename}->{$ddest};
|
|
|
|
}
|
|
|
|
}
|
|
|
|
foreach (@{$defines{$dest}}) {
|
|
|
|
m|^([^=]*)(=.*)?$|;
|
|
|
|
die "0 length macro name not permitted\n" if $1 eq "";
|
|
|
|
die "$1 defined more than once\n"
|
|
|
|
if defined $unified_info{defines}->{$ddest}->{$1};
|
|
|
|
$unified_info{defines}->{$ddest}->{$1} = $2;
|
|
|
|
}
|
|
|
|
}
|
2016-01-30 02:45:51 +08:00
|
|
|
}
|
|
|
|
|
2017-12-28 23:03:17 +08:00
|
|
|
my $ordinals_text = join(', ', sort keys %ordinals);
|
|
|
|
warn <<"EOF" if $ordinals_text;
|
|
|
|
|
|
|
|
WARNING: ORDINALS were specified for $ordinals_text
|
|
|
|
They are ignored and should be replaced with a combination of GENERATE,
|
|
|
|
DEPEND and SHARED_SOURCE.
|
|
|
|
EOF
|
|
|
|
|
2018-01-24 02:07:14 +08:00
|
|
|
# Massage the result
|
|
|
|
|
2018-01-24 02:13:48 +08:00
|
|
|
# If we depend on a header file or a perl module, add an inclusion of
|
|
|
|
# its directory to allow smoothe inclusion
|
|
|
|
foreach my $dest (keys %{$unified_info{depends}}) {
|
|
|
|
next if $dest eq "";
|
|
|
|
foreach my $d (keys %{$unified_info{depends}->{$dest}}) {
|
|
|
|
next unless $d =~ /\.(h|pm)$/;
|
2018-03-07 22:58:04 +08:00
|
|
|
my $i = dirname($d);
|
|
|
|
my $spot =
|
|
|
|
$d eq "configdata.pm" || defined($unified_info{generate}->{$d})
|
|
|
|
? 'build' : 'source';
|
|
|
|
push @{$unified_info{includes}->{$dest}->{$spot}}, $i
|
|
|
|
unless grep { $_ eq $i } @{$unified_info{includes}->{$dest}->{$spot}};
|
2018-01-24 02:13:48 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-09-30 20:44:59 +08:00
|
|
|
# Go through all intermediary files and change their names to something that
|
2018-09-10 08:21:40 +08:00
|
|
|
# reflects what they will be built for. Note that for some source files,
|
|
|
|
# this leads to duplicate object files because they are used multiple times.
|
|
|
|
# the goal is to rename all object files according to this scheme:
|
|
|
|
# {productname}-{midfix}-{origobjname}.[o|res]
|
|
|
|
# the {midfix} is a keyword indicating the type of product, which is mostly
|
|
|
|
# valuable for libraries since they come in two forms.
|
|
|
|
#
|
|
|
|
# This also reorganises the {sources} and {shared_sources} so that the
|
|
|
|
# former only contains ALL object files that are supposed to end up in
|
|
|
|
# static libraries and programs, while the latter contains ALL object files
|
|
|
|
# that are supposed to end up in shared libraries and DSOs.
|
|
|
|
# The main reason for having two different source structures is to allow
|
|
|
|
# the same name to be used for the static and the shared variants of a
|
|
|
|
# library.
|
|
|
|
{
|
|
|
|
# Take copies so we don't get interference from added stuff
|
|
|
|
my %unified_copy = ();
|
|
|
|
foreach (('sources', 'shared_sources')) {
|
|
|
|
$unified_copy{$_} = { %{$unified_info{$_}} }
|
|
|
|
if defined($unified_info{$_});
|
|
|
|
delete $unified_info{$_};
|
|
|
|
}
|
|
|
|
foreach my $prodtype (('programs', 'libraries', 'engines', 'scripts')) {
|
|
|
|
# $intent serves multi purposes:
|
|
|
|
# - give a prefix for the new object files names
|
|
|
|
# - in the case of libraries, rearrange the object files so static
|
|
|
|
# libraries use the 'sources' structure exclusively, while shared
|
|
|
|
# libraries use the 'shared_sources' structure exclusively.
|
|
|
|
my $intent = {
|
|
|
|
programs => { bin => { src => [ 'sources' ],
|
|
|
|
dst => 'sources' } },
|
|
|
|
libraries => { lib => { src => [ 'sources' ],
|
|
|
|
dst => 'sources' },
|
|
|
|
shlib => { prodselect =>
|
|
|
|
sub { grep !/\.a$/, @_ },
|
|
|
|
src => [ 'sources',
|
|
|
|
'shared_sources' ],
|
|
|
|
dst => 'shared_sources' } },
|
|
|
|
engines => { dso => { src => [ 'sources',
|
|
|
|
'shared_sources' ],
|
|
|
|
dst => 'shared_sources' } },
|
|
|
|
scripts => { script => { src => [ 'sources' ],
|
|
|
|
dst => 'sources' } }
|
|
|
|
} -> {$prodtype};
|
|
|
|
foreach my $kind (keys %$intent) {
|
2018-11-16 04:37:55 +08:00
|
|
|
next if ($intent->{$kind}->{dst} eq 'shared_sources'
|
|
|
|
&& $disabled{shared});
|
|
|
|
|
2018-09-10 08:21:40 +08:00
|
|
|
my @src = @{$intent->{$kind}->{src}};
|
|
|
|
my $dst = $intent->{$kind}->{dst};
|
|
|
|
my $prodselect = $intent->{$kind}->{prodselect} // sub { @_ };
|
|
|
|
foreach my $prod ($prodselect->(keys %{$unified_info{$prodtype}})) {
|
|
|
|
# %prod_sources has all applicable objects as keys, and
|
|
|
|
# their corresponding sources as values
|
|
|
|
my %prod_sources =
|
|
|
|
map { $_ => [ keys %{$unified_copy{sources}->{$_}} ] }
|
|
|
|
map { keys %{$unified_copy{$_}->{$prod}} }
|
|
|
|
@src;
|
|
|
|
foreach (keys %prod_sources) {
|
2018-09-30 20:44:59 +08:00
|
|
|
# Only affect object files and resource files,
|
|
|
|
# the others simply get a new value
|
|
|
|
# (+1 instead of -1)
|
2018-09-10 08:21:40 +08:00
|
|
|
if ($_ =~ /\.(o|res)$/) {
|
|
|
|
(my $prodname = $prod) =~ s|\.a$||;
|
|
|
|
my $newobj =
|
|
|
|
catfile(dirname($_),
|
|
|
|
basename($prodname)
|
|
|
|
. '-' . $kind
|
|
|
|
. '-' . basename($_));
|
|
|
|
$unified_info{$dst}->{$prod}->{$newobj} = 1;
|
|
|
|
foreach my $src (@{$prod_sources{$_}}) {
|
|
|
|
$unified_info{sources}->{$newobj}->{$src} = 1;
|
|
|
|
}
|
|
|
|
# Adjust dependencies
|
|
|
|
foreach my $deps (keys %{$unified_info{depends}->{$_}}) {
|
|
|
|
$unified_info{depends}->{$_}->{$deps} = -1;
|
|
|
|
$unified_info{depends}->{$newobj}->{$deps} = 1;
|
|
|
|
}
|
|
|
|
# Adjust includes
|
|
|
|
foreach my $k (('source', 'build')) {
|
|
|
|
next unless
|
|
|
|
defined($unified_info{includes}->{$_}->{$k});
|
|
|
|
my @incs = @{$unified_info{includes}->{$_}->{$k}};
|
|
|
|
$unified_info{includes}->{$newobj}->{$k} = [ @incs ];
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
$unified_info{$dst}->{$prod}->{$_} = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
# At this point, we have a number of sources with the value -1. They
|
|
|
|
# aren't part of the local build and are probably meant for a different
|
|
|
|
# platform, and can therefore be cleaned away. That happens when making
|
|
|
|
# %unified_info more efficient below.
|
|
|
|
|
2016-01-30 02:45:51 +08:00
|
|
|
### Make unified_info a bit more efficient
|
|
|
|
# One level structures
|
2016-03-07 21:50:37 +08:00
|
|
|
foreach (("programs", "libraries", "engines", "scripts", "extra", "overrides")) {
|
2016-01-30 02:45:51 +08:00
|
|
|
$unified_info{$_} = [ sort keys %{$unified_info{$_}} ];
|
|
|
|
}
|
|
|
|
# Two level structures
|
build.info: implement PROGRAM_NO_INST, and dito for ENGINES, SCRIPTS, LIBS
PROGRAM_NO_INST, ENGINES_NO_INST, SCRIPTS_NO_INST and LIBS_NO_INST are
to be used to specify program, engines, scripts and libraries that are
not to be installed in the system. Fuzzers, test programs, that sort
of things are of the _NO_INST type, for example.
For the benefit of build file templates and other templates that use
data from configdata.pm, a new hash table $unified_info{install} is
created. It contains a set of subhashes, one for each type of
installable, each having an array of file names as values. For
example, it can look like this:
"install" =>
{
"engines" =>
[
"engines/afalg/afalg",
"engines/capi",
"engines/dasync",
"engines/padlock",
],
"libraries" =>
[
"libcrypto",
"libssl",
],
"programs" =>
[
"apps/openssl",
],
"scripts" =>
[
"apps/CA.pl",
"apps/tsget",
"tools/c_rehash",
],
},
Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-07-08 20:28:58 +08:00
|
|
|
foreach my $l1 (("install", "sources", "shared_sources", "ldadd", "depends")) {
|
2016-01-30 02:45:51 +08:00
|
|
|
foreach my $l2 (sort keys %{$unified_info{$l1}}) {
|
2018-09-10 08:21:40 +08:00
|
|
|
my @items =
|
|
|
|
sort
|
|
|
|
grep { $unified_info{$l1}->{$l2}->{$_} > 0 }
|
|
|
|
keys %{$unified_info{$l1}->{$l2}};
|
|
|
|
if (@items) {
|
|
|
|
$unified_info{$l1}->{$l2} = [ @items ];
|
|
|
|
} else {
|
|
|
|
delete $unified_info{$l1}->{$l2};
|
|
|
|
}
|
2016-01-30 02:45:51 +08:00
|
|
|
}
|
|
|
|
}
|
2016-10-14 22:56:34 +08:00
|
|
|
# Defines
|
|
|
|
foreach my $dest (sort keys %{$unified_info{defines}}) {
|
|
|
|
$unified_info{defines}->{$dest}
|
|
|
|
= [ map { $_.$unified_info{defines}->{$dest}->{$_} }
|
|
|
|
sort keys %{$unified_info{defines}->{$dest}} ];
|
|
|
|
}
|
2016-06-30 04:51:42 +08:00
|
|
|
# Includes
|
|
|
|
foreach my $dest (sort keys %{$unified_info{includes}}) {
|
|
|
|
if (defined($unified_info{includes}->{$dest}->{build})) {
|
2018-01-24 02:13:48 +08:00
|
|
|
my @source_includes = ();
|
|
|
|
@source_includes = ( @{$unified_info{includes}->{$dest}->{source}} )
|
|
|
|
if defined($unified_info{includes}->{$dest}->{source});
|
2016-06-30 04:51:42 +08:00
|
|
|
$unified_info{includes}->{$dest} =
|
|
|
|
[ @{$unified_info{includes}->{$dest}->{build}} ];
|
|
|
|
foreach my $inc (@source_includes) {
|
|
|
|
push @{$unified_info{includes}->{$dest}}, $inc
|
|
|
|
unless grep { $_ eq $inc } @{$unified_info{includes}->{$dest}};
|
|
|
|
}
|
2018-09-10 08:18:22 +08:00
|
|
|
} elsif (defined($unified_info{includes}->{$dest}->{source})) {
|
2016-06-30 04:51:42 +08:00
|
|
|
$unified_info{includes}->{$dest} =
|
|
|
|
[ @{$unified_info{includes}->{$dest}->{source}} ];
|
2018-09-10 08:18:22 +08:00
|
|
|
} else {
|
|
|
|
delete $unified_info{includes}->{$dest};
|
2016-06-30 04:51:42 +08:00
|
|
|
}
|
|
|
|
}
|
2018-10-21 17:11:04 +08:00
|
|
|
|
|
|
|
# For convenience collect information regarding directories where
|
|
|
|
# files are generated, those generated files and the end product
|
|
|
|
# they end up in where applicable. Then, add build rules for those
|
|
|
|
# directories
|
|
|
|
my %loopinfo = ( "lib" => [ @{$unified_info{libraries}} ],
|
|
|
|
"dso" => [ @{$unified_info{engines}} ],
|
|
|
|
"bin" => [ @{$unified_info{programs}} ],
|
|
|
|
"script" => [ @{$unified_info{scripts}} ] );
|
|
|
|
foreach my $type (keys %loopinfo) {
|
|
|
|
foreach my $product (@{$loopinfo{$type}}) {
|
|
|
|
my %dirs = ();
|
|
|
|
my $pd = dirname($product);
|
|
|
|
|
2018-11-01 20:55:32 +08:00
|
|
|
foreach (@{$unified_info{sources}->{$product} // []},
|
2018-10-21 17:11:04 +08:00
|
|
|
@{$unified_info{shared_sources}->{$product} // []}) {
|
|
|
|
my $d = dirname($_);
|
|
|
|
|
|
|
|
# We don't want to create targets for source directories
|
|
|
|
# when building out of source
|
|
|
|
next if ($config{sourcedir} ne $config{builddir}
|
|
|
|
&& $d =~ m|^\Q$config{sourcedir}\E|);
|
|
|
|
# We already have a "test" target, and the current directory
|
|
|
|
# is just silly to make a target for
|
|
|
|
next if $d eq "test" || $d eq ".";
|
|
|
|
|
|
|
|
$dirs{$d} = 1;
|
|
|
|
push @{$unified_info{dirinfo}->{$d}->{deps}}, $_
|
|
|
|
if $d ne $pd;
|
|
|
|
}
|
|
|
|
foreach (keys %dirs) {
|
|
|
|
push @{$unified_info{dirinfo}->{$_}->{products}->{$type}},
|
|
|
|
$product;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2016-01-30 02:45:51 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
# For the schemes that need it, we provide the old *_obj configs
|
|
|
|
# from the *_asm_obj ones
|
2016-02-19 01:43:56 +08:00
|
|
|
foreach (grep /_(asm|aux)_src$/, keys %target) {
|
2016-01-30 02:45:51 +08:00
|
|
|
my $src = $_;
|
2016-02-19 01:43:56 +08:00
|
|
|
(my $obj = $_) =~ s/_(asm|aux)_src$/_obj/;
|
2016-10-12 21:30:08 +08:00
|
|
|
$target{$obj} = $target{$src};
|
|
|
|
$target{$obj} =~ s/\.[csS]\b/.o/g; # C and assembler
|
|
|
|
$target{$obj} =~ s/\.(cc|cpp)\b/_cc.o/g; # C++
|
2016-01-30 02:45:51 +08: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-19 04:35:23 +08:00
|
|
|
# Write down our configuration where it fits #########################
|
|
|
|
|
2018-01-29 13:19:17 +08:00
|
|
|
print "Creating configdata.pm\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-19 04:35:23 +08:00
|
|
|
open(OUT,">configdata.pm") || die "unable to create configdata.pm: $!\n";
|
|
|
|
print OUT <<"EOF";
|
Make "make variables" config attributes for overridable flags
With the support of "make variables" comes the possibility for the
user to override them. However, we need to make a difference between
defaults that we use (and that should be overridable by the user) and
flags that are crucial for building OpenSSL (should not be
overridable).
Typically, overridable flags are those setting optimization levels,
warnings levels, that kind of thing, while non-overridable flags are,
for example, macros that indicate aspects of how the config target
should be treated, such as L_ENDIAN and B_ENDIAN.
We do that differentiation by allowing upper case attributes in the
config targets, named exactly like the "make variables" we support,
and reserving the lower case attributes for non-overridable project
flags.
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5534)
2018-03-07 03:35:30 +08:00
|
|
|
#! $config{HASHBANGPERL}
|
2018-01-29 13:19:17 +08: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-19 04:35:23 +08:00
|
|
|
package configdata;
|
|
|
|
|
|
|
|
use strict;
|
|
|
|
use warnings;
|
|
|
|
|
|
|
|
use Exporter;
|
|
|
|
#use vars qw(\@ISA \@EXPORT);
|
|
|
|
our \@ISA = qw(Exporter);
|
2016-03-19 07:41:14 +08:00
|
|
|
our \@EXPORT = qw(\%config \%target \%disabled \%withargs \%unified_info \@disablables);
|
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-19 04:35:23 +08:00
|
|
|
|
|
|
|
EOF
|
|
|
|
print OUT "our %config = (\n";
|
|
|
|
foreach (sort keys %config) {
|
|
|
|
if (ref($config{$_}) eq "ARRAY") {
|
|
|
|
print OUT " ", $_, " => [ ", join(", ",
|
|
|
|
map { quotify("perl", $_) }
|
|
|
|
@{$config{$_}}), " ],\n";
|
2017-11-29 20:09:01 +08:00
|
|
|
} elsif (ref($config{$_}) eq "HASH") {
|
|
|
|
print OUT " ", $_, " => {";
|
|
|
|
if (scalar keys %{$config{$_}} > 0) {
|
|
|
|
print OUT "\n";
|
|
|
|
foreach my $key (sort keys %{$config{$_}}) {
|
|
|
|
print OUT " ",
|
|
|
|
join(" => ",
|
|
|
|
quotify("perl", $key),
|
|
|
|
defined $config{$_}->{$key}
|
|
|
|
? quotify("perl", $config{$_}->{$key})
|
|
|
|
: "undef");
|
|
|
|
print OUT ",\n";
|
|
|
|
}
|
|
|
|
print OUT " ";
|
|
|
|
}
|
|
|
|
print OUT "},\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-19 04:35:23 +08:00
|
|
|
} 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 09:09:33 +08: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";
|
|
|
|
);
|
|
|
|
|
2016-03-19 07:41:14 +08:00
|
|
|
EOF
|
|
|
|
print OUT "our \@disablables = (\n";
|
|
|
|
foreach (@disablables) {
|
|
|
|
print OUT " ", quotify("perl", $_), ",\n";
|
|
|
|
}
|
|
|
|
print OUT <<"EOF";
|
|
|
|
);
|
|
|
|
|
2016-01-26 09:09:33 +08:00
|
|
|
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-19 04:35:23 +08:00
|
|
|
EOF
|
2015-05-21 02:03:20 +08: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-24 07:35:30 +08:00
|
|
|
|
2015-05-21 02:03:20 +08:00
|
|
|
EOF
|
2016-01-30 07:57:33 +08:00
|
|
|
if ($builder eq "unified") {
|
2016-01-30 02:45:51 +08: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
|
|
|
|
}
|
2018-02-02 19:30:14 +08:00
|
|
|
print OUT
|
|
|
|
"# The following data is only used when this files is use as a script\n";
|
Make "make variables" config attributes for overridable flags
With the support of "make variables" comes the possibility for the
user to override them. However, we need to make a difference between
defaults that we use (and that should be overridable by the user) and
flags that are crucial for building OpenSSL (should not be
overridable).
Typically, overridable flags are those setting optimization levels,
warnings levels, that kind of thing, while non-overridable flags are,
for example, macros that indicate aspects of how the config target
should be treated, such as L_ENDIAN and B_ENDIAN.
We do that differentiation by allowing upper case attributes in the
config targets, named exactly like the "make variables" we support,
and reserving the lower case attributes for non-overridable project
flags.
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5534)
2018-03-07 03:35:30 +08:00
|
|
|
print OUT "my \@makevars = (\n";
|
2018-01-29 13:19:17 +08:00
|
|
|
foreach (sort keys %user) {
|
Make "make variables" config attributes for overridable flags
With the support of "make variables" comes the possibility for the
user to override them. However, we need to make a difference between
defaults that we use (and that should be overridable by the user) and
flags that are crucial for building OpenSSL (should not be
overridable).
Typically, overridable flags are those setting optimization levels,
warnings levels, that kind of thing, while non-overridable flags are,
for example, macros that indicate aspects of how the config target
should be treated, such as L_ENDIAN and B_ENDIAN.
We do that differentiation by allowing upper case attributes in the
config targets, named exactly like the "make variables" we support,
and reserving the lower case attributes for non-overridable project
flags.
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5534)
2018-03-07 03:35:30 +08:00
|
|
|
print OUT " '",$_,"',\n";
|
2018-01-29 13:19:17 +08:00
|
|
|
}
|
|
|
|
print OUT ");\n";
|
2018-01-30 00:33:58 +08:00
|
|
|
print OUT "my \%disabled_info = (\n";
|
|
|
|
foreach my $what (sort keys %disabled_info) {
|
|
|
|
print OUT " '$what' => {\n";
|
|
|
|
foreach my $info (sort keys %{$disabled_info{$what}}) {
|
|
|
|
if (ref $disabled_info{$what}->{$info} eq 'ARRAY') {
|
|
|
|
print OUT " $info => [ ",
|
|
|
|
join(', ', map { "'$_'" } @{$disabled_info{$what}->{$info}}),
|
|
|
|
" ],\n";
|
|
|
|
} else {
|
|
|
|
print OUT " $info => '", $disabled_info{$what}->{$info},
|
|
|
|
"',\n";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
print OUT " },\n";
|
|
|
|
}
|
|
|
|
print OUT ");\n";
|
2018-02-02 19:27:29 +08:00
|
|
|
print OUT 'my @user_crossable = qw( ', join (' ', @user_crossable), " );\n";
|
2018-01-29 13:19:17 +08:00
|
|
|
print OUT << 'EOF';
|
|
|
|
# If run directly, we can give some answers, and even reconfigure
|
|
|
|
unless (caller) {
|
|
|
|
use Getopt::Long;
|
|
|
|
use File::Spec::Functions;
|
|
|
|
use File::Basename;
|
|
|
|
use Pod::Usage;
|
|
|
|
|
|
|
|
my $here = dirname($0);
|
|
|
|
|
|
|
|
my $dump = undef;
|
|
|
|
my $cmdline = undef;
|
2018-01-30 00:33:58 +08:00
|
|
|
my $options = undef;
|
2018-02-02 17:33:41 +08:00
|
|
|
my $target = undef;
|
2018-01-29 13:19:17 +08:00
|
|
|
my $envvars = undef;
|
|
|
|
my $makevars = undef;
|
|
|
|
my $buildparams = undef;
|
|
|
|
my $reconf = undef;
|
|
|
|
my $verbose = undef;
|
|
|
|
my $help = undef;
|
|
|
|
my $man = undef;
|
|
|
|
GetOptions('dump|d' => \$dump,
|
|
|
|
'command-line|c' => \$cmdline,
|
2018-01-30 00:33:58 +08:00
|
|
|
'options|o' => \$options,
|
2018-02-02 17:33:41 +08:00
|
|
|
'target|t' => \$target,
|
2018-01-29 13:19:17 +08:00
|
|
|
'environment|e' => \$envvars,
|
|
|
|
'make-variables|m' => \$makevars,
|
|
|
|
'build-parameters|b' => \$buildparams,
|
|
|
|
'reconfigure|reconf|r' => \$reconf,
|
|
|
|
'verbose|v' => \$verbose,
|
|
|
|
'help' => \$help,
|
|
|
|
'man' => \$man)
|
|
|
|
or die "Errors in command line arguments\n";
|
|
|
|
|
2018-02-02 17:33:41 +08:00
|
|
|
unless ($dump || $cmdline || $options || $target || $envvars || $makevars
|
2018-01-30 00:33:58 +08:00
|
|
|
|| $buildparams || $reconf || $verbose || $help || $man) {
|
2018-01-29 13:19:17 +08:00
|
|
|
print STDERR <<"_____";
|
|
|
|
You must give at least one option.
|
|
|
|
For more information, do '$0 --help'
|
|
|
|
_____
|
|
|
|
exit(2);
|
|
|
|
}
|
|
|
|
|
|
|
|
if ($help) {
|
|
|
|
pod2usage(-exitval => 0,
|
|
|
|
-verbose => 1);
|
|
|
|
}
|
|
|
|
if ($man) {
|
|
|
|
pod2usage(-exitval => 0,
|
|
|
|
-verbose => 2);
|
|
|
|
}
|
|
|
|
if ($dump || $cmdline) {
|
2018-02-02 19:21:27 +08:00
|
|
|
print "\nCommand line (with current working directory = $here):\n\n";
|
2018-01-29 13:19:17 +08:00
|
|
|
print ' ',join(' ',
|
2018-07-08 18:00:06 +08:00
|
|
|
$config{PERL},
|
2018-01-29 13:19:17 +08:00
|
|
|
catfile($config{sourcedir}, 'Configure'),
|
|
|
|
@{$config{perlargv}}), "\n";
|
2018-02-02 19:21:27 +08:00
|
|
|
print "\nPerl information:\n\n";
|
|
|
|
print ' ',$config{perl_cmd},"\n";
|
|
|
|
print ' ',$config{perl_version},' for ',$config{perl_archname},"\n";
|
2018-01-29 13:19:17 +08:00
|
|
|
}
|
2018-01-30 00:33:58 +08:00
|
|
|
if ($dump || $options) {
|
|
|
|
my $longest = 0;
|
2018-02-15 02:04:16 +08:00
|
|
|
my $longest2 = 0;
|
2018-01-30 00:33:58 +08:00
|
|
|
foreach my $what (@disablables) {
|
|
|
|
$longest = length($what) if $longest < length($what);
|
2018-02-17 14:33:17 +08:00
|
|
|
$longest2 = length($disabled{$what})
|
|
|
|
if $disabled{$what} && $longest2 < length($disabled{$what});
|
2018-01-30 00:33:58 +08:00
|
|
|
}
|
|
|
|
print "\nEnabled features:\n\n";
|
|
|
|
foreach my $what (@disablables) {
|
|
|
|
print " $what\n" unless $disabled{$what};
|
|
|
|
}
|
|
|
|
print "\nDisabled features:\n\n";
|
|
|
|
foreach my $what (@disablables) {
|
|
|
|
if ($disabled{$what}) {
|
|
|
|
print " $what", ' ' x ($longest - length($what) + 1),
|
2018-02-15 02:04:16 +08:00
|
|
|
"[$disabled{$what}]", ' ' x ($longest2 - length($disabled{$what}) + 1);
|
2018-01-30 00:33:58 +08:00
|
|
|
print $disabled_info{$what}->{macro}
|
|
|
|
if $disabled_info{$what}->{macro};
|
|
|
|
print ' (skip ',
|
|
|
|
join(', ', @{$disabled_info{$what}->{skipped}}),
|
|
|
|
')'
|
|
|
|
if $disabled_info{$what}->{skipped};
|
|
|
|
print "\n";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2018-02-02 17:33:41 +08:00
|
|
|
if ($dump || $target) {
|
|
|
|
print "\nConfig target attributes:\n\n";
|
|
|
|
foreach (sort keys %target) {
|
|
|
|
next if $_ =~ m|^_| || $_ eq 'template';
|
|
|
|
my $quotify = sub {
|
|
|
|
map { (my $x = $_) =~ s|([\\\$\@"])|\\$1|g; "\"$x\""} @_;
|
|
|
|
};
|
|
|
|
print ' ', $_, ' => ';
|
|
|
|
if (ref($target{$_}) eq "ARRAY") {
|
|
|
|
print '[ ', join(', ', $quotify->(@{$target{$_}})), " ],\n";
|
|
|
|
} else {
|
|
|
|
print $quotify->($target{$_}), ",\n"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2018-01-29 13:19:17 +08:00
|
|
|
if ($dump || $envvars) {
|
|
|
|
print "\nRecorded environment:\n\n";
|
|
|
|
foreach (sort keys %{$config{perlenv}}) {
|
|
|
|
print ' ',$_,' = ',($config{perlenv}->{$_} || ''),"\n";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if ($dump || $makevars) {
|
|
|
|
print "\nMakevars:\n\n";
|
Make "make variables" config attributes for overridable flags
With the support of "make variables" comes the possibility for the
user to override them. However, we need to make a difference between
defaults that we use (and that should be overridable by the user) and
flags that are crucial for building OpenSSL (should not be
overridable).
Typically, overridable flags are those setting optimization levels,
warnings levels, that kind of thing, while non-overridable flags are,
for example, macros that indicate aspects of how the config target
should be treated, such as L_ENDIAN and B_ENDIAN.
We do that differentiation by allowing upper case attributes in the
config targets, named exactly like the "make variables" we support,
and reserving the lower case attributes for non-overridable project
flags.
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5534)
2018-03-07 03:35:30 +08:00
|
|
|
foreach my $var (@makevars) {
|
2018-02-02 19:27:29 +08:00
|
|
|
my $prefix = '';
|
Make "make variables" config attributes for overridable flags
With the support of "make variables" comes the possibility for the
user to override them. However, we need to make a difference between
defaults that we use (and that should be overridable by the user) and
flags that are crucial for building OpenSSL (should not be
overridable).
Typically, overridable flags are those setting optimization levels,
warnings levels, that kind of thing, while non-overridable flags are,
for example, macros that indicate aspects of how the config target
should be treated, such as L_ENDIAN and B_ENDIAN.
We do that differentiation by allowing upper case attributes in the
config targets, named exactly like the "make variables" we support,
and reserving the lower case attributes for non-overridable project
flags.
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5534)
2018-03-07 03:35:30 +08:00
|
|
|
$prefix = $config{CROSS_COMPILE}
|
2018-02-02 19:27:29 +08:00
|
|
|
if grep { $var eq $_ } @user_crossable;
|
2018-02-28 04:01:59 +08:00
|
|
|
$prefix //= '';
|
2018-02-02 19:27:29 +08:00
|
|
|
print ' ',$var,' ' x (16 - length $var),'= ',
|
Make "make variables" config attributes for overridable flags
With the support of "make variables" comes the possibility for the
user to override them. However, we need to make a difference between
defaults that we use (and that should be overridable by the user) and
flags that are crucial for building OpenSSL (should not be
overridable).
Typically, overridable flags are those setting optimization levels,
warnings levels, that kind of thing, while non-overridable flags are,
for example, macros that indicate aspects of how the config target
should be treated, such as L_ENDIAN and B_ENDIAN.
We do that differentiation by allowing upper case attributes in the
config targets, named exactly like the "make variables" we support,
and reserving the lower case attributes for non-overridable project
flags.
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5534)
2018-03-07 03:35:30 +08:00
|
|
|
(ref $config{$var} eq 'ARRAY'
|
|
|
|
? join(' ', @{$config{$var}})
|
|
|
|
: $prefix.$config{$var}),
|
2018-01-29 13:19:17 +08:00
|
|
|
"\n"
|
Make "make variables" config attributes for overridable flags
With the support of "make variables" comes the possibility for the
user to override them. However, we need to make a difference between
defaults that we use (and that should be overridable by the user) and
flags that are crucial for building OpenSSL (should not be
overridable).
Typically, overridable flags are those setting optimization levels,
warnings levels, that kind of thing, while non-overridable flags are,
for example, macros that indicate aspects of how the config target
should be treated, such as L_ENDIAN and B_ENDIAN.
We do that differentiation by allowing upper case attributes in the
config targets, named exactly like the "make variables" we support,
and reserving the lower case attributes for non-overridable project
flags.
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5534)
2018-03-07 03:35:30 +08:00
|
|
|
if defined $config{$var};
|
2018-01-29 13:19:17 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
my @buildfile = ($config{builddir}, $config{build_file});
|
|
|
|
unshift @buildfile, $here
|
|
|
|
unless file_name_is_absolute($config{builddir});
|
|
|
|
my $buildfile = canonpath(catdir(@buildfile));
|
|
|
|
print <<"_____";
|
|
|
|
|
|
|
|
NOTE: These variables only represent the configuration view. The build file
|
|
|
|
template may have processed these variables further, please have a look at the
|
|
|
|
build file for more exact data:
|
|
|
|
$buildfile
|
|
|
|
_____
|
|
|
|
}
|
|
|
|
if ($dump || $buildparams) {
|
|
|
|
my @buildfile = ($config{builddir}, $config{build_file});
|
|
|
|
unshift @buildfile, $here
|
|
|
|
unless file_name_is_absolute($config{builddir});
|
|
|
|
print "\nbuild file:\n\n";
|
|
|
|
print " ", canonpath(catfile(@buildfile)),"\n";
|
|
|
|
|
|
|
|
print "\nbuild file templates:\n\n";
|
|
|
|
foreach (@{$config{build_file_templates}}) {
|
|
|
|
my @tmpl = ($_);
|
|
|
|
unshift @tmpl, $here
|
|
|
|
unless file_name_is_absolute($config{sourcedir});
|
|
|
|
print ' ',canonpath(catfile(@tmpl)),"\n";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if ($reconf) {
|
|
|
|
if ($verbose) {
|
|
|
|
print 'Reconfiguring with: ', join(' ',@{$config{perlargv}}), "\n";
|
|
|
|
foreach (sort keys %{$config{perlenv}}) {
|
|
|
|
print ' ',$_,' = ',($config{perlenv}->{$_} || ""),"\n";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
chdir $here;
|
|
|
|
exec $^X,catfile($config{sourcedir}, 'Configure'),'reconf';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
1;
|
|
|
|
|
|
|
|
__END__
|
|
|
|
|
|
|
|
=head1 NAME
|
|
|
|
|
|
|
|
configdata.pm - configuration data for OpenSSL builds
|
|
|
|
|
|
|
|
=head1 SYNOPSIS
|
|
|
|
|
|
|
|
Interactive:
|
|
|
|
|
|
|
|
perl configdata.pm [options]
|
|
|
|
|
|
|
|
As data bank module:
|
|
|
|
|
|
|
|
use configdata;
|
1998-12-29 06:05:44 +08:00
|
|
|
|
2018-01-29 13:19:17 +08:00
|
|
|
=head1 DESCRIPTION
|
|
|
|
|
|
|
|
This module can be used in two modes, interactively and as a module containing
|
|
|
|
all the data recorded by OpenSSL's Configure script.
|
|
|
|
|
|
|
|
When used interactively, simply run it as any perl script, with at least one
|
|
|
|
option, and you will get the information you ask for. See L</OPTIONS> below.
|
|
|
|
|
|
|
|
When loaded as a module, you get a few databanks with useful information to
|
|
|
|
perform build related tasks. The databanks are:
|
|
|
|
|
|
|
|
%config Configured things.
|
|
|
|
%target The OpenSSL config target with all inheritances
|
|
|
|
resolved.
|
|
|
|
%disabled The features that are disabled.
|
|
|
|
@disablables The list of features that can be disabled.
|
|
|
|
%withargs All data given through --with-THING options.
|
|
|
|
%unified_info All information that was computed from the build.info
|
|
|
|
files.
|
|
|
|
|
|
|
|
=head1 OPTIONS
|
|
|
|
|
|
|
|
=over 4
|
|
|
|
|
|
|
|
=item B<--help>
|
|
|
|
|
|
|
|
Print a brief help message and exit.
|
|
|
|
|
|
|
|
=item B<--man>
|
|
|
|
|
|
|
|
Print the manual page and exit.
|
|
|
|
|
2018-01-31 08:16:51 +08:00
|
|
|
=item B<--dump> | B<-d>
|
2018-01-29 13:19:17 +08:00
|
|
|
|
|
|
|
Print all relevant configuration data. This is equivalent to B<--command-line>
|
2018-02-02 17:33:41 +08:00
|
|
|
B<--options> B<--target> B<--environment> B<--make-variables>
|
|
|
|
B<--build-parameters>.
|
2018-01-29 13:19:17 +08:00
|
|
|
|
|
|
|
=item B<--command-line> | B<-c>
|
|
|
|
|
|
|
|
Print the current configuration command line.
|
|
|
|
|
2018-01-30 00:33:58 +08:00
|
|
|
=item B<--options> | B<-o>
|
|
|
|
|
|
|
|
Print the features, both enabled and disabled, and display defined macro and
|
|
|
|
skipped directories where applicable.
|
|
|
|
|
2018-02-02 17:33:41 +08:00
|
|
|
=item B<--target> | B<-t>
|
|
|
|
|
|
|
|
Print the config attributes for this config target.
|
|
|
|
|
2018-01-29 13:19:17 +08:00
|
|
|
=item B<--environment> | B<-e>
|
|
|
|
|
|
|
|
Print the environment variables and their values at the time of configuration.
|
|
|
|
|
|
|
|
=item B<--make-variables> | B<-m>
|
|
|
|
|
|
|
|
Print the main make variables generated in the current configuration
|
|
|
|
|
|
|
|
=item B<--build-parameters> | B<-b>
|
|
|
|
|
|
|
|
Print the build parameters, i.e. build file and build file templates.
|
|
|
|
|
|
|
|
=item B<--reconfigure> | B<--reconf> | B<-r>
|
|
|
|
|
|
|
|
Redo the configuration.
|
|
|
|
|
|
|
|
=item B<--verbose> | B<-v>
|
|
|
|
|
|
|
|
Verbose output.
|
|
|
|
|
|
|
|
=back
|
|
|
|
|
|
|
|
=cut
|
|
|
|
|
|
|
|
EOF
|
|
|
|
close(OUT);
|
|
|
|
if ($builder_platform eq 'unix') {
|
|
|
|
my $mode = (0755 & ~umask);
|
|
|
|
chmod $mode, 'configdata.pm'
|
|
|
|
or warn sprintf("WARNING: Couldn't change mode for 'configdata.pm' to 0%03o: %s\n",$mode,$!);
|
|
|
|
}
|
1999-03-07 22:05:36 +08: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 20:31:49 +08:00
|
|
|
my %builders = (
|
2016-01-30 02:45:51 +08:00
|
|
|
unified => sub {
|
2018-01-29 13:19:17 +08:00
|
|
|
print 'Creating ',$target{build_file},"\n";
|
2016-01-30 07:57:33 +08:00
|
|
|
run_dofile(catfile($blddir, $target{build_file}),
|
2016-09-16 05:55:24 +08:00
|
|
|
@{$config{build_file_templates}});
|
2016-01-30 02:45:51 +08: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 20:31:49 +08:00
|
|
|
);
|
|
|
|
|
2016-01-30 07:57:33 +08:00
|
|
|
$builders{$builder}->($builder_platform, @builder_opts);
|
2014-05-27 00:19:28 +08:00
|
|
|
|
2018-07-24 16:45:05 +08:00
|
|
|
$SIG{__DIE__} = $orig_death_handler;
|
|
|
|
|
Configure - Get rid of the special thread_cflag, replace with thread_scheme
The thread_cflag setting filled a double role, as kinda sorta an
indicator of thread scheme, and as cflags. Some configs also added
lflags and ex_libs for multithreading regardless of if threading would
be enabled or not.
Instead of this, add threading cflags among in the cflag setting,
threading lflags in the lflag setting and so on if and only if threads
are enabled (which they are by default).
Also, for configs where there are no special cflags for threading (the
VMS configs are of that kind), this makes it possible to still clearly
mention what thread scheme is used.
The exact value of thread scheme is currently ignored except when it's
"(unknown)", and thereby only serves as a flag to tell if we know how
to build for multi-threading in a particular config. Yet, the
currently used values are "(unknown)", "pthreads", "uithreads" (a.k.a
solaris threads) and "winthreads".
Reviewed-by: Andy Polyakov <appro@openssl.org>
2016-02-27 23:51:34 +08:00
|
|
|
print <<"EOF" if ($disabled{threads} eq "unavailable");
|
1999-04-30 00:10:09 +08: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-27 05:25:01 +08:00
|
|
|
See file INSTALL for details if you need multi-threading.
|
1999-04-24 06:13:45 +08:00
|
|
|
EOF
|
|
|
|
|
2015-05-18 08:46:21 +08:00
|
|
|
print <<"EOF" if ($no_shared_warn);
|
2003-01-11 19:40:39 +08:00
|
|
|
|
2016-02-22 09:09:11 +08:00
|
|
|
The options 'shared', 'pic' and 'dynamic-engine' aren't supported on this
|
|
|
|
platform, so we will pretend you gave the option 'no-pic', which also disables
|
|
|
|
'shared' and 'dynamic-engine'. If you know how to implement shared libraries
|
|
|
|
or position independent code, please let us know (but please first make sure
|
|
|
|
you have tried with a current version of OpenSSL).
|
2015-12-11 01:31:01 +08:00
|
|
|
EOF
|
|
|
|
|
2018-02-02 19:30:50 +08:00
|
|
|
print <<"EOF";
|
|
|
|
|
|
|
|
**********************************************************************
|
|
|
|
*** ***
|
2018-10-26 05:31:24 +08:00
|
|
|
*** OpenSSL has been successfully configured ***
|
2018-02-02 19:30:50 +08:00
|
|
|
*** ***
|
2018-10-26 05:31:24 +08:00
|
|
|
*** If you encounter a problem while building, please open an ***
|
|
|
|
*** issue on GitHub <https://github.com/openssl/openssl/issues> ***
|
|
|
|
*** and include the output from the following command: ***
|
|
|
|
*** ***
|
|
|
|
*** perl configdata.pm --dump ***
|
|
|
|
*** ***
|
|
|
|
*** (If you are new to OpenSSL, you might want to consult the ***
|
|
|
|
*** 'Troubleshooting' section in the INSTALL file first) ***
|
2018-02-02 19:30:50 +08:00
|
|
|
*** ***
|
|
|
|
**********************************************************************
|
|
|
|
EOF
|
|
|
|
|
1998-12-21 18:52:47 +08:00
|
|
|
exit(0);
|
|
|
|
|
2015-05-18 08:57:24 +08:00
|
|
|
######################################################################
|
|
|
|
#
|
|
|
|
# Helpers and utility functions
|
|
|
|
#
|
|
|
|
|
2018-07-24 16:45:05 +08:00
|
|
|
# Death handler, to print a helpful message in case of failure #######
|
|
|
|
#
|
|
|
|
sub death_handler {
|
2018-07-25 03:46:55 +08:00
|
|
|
die @_ if $^S; # To prevent the added message in eval blocks
|
2018-07-24 16:45:05 +08:00
|
|
|
my $build_file = $target{build_file} // "build file";
|
2018-07-25 03:46:55 +08:00
|
|
|
my @message = ( <<"_____", @_ );
|
2018-07-24 16:45:05 +08:00
|
|
|
|
|
|
|
Failure! $build_file wasn't produced.
|
|
|
|
Please read INSTALL and associated NOTES files. You may also have to look over
|
|
|
|
your available compiler tool chain or change your configuration.
|
|
|
|
|
|
|
|
_____
|
2018-07-25 03:46:55 +08:00
|
|
|
|
|
|
|
# Dying is terminal, so it's ok to reset the signal handler here.
|
|
|
|
$SIG{__DIE__} = $orig_death_handler;
|
|
|
|
die @message;
|
2018-07-24 16:45:05 +08:00
|
|
|
}
|
|
|
|
|
2015-05-18 08:57:24 +08:00
|
|
|
# Configuration file reading #########################################
|
|
|
|
|
2016-03-17 16:09:31 +08:00
|
|
|
# Note: All of the helper functions are for lazy evaluation. They all
|
|
|
|
# return a CODE ref, which will return the intended value when evaluated.
|
|
|
|
# Thus, whenever there's mention of a returned value, it's about that
|
|
|
|
# intended value.
|
|
|
|
|
2015-05-18 08:57:24 +08:00
|
|
|
# Helper function to implement conditional inheritance depending on the
|
2016-02-22 21:10:45 +08:00
|
|
|
# value of $disabled{asm}. Used in inherit_from values as follows:
|
2015-05-18 08:57:24 +08:00
|
|
|
#
|
|
|
|
# inherit_from => [ "template", asm("asm_tmpl") ]
|
|
|
|
#
|
|
|
|
sub asm {
|
|
|
|
my @x = @_;
|
|
|
|
sub {
|
2016-02-22 21:10:45 +08:00
|
|
|
$disabled{asm} ? () : @x;
|
2015-05-18 08:57:24 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-03-17 16:09:31 +08:00
|
|
|
# Helper function to implement conditional value variants, with a default
|
|
|
|
# plus additional values based on the value of $config{build_type}.
|
|
|
|
# Arguments are given in hash table form:
|
|
|
|
#
|
|
|
|
# picker(default => "Basic string: ",
|
|
|
|
# debug => "debug",
|
|
|
|
# release => "release")
|
|
|
|
#
|
|
|
|
# When configuring with --debug, the resulting string will be
|
|
|
|
# "Basic string: debug", and when not, it will be "Basic string: release"
|
|
|
|
#
|
|
|
|
# This can be used to create variants of sets of flags according to the
|
|
|
|
# build type:
|
|
|
|
#
|
|
|
|
# cflags => picker(default => "-Wall",
|
|
|
|
# debug => "-g -O0",
|
|
|
|
# release => "-O3")
|
|
|
|
#
|
|
|
|
sub picker {
|
|
|
|
my %opts = @_;
|
|
|
|
return sub { add($opts{default} || (),
|
|
|
|
$opts{$config{build_type}} || ())->(); }
|
|
|
|
}
|
|
|
|
|
|
|
|
# Helper function to combine several values of different types into one.
|
|
|
|
# This is useful if you want to combine a string with the result of a
|
|
|
|
# lazy function, such as:
|
|
|
|
#
|
|
|
|
# cflags => combine("-Wall", sub { $disabled{zlib} ? () : "-DZLIB" })
|
|
|
|
#
|
|
|
|
sub combine {
|
|
|
|
my @stuff = @_;
|
|
|
|
return sub { add(@stuff)->(); }
|
|
|
|
}
|
|
|
|
|
|
|
|
# Helper function to implement conditional values depending on the value
|
|
|
|
# of $disabled{threads}. Can be used as follows:
|
|
|
|
#
|
|
|
|
# cflags => combine("-Wall", threads("-pthread"))
|
|
|
|
#
|
|
|
|
sub threads {
|
|
|
|
my @flags = @_;
|
|
|
|
return sub { add($disabled{threads} ? () : @flags)->(); }
|
|
|
|
}
|
|
|
|
|
2018-06-11 18:22:29 +08:00
|
|
|
sub shared {
|
|
|
|
my @flags = @_;
|
|
|
|
return sub { add($disabled{shared} ? () : @flags)->(); }
|
|
|
|
}
|
2016-03-17 16:09:31 +08:00
|
|
|
|
Configure - Get rid of the special thread_cflag, replace with thread_scheme
The thread_cflag setting filled a double role, as kinda sorta an
indicator of thread scheme, and as cflags. Some configs also added
lflags and ex_libs for multithreading regardless of if threading would
be enabled or not.
Instead of this, add threading cflags among in the cflag setting,
threading lflags in the lflag setting and so on if and only if threads
are enabled (which they are by default).
Also, for configs where there are no special cflags for threading (the
VMS configs are of that kind), this makes it possible to still clearly
mention what thread scheme is used.
The exact value of thread scheme is currently ignored except when it's
"(unknown)", and thereby only serves as a flag to tell if we know how
to build for multi-threading in a particular config. Yet, the
currently used values are "(unknown)", "pthreads", "uithreads" (a.k.a
solaris threads) and "winthreads".
Reviewed-by: Andy Polyakov <appro@openssl.org>
2016-02-27 23:51:34 +08:00
|
|
|
our $add_called = 0;
|
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 20:31:49 +08: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 09:17:05 +08: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 20:31:49 +08:00
|
|
|
|
|
|
|
my @values =
|
|
|
|
map {
|
2016-02-27 18:08:21 +08:00
|
|
|
my $res = $_;
|
|
|
|
while (ref($res) eq "CODE") {
|
|
|
|
$res = $res->();
|
|
|
|
}
|
|
|
|
if (defined($res)) {
|
|
|
|
if (ref($res) eq "ARRAY") {
|
|
|
|
$found_array = 1;
|
|
|
|
@$res;
|
|
|
|
} else {
|
|
|
|
$res;
|
|
|
|
}
|
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 20:31:49 +08:00
|
|
|
} else {
|
2016-02-27 18:08:21 +08: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 20:31:49 +08:00
|
|
|
}
|
|
|
|
} (@_);
|
|
|
|
|
Configure - Get rid of the special thread_cflag, replace with thread_scheme
The thread_cflag setting filled a double role, as kinda sorta an
indicator of thread scheme, and as cflags. Some configs also added
lflags and ex_libs for multithreading regardless of if threading would
be enabled or not.
Instead of this, add threading cflags among in the cflag setting,
threading lflags in the lflag setting and so on if and only if threads
are enabled (which they are by default).
Also, for configs where there are no special cflags for threading (the
VMS configs are of that kind), this makes it possible to still clearly
mention what thread scheme is used.
The exact value of thread scheme is currently ignored except when it's
"(unknown)", and thereby only serves as a flag to tell if we know how
to build for multi-threading in a particular config. Yet, the
currently used values are "(unknown)", "pthreads", "uithreads" (a.k.a
solaris threads) and "winthreads".
Reviewed-by: Andy Polyakov <appro@openssl.org>
2016-02-27 23:51:34 +08:00
|
|
|
$add_called = 1;
|
|
|
|
|
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 20:31:49 +08:00
|
|
|
if ($found_array) {
|
|
|
|
[ @values ];
|
|
|
|
} else {
|
2016-02-27 18:08:21 +08:00
|
|
|
join($separator, grep { defined($_) && $_ ne "" } @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 20:31:49 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
sub add_before {
|
2016-02-25 07:17:59 +08:00
|
|
|
my $separator = " ";
|
|
|
|
if (ref($_[$#_]) eq "HASH") {
|
|
|
|
my $opts = pop;
|
|
|
|
$separator = $opts->{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 20:31:49 +08:00
|
|
|
my @x = @_;
|
|
|
|
sub { _add($separator, @x, @_) };
|
|
|
|
}
|
|
|
|
sub add {
|
2016-02-25 07:17:59 +08:00
|
|
|
my $separator = " ";
|
|
|
|
if (ref($_[$#_]) eq "HASH") {
|
|
|
|
my $opts = pop;
|
|
|
|
$separator = $opts->{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 20:31:49 +08:00
|
|
|
my @x = @_;
|
|
|
|
sub { _add($separator, @_, @x) };
|
|
|
|
}
|
|
|
|
|
2017-12-01 22:29:05 +08:00
|
|
|
sub read_eval_file {
|
|
|
|
my $fname = shift;
|
|
|
|
my $content;
|
|
|
|
my @result;
|
|
|
|
|
|
|
|
open F, "< $fname" or die "Can't open '$fname': $!\n";
|
|
|
|
{
|
|
|
|
undef local $/;
|
|
|
|
$content = <F>;
|
|
|
|
}
|
|
|
|
close F;
|
|
|
|
{
|
|
|
|
local $@;
|
|
|
|
|
|
|
|
@result = ( eval $content );
|
|
|
|
warn $@ if $@;
|
|
|
|
}
|
|
|
|
return wantarray ? @result : $result[0];
|
|
|
|
}
|
|
|
|
|
2015-05-18 08:57:24 +08: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;
|
2017-12-01 22:29:05 +08:00
|
|
|
my %targets;
|
|
|
|
|
2015-05-18 08:57:24 +08:00
|
|
|
{
|
2016-09-15 04:21:41 +08:00
|
|
|
# Protect certain tables from tampering
|
2017-12-01 22:29:05 +08:00
|
|
|
local %table = ();
|
2015-05-18 08:57:24 +08:00
|
|
|
|
2017-12-01 22:29:05 +08:00
|
|
|
%targets = read_eval_file($fname);
|
2015-05-18 08:57:24 +08:00
|
|
|
}
|
2018-01-10 02:51:19 +08:00
|
|
|
my %preexisting = ();
|
|
|
|
foreach (sort keys %targets) {
|
|
|
|
$preexisting{$_} = 1 if $table{$_};
|
|
|
|
}
|
|
|
|
die <<"EOF",
|
|
|
|
The following config targets from $fname
|
|
|
|
shadow pre-existing config targets with the same name:
|
|
|
|
EOF
|
|
|
|
map { " $_\n" } sort keys %preexisting
|
|
|
|
if %preexisting;
|
|
|
|
|
2015-05-18 08:57:24 +08:00
|
|
|
|
|
|
|
# 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{$_};
|
2016-09-15 04:21:41 +08:00
|
|
|
} else {
|
|
|
|
$targets{$_}->{_conf_fname_int} = add([ $fname ]);
|
|
|
|
}
|
2015-05-18 08:57:24 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
%table = (%table, %targets);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2016-03-11 04:34:48 +08:00
|
|
|
# configuration resolver. Will only resolve all the lazy evaluation
|
|
|
|
# codeblocks for the chosen target and all those it inherits from,
|
2015-05-18 08:57:24 +08:00
|
|
|
# recursively
|
|
|
|
sub resolve_config {
|
|
|
|
my $target = shift;
|
|
|
|
my @breadcrumbs = @_;
|
|
|
|
|
2016-03-10 00:18:07 +08:00
|
|
|
# my $extra_checks = defined($ENV{CONFIGURE_EXTRA_CHECKS});
|
Configure - Get rid of the special thread_cflag, replace with thread_scheme
The thread_cflag setting filled a double role, as kinda sorta an
indicator of thread scheme, and as cflags. Some configs also added
lflags and ex_libs for multithreading regardless of if threading would
be enabled or not.
Instead of this, add threading cflags among in the cflag setting,
threading lflags in the lflag setting and so on if and only if threads
are enabled (which they are by default).
Also, for configs where there are no special cflags for threading (the
VMS configs are of that kind), this makes it possible to still clearly
mention what thread scheme is used.
The exact value of thread scheme is currently ignored except when it's
"(unknown)", and thereby only serves as a flag to tell if we know how
to build for multi-threading in a particular config. Yet, the
currently used values are "(unknown)", "pthreads", "uithreads" (a.k.a
solaris threads) and "winthreads".
Reviewed-by: Andy Polyakov <appro@openssl.org>
2016-02-27 23:51:34 +08:00
|
|
|
|
2015-05-18 08:57:24 +08:00
|
|
|
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};
|
|
|
|
|
2016-04-06 21:02:57 +08:00
|
|
|
foreach (keys %inherited_config) {
|
2015-05-18 08:57:24 +08:00
|
|
|
if (!$combined_inheritance{$_}) {
|
|
|
|
$combined_inheritance{$_} = [];
|
|
|
|
}
|
|
|
|
push @{$combined_inheritance{$_}}, $inherited_config{$_};
|
2016-04-06 21:02:57 +08:00
|
|
|
}
|
2015-05-18 08:57:24 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
# 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
|
2016-03-11 04:34:48 +08:00
|
|
|
# empty string, the inherited value list will be run through the
|
2015-05-18 08:57:24 +08:00
|
|
|
# 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.
|
2016-02-26 19:25:13 +08:00
|
|
|
my $default_combiner = add();
|
2015-05-18 08:57:24 +08:00
|
|
|
|
|
|
|
my %all_keys =
|
|
|
|
map { $_ => 1 } (keys %combined_inheritance,
|
|
|
|
keys %{$table{$target}});
|
2016-02-27 18:08:21 +08:00
|
|
|
|
|
|
|
sub process_values {
|
|
|
|
my $object = shift;
|
|
|
|
my $inherited = shift; # Always a [ list ]
|
|
|
|
my $target = shift;
|
|
|
|
my $entry = shift;
|
|
|
|
|
Configure - Get rid of the special thread_cflag, replace with thread_scheme
The thread_cflag setting filled a double role, as kinda sorta an
indicator of thread scheme, and as cflags. Some configs also added
lflags and ex_libs for multithreading regardless of if threading would
be enabled or not.
Instead of this, add threading cflags among in the cflag setting,
threading lflags in the lflag setting and so on if and only if threads
are enabled (which they are by default).
Also, for configs where there are no special cflags for threading (the
VMS configs are of that kind), this makes it possible to still clearly
mention what thread scheme is used.
The exact value of thread scheme is currently ignored except when it's
"(unknown)", and thereby only serves as a flag to tell if we know how
to build for multi-threading in a particular config. Yet, the
currently used values are "(unknown)", "pthreads", "uithreads" (a.k.a
solaris threads) and "winthreads".
Reviewed-by: Andy Polyakov <appro@openssl.org>
2016-02-27 23:51:34 +08:00
|
|
|
$add_called = 0;
|
|
|
|
|
2016-02-27 18:08:21 +08:00
|
|
|
while(ref($object) eq "CODE") {
|
|
|
|
$object = $object->(@$inherited);
|
|
|
|
}
|
|
|
|
if (!defined($object)) {
|
|
|
|
return ();
|
|
|
|
}
|
|
|
|
elsif (ref($object) eq "ARRAY") {
|
Configure - Get rid of the special thread_cflag, replace with thread_scheme
The thread_cflag setting filled a double role, as kinda sorta an
indicator of thread scheme, and as cflags. Some configs also added
lflags and ex_libs for multithreading regardless of if threading would
be enabled or not.
Instead of this, add threading cflags among in the cflag setting,
threading lflags in the lflag setting and so on if and only if threads
are enabled (which they are by default).
Also, for configs where there are no special cflags for threading (the
VMS configs are of that kind), this makes it possible to still clearly
mention what thread scheme is used.
The exact value of thread scheme is currently ignored except when it's
"(unknown)", and thereby only serves as a flag to tell if we know how
to build for multi-threading in a particular config. Yet, the
currently used values are "(unknown)", "pthreads", "uithreads" (a.k.a
solaris threads) and "winthreads".
Reviewed-by: Andy Polyakov <appro@openssl.org>
2016-02-27 23:51:34 +08:00
|
|
|
local $add_called; # To make sure recursive calls don't affect it
|
2016-02-27 18:08:21 +08:00
|
|
|
return [ map { process_values($_, $inherited, $target, $entry) }
|
|
|
|
@$object ];
|
|
|
|
} elsif (ref($object) eq "") {
|
|
|
|
return $object;
|
|
|
|
} else {
|
|
|
|
die "cannot handle reference type ",ref($object)
|
|
|
|
," found in target ",$target," -> ",$entry,"\n";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-05-18 08:57:24 +08:00
|
|
|
foreach (sort keys %all_keys) {
|
Configure - Get rid of the special thread_cflag, replace with thread_scheme
The thread_cflag setting filled a double role, as kinda sorta an
indicator of thread scheme, and as cflags. Some configs also added
lflags and ex_libs for multithreading regardless of if threading would
be enabled or not.
Instead of this, add threading cflags among in the cflag setting,
threading lflags in the lflag setting and so on if and only if threads
are enabled (which they are by default).
Also, for configs where there are no special cflags for threading (the
VMS configs are of that kind), this makes it possible to still clearly
mention what thread scheme is used.
The exact value of thread scheme is currently ignored except when it's
"(unknown)", and thereby only serves as a flag to tell if we know how
to build for multi-threading in a particular config. Yet, the
currently used values are "(unknown)", "pthreads", "uithreads" (a.k.a
solaris threads) and "winthreads".
Reviewed-by: Andy Polyakov <appro@openssl.org>
2016-02-27 23:51:34 +08:00
|
|
|
my $previous = $combined_inheritance{$_};
|
2015-05-18 08:57:24 +08:00
|
|
|
|
|
|
|
# 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;
|
|
|
|
}
|
|
|
|
|
2016-02-27 18:08:21 +08:00
|
|
|
$table{$target}->{$_} = process_values($table{$target}->{$_},
|
|
|
|
$combined_inheritance{$_},
|
|
|
|
$target, $_);
|
|
|
|
unless(defined($table{$target}->{$_})) {
|
|
|
|
delete $table{$target}->{$_};
|
|
|
|
}
|
2016-03-10 00:18:07 +08:00
|
|
|
# if ($extra_checks &&
|
|
|
|
# $previous && !($add_called || $previous ~~ $table{$target}->{$_})) {
|
|
|
|
# warn "$_ got replaced in $target\n";
|
|
|
|
# }
|
2015-05-18 08:57:24 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
# Finally done, return the result.
|
|
|
|
return %{$table{$target}};
|
|
|
|
}
|
|
|
|
|
1999-04-25 06:59:36 +08:00
|
|
|
sub usage
|
1998-12-21 18:52:47 +08:00
|
|
|
{
|
1999-04-25 06:59:36 +08:00
|
|
|
print STDERR $usage;
|
2000-02-21 08:55:45 +08:00
|
|
|
print STDERR "\npick os/compiler from:\n";
|
1998-12-29 01:08:48 +08:00
|
|
|
my $j=0;
|
1999-02-08 02:22:15 +08:00
|
|
|
my $i;
|
2000-02-21 08:55:45 +08:00
|
|
|
my $k=0;
|
1999-02-08 02:22:15 +08:00
|
|
|
foreach $i (sort keys %table)
|
1998-12-21 18:52:47 +08:00
|
|
|
{
|
2015-05-18 08:57:24 +08:00
|
|
|
next if $table{$i}->{template};
|
1999-04-25 06:59:36 +08:00
|
|
|
next if $i =~ /^debug/;
|
2000-02-21 08:55:45 +08:00
|
|
|
$k += length($i) + 1;
|
|
|
|
if ($k > 78)
|
|
|
|
{
|
|
|
|
print STDERR "\n";
|
|
|
|
$k=length($i);
|
|
|
|
}
|
|
|
|
print STDERR $i . " ";
|
1999-04-25 06:59:36 +08:00
|
|
|
}
|
|
|
|
foreach $i (sort keys %table)
|
|
|
|
{
|
2015-05-18 08:57:24 +08:00
|
|
|
next if $table{$i}->{template};
|
1999-04-25 06:59:36 +08:00
|
|
|
next if $i !~ /^debug/;
|
2000-02-21 08:55:45 +08:00
|
|
|
$k += length($i) + 1;
|
|
|
|
if ($k > 78)
|
|
|
|
{
|
|
|
|
print STDERR "\n";
|
|
|
|
$k=length($i);
|
|
|
|
}
|
|
|
|
print STDERR $i . " ";
|
1998-12-21 18:52:47 +08:00
|
|
|
}
|
2000-02-21 08:55:45 +08:00
|
|
|
print STDERR "\n\nNOTE: If in doubt, on Unix-ish systems use './config'.\n";
|
1999-04-25 06:59:36 +08:00
|
|
|
exit(1);
|
1998-12-21 18:52:47 +08:00
|
|
|
}
|
|
|
|
|
2016-03-14 17:02:13 +08:00
|
|
|
sub run_dofile
|
2015-05-21 02:03:20 +08:00
|
|
|
{
|
|
|
|
my $out = shift;
|
2016-01-30 02:45:51 +08:00
|
|
|
my @templates = @_;
|
2015-05-21 02:03:20 +08:00
|
|
|
|
2016-01-30 02:29:45 +08:00
|
|
|
unlink $out || warn "Can't remove $out, $!"
|
|
|
|
if -f $out;
|
2016-01-30 02:45:51 +08:00
|
|
|
foreach (@templates) {
|
|
|
|
die "Can't open $_, $!" unless -f $_;
|
|
|
|
}
|
2018-07-08 18:00:06 +08:00
|
|
|
my $perlcmd = (quotify("maybeshell", $config{PERL}))[0];
|
2016-08-31 00:41:00 +08:00
|
|
|
my $cmd = "$perlcmd \"-I.\" \"-Mconfigdata\" \"$dofile\" -o\"Configure\" \"".join("\" \"",@templates)."\" > \"$out.new\"";
|
2016-01-30 02:45:51 +08:00
|
|
|
#print STDERR "DEBUG[run_dofile]: \$cmd = $cmd\n";
|
|
|
|
system($cmd);
|
2015-05-21 02:03:20 +08:00
|
|
|
exit 1 if $? != 0;
|
|
|
|
rename("$out.new", $out) || die "Can't rename $out.new, $!";
|
|
|
|
}
|
|
|
|
|
2017-11-07 00:11:03 +08:00
|
|
|
sub compiler_predefined {
|
|
|
|
state %predefined;
|
2018-05-04 20:25:45 +08:00
|
|
|
my $cc = shift;
|
2017-11-07 00:11:03 +08:00
|
|
|
|
|
|
|
return () if $^O eq 'VMS';
|
|
|
|
|
2018-05-04 20:25:45 +08:00
|
|
|
die 'compiler_predefined called without a compiler command'
|
|
|
|
unless $cc;
|
2017-11-07 00:11:03 +08:00
|
|
|
|
2018-05-04 20:25:45 +08:00
|
|
|
if (! $predefined{$cc}) {
|
2017-11-07 00:11:03 +08:00
|
|
|
|
2018-05-04 20:25:45 +08:00
|
|
|
$predefined{$cc} = {};
|
2017-11-07 00:11:03 +08:00
|
|
|
|
|
|
|
# collect compiler pre-defines from gcc or gcc-alike...
|
|
|
|
open(PIPE, "$cc -dM -E -x c /dev/null 2>&1 |");
|
|
|
|
while (my $l = <PIPE>) {
|
|
|
|
$l =~ m/^#define\s+(\w+(?:\(\w+\))?)(?:\s+(.+))?/ or last;
|
2018-05-04 20:25:45 +08:00
|
|
|
$predefined{$cc}->{$1} = $2 // '';
|
2017-11-07 00:11:03 +08:00
|
|
|
}
|
|
|
|
close(PIPE);
|
|
|
|
}
|
|
|
|
|
2018-05-04 20:25:45 +08:00
|
|
|
return %{$predefined{$cc}};
|
2017-11-07 00:11:03 +08:00
|
|
|
}
|
|
|
|
|
2016-05-21 03:31:11 +08:00
|
|
|
sub which
|
|
|
|
{
|
|
|
|
my ($name)=@_;
|
|
|
|
|
|
|
|
if (eval { require IPC::Cmd; 1; }) {
|
|
|
|
IPC::Cmd->import();
|
|
|
|
return scalar IPC::Cmd::can_run($name);
|
|
|
|
} else {
|
|
|
|
# if there is $directories component in splitpath,
|
|
|
|
# then it's not something to test with $PATH...
|
|
|
|
return $name if (File::Spec->splitpath($name))[1];
|
|
|
|
|
|
|
|
foreach (File::Spec->path()) {
|
|
|
|
my $fullpath = catfile($_, "$name$target{exe_extension}");
|
|
|
|
if (-f $fullpath and -x $fullpath) {
|
|
|
|
return $fullpath;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-11-29 20:09:01 +08:00
|
|
|
sub env
|
|
|
|
{
|
|
|
|
my $name = shift;
|
Configure: Don't fail if there were "make variables" set in env
The original intent was that if someone had a "make variable" set in
any kind of way, be it as an environment variable or as an argument to
Configure, we wouldn't allow compiler or linker flags as arguments as
well. That made both of these configurations equivalently impossible:
./Configure target CFLAGS=-foo -lextra
CFLAGS=-foo ./Configure target -lextra
While this makes things look nice and consistent, real world use makes
this hard, as many projects where OpenSSL is a component also set
these variables for other components that use GNU autotools.
Therefore, we need to adapt our Configure accordingly. By
consequence, the two Configure lines above will not be equivalent any
more:
./Configure target CFLAGS=-foo -lextra
This command line will still fail, because the "make variable" was
given as a command line argument. This cannot be a mistake and is
therefore not allowed.
CFLAGS=-foo ./Configure target -lextra
This command line will work, but because there is a linker flag as
a command line argument, the environment (i.e. CFLAGS) is ignored.
That isn't quite consistent with the previous command, but is the old
Configure behavior, before the support for "make variables" was added,
and is therefore the backward compatible behavior.
Fixes google/oss-fuzz#1244
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5641)
2018-03-16 15:24:50 +08:00
|
|
|
my %opts = @_;
|
2017-11-29 20:09:01 +08:00
|
|
|
|
Configure: Don't fail if there were "make variables" set in env
The original intent was that if someone had a "make variable" set in
any kind of way, be it as an environment variable or as an argument to
Configure, we wouldn't allow compiler or linker flags as arguments as
well. That made both of these configurations equivalently impossible:
./Configure target CFLAGS=-foo -lextra
CFLAGS=-foo ./Configure target -lextra
While this makes things look nice and consistent, real world use makes
this hard, as many projects where OpenSSL is a component also set
these variables for other components that use GNU autotools.
Therefore, we need to adapt our Configure accordingly. By
consequence, the two Configure lines above will not be equivalent any
more:
./Configure target CFLAGS=-foo -lextra
This command line will still fail, because the "make variable" was
given as a command line argument. This cannot be a mistake and is
therefore not allowed.
CFLAGS=-foo ./Configure target -lextra
This command line will work, but because there is a linker flag as
a command line argument, the environment (i.e. CFLAGS) is ignored.
That isn't quite consistent with the previous command, but is the old
Configure behavior, before the support for "make variables" was added,
and is therefore the backward compatible behavior.
Fixes google/oss-fuzz#1244
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5641)
2018-03-16 15:24:50 +08:00
|
|
|
unless ($opts{cacheonly}) {
|
|
|
|
# Note that if $ENV{$name} doesn't exist or is undefined,
|
|
|
|
# $config{perlenv}->{$name} will be created with the value
|
|
|
|
# undef. This is intentional.
|
2017-11-29 20:16:53 +08:00
|
|
|
|
Configure: Don't fail if there were "make variables" set in env
The original intent was that if someone had a "make variable" set in
any kind of way, be it as an environment variable or as an argument to
Configure, we wouldn't allow compiler or linker flags as arguments as
well. That made both of these configurations equivalently impossible:
./Configure target CFLAGS=-foo -lextra
CFLAGS=-foo ./Configure target -lextra
While this makes things look nice and consistent, real world use makes
this hard, as many projects where OpenSSL is a component also set
these variables for other components that use GNU autotools.
Therefore, we need to adapt our Configure accordingly. By
consequence, the two Configure lines above will not be equivalent any
more:
./Configure target CFLAGS=-foo -lextra
This command line will still fail, because the "make variable" was
given as a command line argument. This cannot be a mistake and is
therefore not allowed.
CFLAGS=-foo ./Configure target -lextra
This command line will work, but because there is a linker flag as
a command line argument, the environment (i.e. CFLAGS) is ignored.
That isn't quite consistent with the previous command, but is the old
Configure behavior, before the support for "make variables" was added,
and is therefore the backward compatible behavior.
Fixes google/oss-fuzz#1244
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5641)
2018-03-16 15:24:50 +08:00
|
|
|
$config{perlenv}->{$name} = $ENV{$name}
|
|
|
|
if ! exists $config{perlenv}->{$name};
|
|
|
|
}
|
2017-11-29 20:09:01 +08:00
|
|
|
return $config{perlenv}->{$name};
|
|
|
|
}
|
|
|
|
|
2015-05-18 18:53:38 +08:00
|
|
|
# Configuration printer ##############################################
|
|
|
|
|
|
|
|
sub print_table_entry
|
|
|
|
{
|
2018-03-26 18:35:57 +08:00
|
|
|
local $now_printing = shift;
|
|
|
|
my %target = resolve_config($now_printing);
|
2015-05-18 18:53:38 +08:00
|
|
|
my $type = shift;
|
|
|
|
|
|
|
|
# Don't print the templates
|
|
|
|
return if $target{template};
|
|
|
|
|
|
|
|
my @sequence = (
|
2016-01-26 04:51:22 +08:00
|
|
|
"sys_id",
|
2018-01-23 20:54:55 +08:00
|
|
|
"cpp",
|
|
|
|
"cppflags",
|
|
|
|
"defines",
|
|
|
|
"includes",
|
2015-05-18 18:53:38 +08:00
|
|
|
"cc",
|
|
|
|
"cflags",
|
2016-01-26 04:51:22 +08:00
|
|
|
"unistd",
|
|
|
|
"ld",
|
2015-05-18 18:53:38 +08:00
|
|
|
"lflags",
|
2016-09-01 01:47:08 +08:00
|
|
|
"loutflag",
|
2016-01-30 01:07:37 +08:00
|
|
|
"ex_libs",
|
2015-05-18 18:53:38 +08:00
|
|
|
"bn_ops",
|
2016-09-01 01:47:08 +08:00
|
|
|
"apps_aux_src",
|
|
|
|
"cpuid_asm_src",
|
|
|
|
"uplink_aux_src",
|
|
|
|
"bn_asm_src",
|
|
|
|
"ec_asm_src",
|
|
|
|
"des_asm_src",
|
|
|
|
"aes_asm_src",
|
|
|
|
"bf_asm_src",
|
|
|
|
"md5_asm_src",
|
|
|
|
"cast_asm_src",
|
|
|
|
"sha1_asm_src",
|
|
|
|
"rc4_asm_src",
|
|
|
|
"rmd160_asm_src",
|
|
|
|
"rc5_asm_src",
|
|
|
|
"wp_asm_src",
|
|
|
|
"cmll_asm_src",
|
|
|
|
"modes_asm_src",
|
|
|
|
"padlock_asm_src",
|
|
|
|
"chacha_asm_src",
|
|
|
|
"poly1035_asm_src",
|
Configure - Get rid of the special thread_cflag, replace with thread_scheme
The thread_cflag setting filled a double role, as kinda sorta an
indicator of thread scheme, and as cflags. Some configs also added
lflags and ex_libs for multithreading regardless of if threading would
be enabled or not.
Instead of this, add threading cflags among in the cflag setting,
threading lflags in the lflag setting and so on if and only if threads
are enabled (which they are by default).
Also, for configs where there are no special cflags for threading (the
VMS configs are of that kind), this makes it possible to still clearly
mention what thread scheme is used.
The exact value of thread scheme is currently ignored except when it's
"(unknown)", and thereby only serves as a flag to tell if we know how
to build for multi-threading in a particular config. Yet, the
currently used values are "(unknown)", "pthreads", "uithreads" (a.k.a
solaris threads) and "winthreads".
Reviewed-by: Andy Polyakov <appro@openssl.org>
2016-02-27 23:51:34 +08:00
|
|
|
"thread_scheme",
|
2015-05-18 18:53:38 +08:00
|
|
|
"perlasm_scheme",
|
|
|
|
"dso_scheme",
|
|
|
|
"shared_target",
|
|
|
|
"shared_cflag",
|
2016-09-01 01:47:08 +08:00
|
|
|
"shared_defines",
|
2015-05-18 18:53:38 +08:00
|
|
|
"shared_ldflag",
|
2016-02-05 22:17:33 +08:00
|
|
|
"shared_rcflag",
|
2015-05-18 18:53:38 +08:00
|
|
|
"shared_extension",
|
2016-02-16 00:20:15 +08:00
|
|
|
"dso_extension",
|
2016-01-26 04:51:22 +08:00
|
|
|
"obj_extension",
|
|
|
|
"exe_extension",
|
2015-05-18 18:53:38 +08:00
|
|
|
"ranlib",
|
2016-01-26 04:51:22 +08:00
|
|
|
"ar",
|
2015-05-18 18:53:38 +08:00
|
|
|
"arflags",
|
2016-09-01 01:47:08 +08:00
|
|
|
"aroutflag",
|
|
|
|
"rc",
|
|
|
|
"rcflags",
|
|
|
|
"rcoutflag",
|
|
|
|
"mt",
|
|
|
|
"mtflags",
|
|
|
|
"mtinflag",
|
|
|
|
"mtoutflag",
|
2015-05-18 18:53:38 +08:00
|
|
|
"multilib",
|
2016-01-26 04:51:22 +08:00
|
|
|
"build_scheme",
|
2015-05-18 18:53:38 +08:00
|
|
|
);
|
|
|
|
|
|
|
|
if ($type eq "TABLE") {
|
|
|
|
print "\n";
|
2018-03-26 18:35:57 +08:00
|
|
|
print "*** $now_printing\n";
|
2016-02-24 08:32:51 +08:00
|
|
|
foreach (@sequence) {
|
|
|
|
if (ref($target{$_}) eq "ARRAY") {
|
|
|
|
printf "\$%-12s = %s\n", $_, join(" ", @{$target{$_}});
|
|
|
|
} else {
|
|
|
|
printf "\$%-12s = %s\n", $_, $target{$_};
|
|
|
|
}
|
|
|
|
}
|
2015-05-18 18:53:38 +08:00
|
|
|
} elsif ($type eq "HASH") {
|
|
|
|
my $largest =
|
|
|
|
length((sort { length($a) <=> length($b) } @sequence)[-1]);
|
2018-03-26 18:35:57 +08:00
|
|
|
print " '$now_printing' => {\n";
|
2015-05-18 18:53:38 +08:00
|
|
|
foreach (@sequence) {
|
|
|
|
if ($target{$_}) {
|
2016-02-24 08:32:51 +08:00
|
|
|
if (ref($target{$_}) eq "ARRAY") {
|
|
|
|
print " '",$_,"'"," " x ($largest - length($_))," => [ ",join(", ", map { "'$_'" } @{$target{$_}})," ],\n";
|
|
|
|
} else {
|
|
|
|
print " '",$_,"'"," " x ($largest - length($_))," => '",$target{$_},"',\n";
|
|
|
|
}
|
2015-05-18 18:53:38 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
print " },\n";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
# Utility routines ###################################################
|
|
|
|
|
2016-02-10 09:00:37 +08: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";
|
|
|
|
|
2017-03-29 05:57:28 +08:00
|
|
|
# If the file spec includes a device or a directory spec,
|
2016-02-10 09:00:37 +08:00
|
|
|
# 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 17:15:13 +08: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);
|
|
|
|
}
|
|
|
|
|
2015-05-18 09:33:55 +08:00
|
|
|
sub quotify {
|
|
|
|
my %processors = (
|
|
|
|
perl => sub { my $x = shift;
|
|
|
|
$x =~ s/([\\\$\@"])/\\$1/g;
|
|
|
|
return '"'.$x.'"'; },
|
2016-08-31 00:41:00 +08:00
|
|
|
maybeshell => sub { my $x = shift;
|
|
|
|
(my $y = $x) =~ s/([\\\"])/\\$1/g;
|
|
|
|
if ($x ne $y || $x =~ m|\s|) {
|
|
|
|
return '"'.$y.'"';
|
|
|
|
} else {
|
|
|
|
return $x;
|
|
|
|
}
|
|
|
|
},
|
2015-05-18 09:33:55 +08:00
|
|
|
);
|
|
|
|
my $for = shift;
|
|
|
|
my $processor =
|
|
|
|
defined($processors{$for}) ? $processors{$for} : sub { shift; };
|
|
|
|
|
2016-04-06 21:02:57 +08:00
|
|
|
return map { $processor->($_); } @_;
|
2015-05-18 09:33:55 +08:00
|
|
|
}
|
2015-05-21 02:03:20 +08:00
|
|
|
|
2016-01-30 02:45:51 +08: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 19:10:27 +08:00
|
|
|
s|\R$||;
|
2016-01-30 02:45:51 +08: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 19:10:27 +08:00
|
|
|
s|\R$||;
|
2016-01-30 02:45:51 +08: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-21 02:03:20 +08: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-30 02:45:51 +08:00
|
|
|
my $lineiterator = shift;
|
2015-05-21 02:03:20 +08:00
|
|
|
my %collectors = @_;
|
|
|
|
|
2016-01-30 02:45:51 +08:00
|
|
|
while(defined($_ = $lineiterator->())) {
|
2016-02-12 19:10:27 +08:00
|
|
|
s|\R$||;
|
2016-01-30 02:45:51 +08:00
|
|
|
my $found = 0;
|
2016-03-10 07:04:04 +08:00
|
|
|
if ($collectors{"BEFORE"}) {
|
|
|
|
$collectors{"BEFORE"}->($_);
|
|
|
|
}
|
2016-01-30 02:45:51 +08:00
|
|
|
foreach my $re (keys %collectors) {
|
2016-03-10 07:04:04 +08:00
|
|
|
if ($re !~ /^OTHERWISE|BEFORE|AFTER$/ && /$re/) {
|
2016-01-30 02:45:51 +08:00
|
|
|
$collectors{$re}->($lineiterator);
|
|
|
|
$found = 1;
|
|
|
|
};
|
|
|
|
}
|
|
|
|
if ($collectors{"OTHERWISE"}) {
|
|
|
|
$collectors{"OTHERWISE"}->($lineiterator, $_)
|
|
|
|
unless $found || !defined $collectors{"OTHERWISE"};
|
|
|
|
}
|
2016-03-10 07:04:04 +08:00
|
|
|
if ($collectors{"AFTER"}) {
|
|
|
|
$collectors{"AFTER"}->($_);
|
|
|
|
}
|
2015-05-21 02:03:20 +08:00
|
|
|
}
|
|
|
|
}
|
2016-05-24 23:39:52 +08:00
|
|
|
|
|
|
|
# tokenize($line)
|
|
|
|
# $line is a line of text to split up into tokens
|
|
|
|
# returns a list of tokens
|
|
|
|
#
|
|
|
|
# Tokens are divided by spaces. If the tokens include spaces, they
|
|
|
|
# have to be quoted with single or double quotes. Double quotes
|
|
|
|
# inside a double quoted token must be escaped. Escaping is done
|
|
|
|
# with backslash.
|
|
|
|
# Basically, the same quoting rules apply for " and ' as in any
|
|
|
|
# Unix shell.
|
|
|
|
sub tokenize {
|
|
|
|
my $line = my $debug_line = shift;
|
|
|
|
my @result = ();
|
|
|
|
|
|
|
|
while ($line =~ s|^\s+||, $line ne "") {
|
|
|
|
my $token = "";
|
|
|
|
while ($line ne "" && $line !~ m|^\s|) {
|
|
|
|
if ($line =~ m/^"((?:[^"\\]+|\\.)*)"/) {
|
|
|
|
$token .= $1;
|
|
|
|
$line = $';
|
|
|
|
} elsif ($line =~ m/^'([^']*)'/) {
|
|
|
|
$token .= $1;
|
|
|
|
$line = $';
|
|
|
|
} elsif ($line =~ m/^(\S+)/) {
|
|
|
|
$token .= $1;
|
|
|
|
$line = $';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
push @result, $token;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ($ENV{CONFIGURE_DEBUG_TOKENIZE}) {
|
|
|
|
print STDERR "DEBUG[tokenize]: Parsed '$debug_line' into:\n";
|
|
|
|
print STDERR "DEBUG[tokenize]: ('", join("', '", @result), "')\n";
|
|
|
|
}
|
|
|
|
return @result;
|
|
|
|
}
|