2015-11-24 13:06:45 +00:00
|
|
|
#! /usr/bin/env perl
|
2015-11-24 05:44:58 +00:00
|
|
|
# -*- mode: perl; -*-
|
2015-11-24 13:06:45 +00:00
|
|
|
|
1999-02-25 08:48:52 +00:00
|
|
|
##
|
|
|
|
## Configure -- OpenSSL source tree configuration script
|
2014-09-25 17:18:22 +00:00
|
|
|
## If editing this file, run this command before committing
|
2016-01-12 21:25:30 +00:00
|
|
|
## make -f Makefile.in TABLE
|
1999-02-25 08:48:52 +00:00
|
|
|
##
|
1998-12-28 17:08:48 +00:00
|
|
|
|
1998-12-28 17:37:17 +00:00
|
|
|
require 5.000;
|
1998-12-28 17:08:48 +00:00
|
|
|
use strict;
|
2015-02-24 22:40:22 +00:00
|
|
|
use File::Basename;
|
|
|
|
use File::Spec::Functions;
|
1998-12-28 17:08:48 +00:00
|
|
|
|
1999-04-19 13:54:11 +00:00
|
|
|
# see INSTALL for instructions.
|
1999-04-24 22:59:36 +00:00
|
|
|
|
2016-01-21 00:23:43 +00:00
|
|
|
my $usage="Usage: Configure [no-<cipher> ...] [enable-<cipher> ...] [experimental-<cipher> ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [[no-]threads] [[no-]shared] [[no-]zlib|zlib-dynamic] [no-asm] [no-dso] [no-egd] [sctp] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx[=vvv]] [--config=FILE] os/compiler[:flags]\n";
|
1999-04-24 22:59:36 +00:00
|
|
|
|
1999-04-19 15:19:58 +00:00
|
|
|
# Options:
|
1999-04-29 21:52:08 +00:00
|
|
|
#
|
2015-02-24 22:40:22 +00:00
|
|
|
# --config add the given configuration file, which will be read after
|
|
|
|
# any "Configurations*" files that are found in the same
|
|
|
|
# directory as this script.
|
2016-01-20 17:11:51 +00:00
|
|
|
# --prefix prefix for the OpenSSL installation, which includes the
|
|
|
|
# directories bin, lib, include, share/man, share/doc/openssl
|
|
|
|
# This becomes the value of INSTALLTOP in Makefile
|
|
|
|
# (Default: /usr/local)
|
|
|
|
# --openssldir OpenSSL data area, such as openssl.cnf, certificates and keys.
|
|
|
|
# If it's a relative directory, it will be added on the directory
|
|
|
|
# given with --prefix.
|
|
|
|
# This becomes the value of OPENSSLDIR in Makefile and in C.
|
|
|
|
# (Default: PREFIX/ssl)
|
1999-04-29 21:52:08 +00:00
|
|
|
#
|
|
|
|
# --install_prefix Additional prefix for package builders (empty by
|
|
|
|
# default). This needn't be set in advance, you can
|
|
|
|
# just as well use "make INSTALL_PREFIX=/whatever install".
|
|
|
|
#
|
2006-10-21 13:38:16 +00:00
|
|
|
# --cross-compile-prefix Add specified prefix to binutils components.
|
|
|
|
#
|
2016-01-05 04:00:33 +00:00
|
|
|
# --api One of 0.9.8, 1.0.0 or 1.1.0. Do not compile support for
|
|
|
|
# interfaces deprecated as of the specified OpenSSL version.
|
|
|
|
#
|
2000-10-26 21:07:28 +00:00
|
|
|
# no-hw-xxx do not compile support for specific crypto hardware.
|
|
|
|
# Generic OpenSSL-style methods relating to this support
|
|
|
|
# are always compiled but return NULL if the hardware
|
|
|
|
# support isn't compiled.
|
|
|
|
# no-hw do not compile support for any crypto hardware.
|
1999-04-29 16:10:09 +00:00
|
|
|
# [no-]threads [don't] try to create a library that is suitable for
|
|
|
|
# multithreaded applications (default is "threads" if we
|
|
|
|
# know how to do it)
|
2000-08-02 04:19:50 +00:00
|
|
|
# [no-]shared [don't] try to create shared libraries when supported.
|
1999-04-19 14:55:56 +00:00
|
|
|
# no-asm do not use assembler
|
2000-04-06 07:09:45 +00:00
|
|
|
# no-dso do not compile in any native shared-library methods. This
|
|
|
|
# will ensure that all methods just return NULL.
|
2016-01-13 00:02:16 +00:00
|
|
|
# no-egd do not compile support for the entropy-gathering daemon APIs
|
2001-07-12 09:11:14 +00:00
|
|
|
# [no-]zlib [don't] compile support for zlib compression.
|
|
|
|
# zlib-dynamic Like "zlib", but the zlib library is expected to be a shared
|
|
|
|
# library and will be loaded in run-time by the OpenSSL library.
|
2011-12-25 14:45:15 +00:00
|
|
|
# sctp include SCTP support
|
1999-04-19 13:54:11 +00:00
|
|
|
# 386 generate 80386 code
|
2004-07-18 16:19:34 +00:00
|
|
|
# no-sse2 disables IA-32 SSE2 code, above option implies no-sse2
|
1999-04-27 03:19:12 +00:00
|
|
|
# no-<cipher> build without specified algorithm (rsa, idea, rc5, ...)
|
2014-05-26 16:19:28 +00:00
|
|
|
# -<xxx> +<xxx> compiler options are passed through
|
2000-06-01 05:13:52 +00:00
|
|
|
#
|
|
|
|
# DEBUG_SAFESTACK use type-safe stacks to enforce type-safety on stack items
|
|
|
|
# provided to stack calls. Generates unique stack functions for
|
|
|
|
# each possible stack type.
|
1998-12-21 10:52:47 +00:00
|
|
|
# DES_PTR use pointer lookup vs arrays in the DES in crypto/des/des_locl.h
|
|
|
|
# DES_RISC1 use different DES_ENCRYPT macro that helps reduce register
|
|
|
|
# dependancies but needs to more registers, good for RISC CPU's
|
|
|
|
# DES_RISC2 A different RISC variant.
|
|
|
|
# DES_UNROLL unroll the inner DES loop, sometimes helps, somtimes hinders.
|
|
|
|
# DES_INT use 'int' instead of 'long' for DES_LONG in crypto/des/des.h
|
|
|
|
# This is used on the DEC Alpha where long is 8 bytes
|
|
|
|
# and int is 4
|
|
|
|
# BN_LLONG use the type 'long long' in crypto/bn/bn.h
|
1998-12-21 10:56:39 +00:00
|
|
|
# MD2_CHAR use 'char' instead of 'int' for MD2_INT in crypto/md2/md2.h
|
|
|
|
# MD2_LONG use 'long' instead of 'int' for MD2_INT in crypto/md2/md2.h
|
1998-12-21 10:52:47 +00:00
|
|
|
# IDEA_SHORT use 'short' instead of 'int' for IDEA_INT in crypto/idea/idea.h
|
|
|
|
# IDEA_LONG use 'long' instead of 'int' for IDEA_INT in crypto/idea/idea.h
|
|
|
|
# RC2_SHORT use 'short' instead of 'int' for RC2_INT in crypto/rc2/rc2.h
|
|
|
|
# RC2_LONG use 'long' instead of 'int' for RC2_INT in crypto/rc2/rc2.h
|
|
|
|
# RC4_CHAR use 'char' instead of 'int' for RC4_INT in crypto/rc4/rc4.h
|
|
|
|
# RC4_LONG use 'long' instead of 'int' for RC4_INT in crypto/rc4/rc4.h
|
1998-12-21 10:56:39 +00:00
|
|
|
# RC4_INDEX define RC4_INDEX in crypto/rc4/rc4_locl.h. This turns on
|
1998-12-21 10:52:47 +00:00
|
|
|
# array lookups instead of pointer use.
|
1999-10-07 12:03:59 +00:00
|
|
|
# RC4_CHUNK enables code that handles data aligned at long (natural CPU
|
|
|
|
# word) boundary.
|
|
|
|
# RC4_CHUNK_LL enables code that handles data aligned at long long boundary
|
|
|
|
# (intended for 64-bit CPUs running 32-bit OS).
|
1998-12-21 10:52:47 +00:00
|
|
|
# BF_PTR use 'pointer arithmatic' for Blowfish (unsafe on Alpha).
|
1999-04-23 21:29:45 +00:00
|
|
|
# BF_PTR2 intel specific version (generic version is more efficient).
|
2004-07-18 16:19:34 +00:00
|
|
|
#
|
|
|
|
# Following are set automatically by this script
|
|
|
|
#
|
1998-12-21 10:56:39 +00:00
|
|
|
# MD5_ASM use some extra md5 assember,
|
|
|
|
# SHA1_ASM use some extra sha1 assember, must define L_ENDIAN for x86
|
|
|
|
# RMD160_ASM use some extra ripemd160 assember,
|
2004-07-18 16:19:34 +00:00
|
|
|
# SHA256_ASM sha256_block is implemented in assembler
|
|
|
|
# SHA512_ASM sha512_block is implemented in assembler
|
|
|
|
# AES_ASM ASE_[en|de]crypt is implemented in assembler
|
1998-12-21 10:52:47 +00:00
|
|
|
|
2009-01-11 15:56:32 +00:00
|
|
|
# Minimum warning options... any contributions to OpenSSL should at least get
|
2014-05-26 16:19:28 +00:00
|
|
|
# past these.
|
2009-01-11 15:56:32 +00:00
|
|
|
|
2016-01-10 19:42:10 +00:00
|
|
|
my $gcc_devteam_warn = "-Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Wtype-limits -Werror -DREF_CHECK -DDEBUG_UNUSED";
|
2009-01-11 15:56:32 +00:00
|
|
|
|
2015-04-19 13:10:54 +00:00
|
|
|
# These are used in addition to $gcc_devteam_warn when the compiler is clang.
|
|
|
|
# TODO(openssl-team): fix problems and investigate if (at least) the
|
2015-08-02 01:45:44 +00:00
|
|
|
# following warnings can also be enabled:
|
2015-04-19 13:10:54 +00:00
|
|
|
# -Wswitch-enum, -Wunused-macros, -Wmissing-field-initializers,
|
2015-09-05 12:32:58 +00:00
|
|
|
# -Wcast-align,
|
2015-04-19 13:10:54 +00:00
|
|
|
# -Wunreachable-code -Wunused-parameter -Wlanguage-extension-token
|
|
|
|
# -Wextended-offsetof
|
2015-09-05 12:32:58 +00:00
|
|
|
my $clang_devteam_warn = "-Wno-unused-parameter -Wno-missing-field-initializers -Wno-language-extension-token -Wno-extended-offsetof -Wconditional-uninitialized -Qunused-arguments -Wincompatible-pointer-types-discards-qualifiers -Wmissing-variable-declarations";
|
2015-01-05 12:46:26 +00:00
|
|
|
|
2015-12-10 17:31:01 +00:00
|
|
|
# Warn that "make depend" should be run?
|
|
|
|
my $warn_make_depend = 0;
|
|
|
|
|
2015-12-02 17:44:26 +00:00
|
|
|
# These are used in addition to $gcc_devteam_warn unless this is a mingw build.
|
|
|
|
# This adds backtrace information to the memory leak info.
|
|
|
|
my $memleak_devteam_backtrace = "-rdynamic -DCRYPTO_MDEBUG_BACKTRACE";
|
|
|
|
|
|
|
|
|
2009-09-09 16:31:32 +00:00
|
|
|
my $strict_warnings = 0;
|
|
|
|
|
1998-12-28 17:08:48 +00:00
|
|
|
my $x86_gcc_des="DES_PTR DES_RISC1 DES_UNROLL";
|
1998-12-21 10:52:47 +00:00
|
|
|
|
|
|
|
# MD2_CHAR slags pentium pros
|
1999-04-23 21:29:45 +00:00
|
|
|
my $x86_gcc_opts="RC4_INDEX MD2_INT";
|
1998-12-21 10:52:47 +00:00
|
|
|
|
2005-01-24 14:38:14 +00:00
|
|
|
# As for $BSDthreads. Idea is to maintain "collective" set of flags,
|
2014-05-26 16:19:28 +00:00
|
|
|
# which would cover all BSD flavors. -pthread applies to them all,
|
2005-01-24 14:38:14 +00:00
|
|
|
# but is treated differently. OpenBSD expands is as -D_POSIX_THREAD
|
|
|
|
# -lc_r, which is sufficient. FreeBSD 4.x expands it as -lc_r,
|
|
|
|
# which has to be accompanied by explicit -D_THREAD_SAFE and
|
|
|
|
# sometimes -D_REENTRANT. FreeBSD 5.x expands it as -lc_r, which
|
|
|
|
# seems to be sufficient?
|
|
|
|
my $BSDthreads="-pthread -D_THREAD_SAFE -D_REENTRANT";
|
1998-12-21 10:52:47 +00:00
|
|
|
|
2016-01-05 04:00:33 +00:00
|
|
|
#
|
|
|
|
# API compability name to version number mapping.
|
|
|
|
#
|
|
|
|
my $maxapi = "1.1.0"; # API for "no-deprecated" builds
|
|
|
|
my $apitable = {
|
|
|
|
"1.1.0" => "0x10100000L",
|
|
|
|
"1.0.0" => "0x10000000L",
|
|
|
|
"0.9.8" => "0x00908000L",
|
|
|
|
};
|
|
|
|
|
2015-05-18 00:54:28 +00:00
|
|
|
my $base_target = "BASE"; # The template that all other inherit from
|
|
|
|
our %table = ();
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
our %config = ();
|
2002-02-14 15:37:38 +00:00
|
|
|
|
2015-05-18 00:57:24 +00:00
|
|
|
# Forward declarations ###############################################
|
2015-03-16 21:33:36 +00:00
|
|
|
|
2015-05-18 00:57:24 +00:00
|
|
|
# read_config(filename)
|
|
|
|
#
|
|
|
|
# Reads a configuration file and populates %table with the contents
|
|
|
|
# (which the configuration file places in %targets).
|
|
|
|
sub read_config;
|
2015-03-06 09:01:08 +00:00
|
|
|
|
2015-05-18 00:57:24 +00:00
|
|
|
# resolve_config(target)
|
|
|
|
#
|
|
|
|
# Resolves all the late evalutations, inheritances and so on for the
|
|
|
|
# chosen target and any target it inherits from.
|
|
|
|
sub resolve_config;
|
2015-03-06 09:01:08 +00:00
|
|
|
|
2009-07-01 11:46:03 +00:00
|
|
|
|
2015-02-24 22:40:22 +00:00
|
|
|
my ($vol, $dir, $dummy) = File::Spec->splitpath($0);
|
Move Configurations* out of the way and rename them.
Configure would load the glob "Configurations*". The problem with
this is that it also loads all kinds of backups of those
configurations that some editors do, like emacs' classic
'Configurations~'. The solution is to give them an extension, such as
'.conf', and make sure to end the glob with that.
Also, because 'Configurations.conf' makes for a silly name, and
because a possibly large number of configurations will become clutter,
move them to a subdirectory 'Configurations/', and rename them to
something more expressive, as well as something that sets up some form
of sorting order. Thus:
Configurations -> Configurations/10-main.conf
Configurations.team -> Configurations/90-team.conf
Finally, make sure that Configure sorts the list of files that 'glob'
produces, and adapt Makefile.org.
Reviewed-by: Rich Salz <rsalz@openssl.org>
2015-03-11 09:22:50 +00:00
|
|
|
my $pattern = File::Spec->catpath($vol, $dir, "Configurations/*.conf");
|
|
|
|
foreach (sort glob($pattern) ) {
|
2015-02-24 22:40:22 +00:00
|
|
|
&read_config($_);
|
|
|
|
}
|
1998-12-21 10:52:47 +00:00
|
|
|
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
|
|
|
|
$config{perl};
|
|
|
|
$config{prefix}="";
|
|
|
|
$config{openssldir}="";
|
2009-08-10 14:48:40 +00:00
|
|
|
my $libdir="";
|
2001-04-04 15:50:30 +00:00
|
|
|
my $exe_ext="";
|
2009-10-18 14:27:01 +00:00
|
|
|
my $install_prefix= "$ENV{'INSTALL_PREFIX'}";
|
2006-10-21 13:38:16 +00:00
|
|
|
my $cross_compile_prefix="";
|
2011-01-29 21:51:59 +00:00
|
|
|
my $fipslibdir="/usr/local/ssl/fips-2.0/lib/";
|
2011-01-26 12:31:30 +00:00
|
|
|
my $nofipscanistercheck=0;
|
|
|
|
my $baseaddr="0xFB00000";
|
1999-04-29 16:10:09 +00:00
|
|
|
my $no_threads=0;
|
|
|
|
my $threads=0;
|
2005-02-22 10:29:51 +00:00
|
|
|
my $no_shared=0; # but "no-shared" is default
|
|
|
|
my $zlib=1; # but "no-zlib" is default
|
2015-07-23 16:30:06 +00:00
|
|
|
my $no_rfc3779=0;
|
1998-12-28 17:08:48 +00:00
|
|
|
my $no_asm=0;
|
2000-04-06 07:09:45 +00:00
|
|
|
my $no_dso=0;
|
1999-04-27 01:14:46 +00:00
|
|
|
my @skip=();
|
2005-03-30 13:05:57 +00:00
|
|
|
my $Makefile="Makefile";
|
1999-03-31 12:38:27 +00:00
|
|
|
my $processor="";
|
2001-03-09 13:04:06 +00:00
|
|
|
my $default_ranlib;
|
2011-01-26 12:31:30 +00:00
|
|
|
my $fips=0;
|
1999-04-01 12:34:33 +00:00
|
|
|
|
2016-01-18 18:10:21 +00:00
|
|
|
# Known TLS and DTLS protocols
|
|
|
|
my @tls = qw(ssl3 tls1 tls1_1 tls1_2);
|
|
|
|
my @dtls = qw(dtls1 dtls1_2);
|
|
|
|
|
2015-10-22 15:09:14 +00:00
|
|
|
# Explicitelly known options that are possible to disable. They can
|
|
|
|
# be regexps, and will be used like this: /^no-${option}$/
|
|
|
|
# For developers: keep it sorted alphabetically
|
|
|
|
|
|
|
|
my @disablables = (
|
|
|
|
"aes",
|
|
|
|
"asm",
|
|
|
|
"bf",
|
|
|
|
"camellia",
|
|
|
|
"capieng",
|
|
|
|
"cast",
|
2015-12-09 22:02:11 +00:00
|
|
|
"chacha",
|
2015-10-22 15:09:14 +00:00
|
|
|
"cmac",
|
|
|
|
"cms",
|
|
|
|
"comp",
|
2016-01-09 22:55:57 +00:00
|
|
|
"crypto-mdebug",
|
2015-10-22 15:09:14 +00:00
|
|
|
"ct",
|
|
|
|
"deprecated",
|
|
|
|
"des",
|
|
|
|
"dgram",
|
|
|
|
"dh",
|
|
|
|
"dsa",
|
|
|
|
"dso",
|
2015-12-12 10:12:22 +00:00
|
|
|
"dtls",
|
2015-10-22 15:09:14 +00:00
|
|
|
"dynamic[-_]engine",
|
|
|
|
"ec",
|
|
|
|
"ec2m",
|
2016-01-18 18:10:21 +00:00
|
|
|
"ecdh",
|
|
|
|
"ecdsa",
|
2015-10-22 15:09:14 +00:00
|
|
|
"ec_nistp_64_gcc_128",
|
|
|
|
"engine",
|
|
|
|
"err", # Really???
|
|
|
|
"gost",
|
|
|
|
"heartbeats",
|
|
|
|
"hmac",
|
|
|
|
"hw(-.+)?",
|
|
|
|
"idea",
|
|
|
|
"jpake",
|
|
|
|
"locking", # Really???
|
|
|
|
"md2",
|
|
|
|
"md4",
|
|
|
|
"md5",
|
|
|
|
"mdc2",
|
|
|
|
"md[-_]ghost94",
|
|
|
|
"nextprotoneg",
|
|
|
|
"ocb",
|
|
|
|
"ocsp",
|
2015-12-09 22:02:11 +00:00
|
|
|
"poly1305",
|
2015-10-22 15:09:14 +00:00
|
|
|
"posix-io",
|
|
|
|
"psk",
|
|
|
|
"rc2",
|
|
|
|
"rc4",
|
|
|
|
"rc5",
|
|
|
|
"rdrand",
|
|
|
|
"rfc3779",
|
|
|
|
"rijndael", # Old AES name
|
|
|
|
"rmd160",
|
|
|
|
"rsa",
|
|
|
|
"scrypt",
|
|
|
|
"sct",
|
|
|
|
"sctp",
|
|
|
|
"seed",
|
|
|
|
"sha",
|
|
|
|
"shared",
|
|
|
|
"sock",
|
|
|
|
"srp",
|
|
|
|
"srtp",
|
|
|
|
"sse2",
|
|
|
|
"ssl",
|
|
|
|
"ssl-trace",
|
|
|
|
"static-engine",
|
|
|
|
"stdio",
|
|
|
|
"store",
|
|
|
|
"threads",
|
|
|
|
"tls",
|
|
|
|
"unit-test",
|
|
|
|
"whirlpool",
|
|
|
|
"zlib",
|
|
|
|
"zlib-dynamic",
|
|
|
|
);
|
2016-01-18 18:10:21 +00:00
|
|
|
foreach my $proto ((@tls, @dtls))
|
|
|
|
{
|
|
|
|
push(@disablables, $proto);
|
|
|
|
push(@disablables, "$proto-method");
|
|
|
|
}
|
2015-10-22 15:09:14 +00:00
|
|
|
|
2005-02-22 10:29:51 +00:00
|
|
|
# All of the following is disabled by default (RC5 was enabled before 0.9.8):
|
|
|
|
|
2008-12-02 01:21:39 +00:00
|
|
|
my %disabled = ( # "what" => "comment" [or special keyword "experimental"]
|
2011-10-19 09:24:22 +00:00
|
|
|
"ec_nistp_64_gcc_128" => "default",
|
2016-01-13 00:02:16 +00:00
|
|
|
"egd" => "default",
|
2011-10-19 09:24:22 +00:00
|
|
|
"jpake" => "experimental",
|
|
|
|
"md2" => "default",
|
|
|
|
"rc5" => "default",
|
2016-01-10 19:42:10 +00:00
|
|
|
"sctp" => "default",
|
2011-10-19 09:24:22 +00:00
|
|
|
"shared" => "default",
|
2012-06-15 12:46:09 +00:00
|
|
|
"ssl-trace" => "default",
|
2009-02-19 09:43:18 +00:00
|
|
|
"store" => "experimental",
|
2014-07-23 12:18:06 +00:00
|
|
|
"unit-test" => "default",
|
2011-10-19 09:24:22 +00:00
|
|
|
"zlib" => "default",
|
2016-01-10 19:42:10 +00:00
|
|
|
"zlib-dynamic" => "default",
|
|
|
|
"crypto-mdebug" => "default",
|
2011-10-19 09:24:22 +00:00
|
|
|
);
|
2008-12-02 01:21:39 +00:00
|
|
|
my @experimental = ();
|
2005-02-22 10:29:51 +00:00
|
|
|
|
2015-05-18 09:03:47 +00:00
|
|
|
# Note: => pair form used for aesthetics, not to truly make a hash table
|
|
|
|
my @disable_cascades = (
|
|
|
|
# "what" => [ "cascade", ... ]
|
|
|
|
sub { $processor eq "386" }
|
|
|
|
=> [ "sse2" ],
|
|
|
|
"ssl" => [ "ssl3" ],
|
|
|
|
"ssl3-method" => [ "ssl3" ],
|
|
|
|
"zlib" => [ "zlib-dynamic" ],
|
|
|
|
"rijndael" => [ "aes" ],
|
|
|
|
"des" => [ "mdc2" ],
|
|
|
|
"ec" => [ "ecdsa", "ecdh", "gost" ],
|
|
|
|
"dsa" => [ "gost" ],
|
|
|
|
"dh" => [ "gost" ],
|
|
|
|
|
|
|
|
"dgram" => [ "dtls" ],
|
|
|
|
"dtls" => [ @dtls ],
|
|
|
|
|
|
|
|
# SSL 3.0, (D)TLS 1.0 and TLS 1.1 require MD5 and SHA
|
|
|
|
"md5" => [ "ssl", "tls1", "tls1_1", "dtls1" ],
|
|
|
|
"sha" => [ "ssl", "tls1", "tls1_1", "dtls1" ],
|
|
|
|
|
|
|
|
# Additionally, SSL 3.0 requires either RSA or DSA+DH
|
|
|
|
sub { $disabled{rsa}
|
|
|
|
&& ($disabled{dsa} || $disabled{dh}); }
|
|
|
|
=> [ "ssl" ],
|
|
|
|
|
|
|
|
# (D)TLS 1.0 and TLS 1.1 also require either RSA or DSA+DH
|
|
|
|
# or ECDSA + ECDH. (D)TLS 1.2 has this requirement as well.
|
|
|
|
# (XXX: We don't support PSK-only builds).
|
|
|
|
sub { $disabled{rsa}
|
|
|
|
&& ($disabled{dsa} || $disabled{dh})
|
|
|
|
&& ($disabled{ecdsa} || $disabled{ecdh}); }
|
|
|
|
=> [ "tls1", "tls1_1", "tls1_2",
|
|
|
|
"dtls1", "dtls1_2" ],
|
|
|
|
|
|
|
|
"tls" => [ @tls ],
|
|
|
|
|
|
|
|
# SRP and HEARTBEATS require TLSEXT
|
|
|
|
"tlsext" => [ "srp", "heartbeats" ],
|
|
|
|
);
|
|
|
|
|
|
|
|
# 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;
|
|
|
|
}
|
|
|
|
|
|
|
|
# Construct the string of what $depflags should look like with the defaults
|
|
|
|
# from %disabled above. (we need this to see if we should advise the user
|
|
|
|
# to run "make depend"):
|
|
|
|
my $default_depflags = " ".join(" ",
|
|
|
|
map { my $x = $_; $x =~ tr{[a-z]-}{[A-Z]_}; "-DOPENSSL_NO_$x"; }
|
|
|
|
grep { $disabled{$_} !~ /\(no-depflags\)$/ }
|
|
|
|
sort keys %disabled);
|
2008-12-02 01:21:39 +00:00
|
|
|
|
|
|
|
# Explicit "no-..." options will be collected in %disabled along with the defaults.
|
|
|
|
# To remove something from %disabled, use "enable-foo" (unless it's experimental).
|
|
|
|
# For symmetry, "disable-foo" is a synonym for "no-foo".
|
|
|
|
|
|
|
|
# For features called "experimental" here, a more explicit "experimental-foo" is needed to enable.
|
|
|
|
# We will collect such requests in @experimental.
|
|
|
|
# To avoid accidental use of experimental features, applications will have to use -DOPENSSL_EXPERIMENTAL_FOO.
|
2005-03-13 19:46:58 +00:00
|
|
|
|
|
|
|
|
2004-07-18 16:19:34 +00:00
|
|
|
my $no_sse2=0;
|
2001-11-27 11:48:30 +00:00
|
|
|
|
1999-04-24 22:59:36 +00:00
|
|
|
&usage if ($#ARGV < 0);
|
1998-12-21 10:52:47 +00:00
|
|
|
|
2015-05-18 01:33:55 +00:00
|
|
|
my $flags="";
|
|
|
|
my $depflags="";
|
|
|
|
my $openssl_experimental_defines="";
|
|
|
|
my $openssl_algorithm_defines="";
|
|
|
|
my $openssl_thread_defines="";
|
2001-02-19 16:06:34 +00:00
|
|
|
my $openssl_sys_defines="";
|
2015-05-18 01:33:55 +00:00
|
|
|
my $openssl_other_defines="";
|
|
|
|
my $libs="";
|
|
|
|
my $target="";
|
2016-01-11 23:17:12 +00:00
|
|
|
$config{options}="";
|
2016-01-05 04:00:33 +00:00
|
|
|
my $api;
|
2002-06-13 20:42:35 +00:00
|
|
|
my $make_depend=0;
|
2000-11-30 22:53:34 +00:00
|
|
|
my %withargs=();
|
2015-03-17 15:30:54 +00:00
|
|
|
my $build_prefix = "release_";
|
2000-08-17 10:23:45 +00:00
|
|
|
|
|
|
|
my @argvcopy=@ARGV;
|
|
|
|
|
2015-05-18 01:33:55 +00:00
|
|
|
if (grep /^reconf(igure)?$/, @argvcopy) {
|
|
|
|
if (open IN, "<$Makefile") {
|
|
|
|
while (<IN>) {
|
|
|
|
chomp;
|
|
|
|
if (/^CONFIGURE_ARGS=\s*(.*)\s*/) {
|
|
|
|
my $line = $1;
|
|
|
|
if ($line =~ /^\s*\(/) {
|
|
|
|
# New form perl expression saved in Makefile, eval it
|
|
|
|
@argvcopy = eval $line;
|
|
|
|
} else {
|
|
|
|
# Older form, we split the string and hope for the best
|
|
|
|
@argvcopy = split /\s+/, $line;
|
|
|
|
}
|
|
|
|
die "Incorrect data to reconfigure, please do a normal configuration\n"
|
|
|
|
if (grep(/^reconf/,@argvcopy));
|
|
|
|
} elsif (/^CROSS_COMPILE=\s*(.*)/) {
|
|
|
|
$ENV{CROSS_COMPILE}=$1;
|
|
|
|
} elsif (/^CC=\s*(?:\$\(CROSS_COMPILE\))?(.*?)$/) {
|
|
|
|
$ENV{CC}=$1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
print "Reconfiguring with: ", join(" ",@argvcopy), "\n";
|
|
|
|
print " CROSS_COMPILE = ",$ENV{CROSS_COMPILE},"\n"
|
|
|
|
if $ENV{CROSS_COMPILE};
|
|
|
|
print " CC = ",$ENV{CC},"\n" if $ENV{CC};
|
|
|
|
close IN;
|
|
|
|
} else {
|
|
|
|
die "Insufficient data to reconfigure, please do a normal configuration\n";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
my %unsupported_options = ();
|
|
|
|
foreach (@argvcopy)
|
2015-12-02 17:54:15 +00:00
|
|
|
{
|
2015-05-18 01:33:55 +00:00
|
|
|
s /^-no-/no-/; # some people just can't read the instructions
|
2005-02-22 10:29:51 +00:00
|
|
|
|
2015-05-18 01:33:55 +00:00
|
|
|
# rewrite some options in "enable-..." form
|
|
|
|
s /^-?-?shared$/enable-shared/;
|
|
|
|
s /^sctp$/enable-sctp/;
|
|
|
|
s /^threads$/enable-threads/;
|
|
|
|
s /^zlib$/enable-zlib/;
|
|
|
|
s /^zlib-dynamic$/enable-zlib-dynamic/;
|
2005-02-22 10:29:51 +00:00
|
|
|
|
2015-05-18 01:33:55 +00:00
|
|
|
if (/^(no|disable|enable|experimental)-(.+)$/)
|
|
|
|
{
|
|
|
|
my $word = $2;
|
|
|
|
if (!grep { $word =~ /^${_}$/ } @disablables)
|
2015-10-22 15:09:14 +00:00
|
|
|
{
|
2015-05-18 01:33:55 +00:00
|
|
|
$unsupported_options{$_} = 1;
|
|
|
|
next;
|
2015-10-22 15:09:14 +00:00
|
|
|
}
|
2015-05-18 01:33:55 +00:00
|
|
|
}
|
|
|
|
if (/^no-(.+)$/ || /^disable-(.+)$/)
|
|
|
|
{
|
|
|
|
if (!($disabled{$1} eq "experimental"))
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
2015-05-18 01:33:55 +00:00
|
|
|
foreach my $proto ((@tls, @dtls))
|
2002-08-09 08:43:04 +00:00
|
|
|
{
|
2015-05-18 01:33:55 +00:00
|
|
|
if ($1 eq "$proto-method")
|
2014-10-29 12:51:31 +00:00
|
|
|
{
|
2015-05-18 01:33:55 +00:00
|
|
|
$disabled{"$proto"} = "option($proto-method)";
|
|
|
|
last;
|
2014-10-29 12:51:31 +00:00
|
|
|
}
|
2015-05-18 01:33:55 +00:00
|
|
|
}
|
|
|
|
if ($1 eq "dtls")
|
|
|
|
{
|
|
|
|
foreach my $proto (@dtls)
|
2016-01-18 18:10:21 +00:00
|
|
|
{
|
2015-05-18 01:33:55 +00:00
|
|
|
$disabled{$proto} = "option(dtls)";
|
2016-01-18 18:10:21 +00:00
|
|
|
}
|
2015-05-18 01:33:55 +00:00
|
|
|
}
|
|
|
|
elsif ($1 eq "ssl")
|
|
|
|
{
|
|
|
|
# Last one of its kind
|
|
|
|
$disabled{"ssl3"} = "option(ssl)";
|
|
|
|
}
|
|
|
|
elsif ($1 eq "tls")
|
|
|
|
{
|
|
|
|
# XXX: Tests will fail if all SSL/TLS
|
|
|
|
# protocols are disabled.
|
|
|
|
foreach my $proto (@tls)
|
2008-12-02 01:21:39 +00:00
|
|
|
{
|
2015-05-18 01:33:55 +00:00
|
|
|
$disabled{$proto} = "option(tls)";
|
2008-12-02 01:21:39 +00:00
|
|
|
}
|
2014-05-26 16:19:28 +00:00
|
|
|
}
|
2015-05-18 01:33:55 +00:00
|
|
|
else
|
2001-11-27 11:48:30 +00:00
|
|
|
{
|
2015-05-18 01:33:55 +00:00
|
|
|
$disabled{$1} = "option";
|
2001-11-27 11:48:30 +00:00
|
|
|
}
|
2015-05-18 01:33:55 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
elsif (/^enable-(.+)$/ || /^experimental-(.+)$/)
|
|
|
|
{
|
|
|
|
my $algo = $1;
|
|
|
|
if ($disabled{$algo} eq "experimental")
|
|
|
|
{
|
|
|
|
die "You are requesting an experimental feature; please say 'experimental-$algo' if you are sure\n"
|
|
|
|
unless (/^experimental-/);
|
|
|
|
push @experimental, $algo;
|
|
|
|
}
|
|
|
|
delete $disabled{$algo};
|
2005-02-22 10:29:51 +00:00
|
|
|
|
2015-05-18 01:33:55 +00:00
|
|
|
$threads = 1 if ($algo eq "threads");
|
|
|
|
}
|
|
|
|
elsif (/^--strict-warnings$/)
|
|
|
|
{
|
|
|
|
$strict_warnings = 1;
|
|
|
|
}
|
|
|
|
elsif (/^--debug$/)
|
|
|
|
{
|
|
|
|
$build_prefix = "debug_";
|
|
|
|
}
|
|
|
|
elsif (/^--release$/)
|
|
|
|
{
|
|
|
|
$build_prefix = "release_";
|
|
|
|
}
|
|
|
|
elsif (/^386$/)
|
|
|
|
{ $processor=386; }
|
|
|
|
elsif (/^fips$/)
|
|
|
|
{
|
|
|
|
$fips=1;
|
|
|
|
}
|
|
|
|
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$/)
|
|
|
|
{
|
|
|
|
$fips = 1;
|
|
|
|
$nofipscanistercheck = 1;
|
|
|
|
}
|
|
|
|
elsif (/^[-+]/)
|
|
|
|
{
|
|
|
|
if (/^--prefix=(.*)$/)
|
|
|
|
{
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
$config{prefix}=$1;
|
2005-02-22 10:29:51 +00:00
|
|
|
}
|
2015-05-18 01:33:55 +00:00
|
|
|
elsif (/^--api=(.*)$/)
|
2009-09-09 16:31:32 +00:00
|
|
|
{
|
2015-05-18 01:33:55 +00:00
|
|
|
$api=$1;
|
2009-09-09 16:31:32 +00:00
|
|
|
}
|
2015-05-18 01:33:55 +00:00
|
|
|
elsif (/^--libdir=(.*)$/)
|
2015-03-17 15:30:54 +00:00
|
|
|
{
|
2015-05-18 01:33:55 +00:00
|
|
|
$libdir=$1;
|
2015-03-17 15:30:54 +00:00
|
|
|
}
|
2015-05-18 01:33:55 +00:00
|
|
|
elsif (/^--openssldir=(.*)$/)
|
2015-03-17 15:30:54 +00:00
|
|
|
{
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
$config{openssldir}=$1;
|
2015-03-17 15:30:54 +00:00
|
|
|
}
|
2015-05-18 01:33:55 +00:00
|
|
|
elsif (/^--install.prefix=(.*)$/)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
2015-05-18 01:33:55 +00:00
|
|
|
$install_prefix=$1;
|
1998-12-21 10:52:47 +00:00
|
|
|
}
|
2015-05-18 01:33:55 +00:00
|
|
|
elsif (/^--with-zlib-lib=(.*)$/)
|
2011-01-30 00:01:09 +00:00
|
|
|
{
|
2015-05-18 01:33:55 +00:00
|
|
|
$withargs{"zlib-lib"}=$1;
|
2011-10-19 09:24:22 +00:00
|
|
|
}
|
2015-05-18 01:33:55 +00:00
|
|
|
elsif (/^--with-zlib-include=(.*)$/)
|
1999-03-06 14:35:03 +00:00
|
|
|
{
|
2015-05-18 01:33:55 +00:00
|
|
|
$withargs{"zlib-include"}="-I$1";
|
1999-04-24 22:59:36 +00:00
|
|
|
}
|
2015-05-18 01:33:55 +00:00
|
|
|
elsif (/^--with-fipslibdir=(.*)$/)
|
2011-01-26 12:31:30 +00:00
|
|
|
{
|
2015-05-18 01:33:55 +00:00
|
|
|
$fipslibdir="$1/";
|
2011-01-26 12:31:30 +00:00
|
|
|
}
|
2015-05-18 01:33:55 +00:00
|
|
|
elsif (/^--with-baseaddr=(.*)$/)
|
1999-04-24 22:59:36 +00:00
|
|
|
{
|
2015-05-18 01:33:55 +00:00
|
|
|
$baseaddr="$1";
|
1999-03-06 14:35:03 +00:00
|
|
|
}
|
2015-05-18 01:33:55 +00:00
|
|
|
elsif (/^--cross-compile-prefix=(.*)$/)
|
1999-04-29 21:52:08 +00:00
|
|
|
{
|
2015-05-18 01:33:55 +00:00
|
|
|
$cross_compile_prefix=$1;
|
1999-04-29 21:52:08 +00:00
|
|
|
}
|
2015-05-18 01:33:55 +00:00
|
|
|
elsif (/^--config=(.*)$/)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
2015-05-18 01:33:55 +00:00
|
|
|
read_config $1;
|
2000-08-17 10:23:45 +00:00
|
|
|
}
|
2015-05-18 01:33:55 +00:00
|
|
|
elsif (/^-[lL](.*)$/ or /^-Wl,/)
|
2005-02-22 10:29:51 +00:00
|
|
|
{
|
2015-05-18 01:33:55 +00:00
|
|
|
$libs.=$_." ";
|
1998-12-21 10:52:47 +00:00
|
|
|
}
|
2015-05-18 01:33:55 +00:00
|
|
|
else # common if (/^[-+]/), just pass down...
|
|
|
|
{
|
|
|
|
$_ =~ s/%([0-9a-f]{1,2})/chr(hex($1))/gei;
|
|
|
|
$flags.=$_." ";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
elsif ($_ =~ /^([^:]+):(.+)$/)
|
|
|
|
{
|
|
|
|
eval "\$table{\$1} = \"$2\""; # allow $xxx constructs in the string
|
|
|
|
$target=$1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
die "target already defined - $target (offending arg: $_)\n" if ($target ne "");
|
|
|
|
$target=$_;
|
|
|
|
}
|
|
|
|
unless ($_ eq $target || /^no-/ || /^disable-/)
|
|
|
|
{
|
|
|
|
# "no-..." follows later after implied disactivations
|
|
|
|
# have been derived. (Don't take this too seroiusly,
|
|
|
|
# we really only write OPTIONS to the Makefile out of
|
|
|
|
# nostalgia.)
|
|
|
|
|
2016-01-11 23:17:12 +00:00
|
|
|
if ($config{options} eq "")
|
|
|
|
{ $config{options} = $_; }
|
2015-05-18 01:33:55 +00:00
|
|
|
else
|
2016-01-11 23:17:12 +00:00
|
|
|
{ $config{options} .= " ".$_; }
|
1999-07-09 12:00:34 +00:00
|
|
|
}
|
2015-10-22 15:33:47 +00:00
|
|
|
|
2016-01-05 04:00:33 +00:00
|
|
|
if (defined($api) && !exists $apitable->{$api}) {
|
|
|
|
die "***** Unsupported api compatibility level: $api\n",
|
|
|
|
}
|
|
|
|
|
2015-10-22 15:33:47 +00:00
|
|
|
if (keys %unsupported_options)
|
|
|
|
{
|
|
|
|
die "***** Unsupported options: ",
|
|
|
|
join(", ", keys %unsupported_options), "\n";
|
|
|
|
}
|
1999-07-09 12:00:34 +00:00
|
|
|
}
|
2001-11-27 11:48:30 +00:00
|
|
|
|
2015-05-18 09:03:47 +00:00
|
|
|
if ($fips)
|
2015-12-16 13:25:07 +00:00
|
|
|
{
|
2015-05-18 09:03:47 +00:00
|
|
|
delete $disabled{"shared"} if ($disabled{"shared"} =~ /^default/);
|
2016-01-18 18:10:21 +00:00
|
|
|
}
|
2005-02-22 10:29:51 +00:00
|
|
|
|
2015-05-18 09:03:47 +00:00
|
|
|
my @tocheckfor = (keys %disabled);
|
|
|
|
while (@tocheckfor) {
|
|
|
|
my %new_tocheckfor = ();
|
|
|
|
my @cascade_copy = (@disable_cascades);
|
|
|
|
while (@cascade_copy) {
|
|
|
|
my ($test, $descendents) = (shift @cascade_copy, shift @cascade_copy);
|
|
|
|
if (ref($test) eq "CODE" ? $test->() : defined($disabled{$test})) {
|
|
|
|
map {
|
|
|
|
$new_tocheckfor{$_} => 1; $disabled{$_} = "forced";
|
|
|
|
} grep { !defined($disabled{$_}) } @$descendents;
|
2009-04-23 16:32:42 +00:00
|
|
|
}
|
2015-05-18 09:03:47 +00:00
|
|
|
}
|
|
|
|
@tocheckfor = (keys %new_tocheckfor);
|
|
|
|
}
|
2011-03-12 17:01:19 +00:00
|
|
|
|
1999-05-28 23:18:51 +00:00
|
|
|
if ($target eq "TABLE") {
|
2015-05-18 10:53:38 +00:00
|
|
|
foreach (sort keys %table) {
|
|
|
|
print_table_entry($_, "TABLE");
|
|
|
|
}
|
|
|
|
exit 0;
|
1999-05-28 23:18:51 +00:00
|
|
|
}
|
|
|
|
|
2000-02-21 00:55:45 +00:00
|
|
|
if ($target eq "LIST") {
|
2015-05-18 10:53:38 +00:00
|
|
|
foreach (sort keys %table) {
|
|
|
|
print $_,"\n" unless $table{$_}->{template};
|
|
|
|
}
|
|
|
|
exit 0;
|
2000-02-21 00:55:45 +00:00
|
|
|
}
|
|
|
|
|
2015-03-06 01:00:21 +00:00
|
|
|
if ($target eq "HASH") {
|
2015-05-18 10:53:38 +00:00
|
|
|
print "%table = (\n";
|
|
|
|
foreach (sort keys %table) {
|
|
|
|
print_table_entry($_, "HASH");
|
|
|
|
}
|
|
|
|
exit 0;
|
2015-03-06 01:00:21 +00:00
|
|
|
}
|
|
|
|
|
2015-05-18 10:53:38 +00:00
|
|
|
# Backward compatibility?
|
2002-02-14 12:28:24 +00:00
|
|
|
if ($target =~ m/^CygWin32(-.*)$/) {
|
2015-05-18 10:53:38 +00:00
|
|
|
$target = "Cygwin".$1;
|
2002-02-14 12:28:24 +00:00
|
|
|
}
|
|
|
|
|
2005-02-22 10:29:51 +00:00
|
|
|
foreach (sort (keys %disabled))
|
|
|
|
{
|
2016-01-11 23:17:12 +00:00
|
|
|
$config{options} .= " no-$_";
|
2005-02-22 10:29:51 +00:00
|
|
|
|
|
|
|
printf " no-%-12s %-10s", $_, "[$disabled{$_}]";
|
|
|
|
|
|
|
|
if (/^dso$/)
|
|
|
|
{ $no_dso = 1; }
|
|
|
|
elsif (/^threads$/)
|
|
|
|
{ $no_threads = 1; }
|
|
|
|
elsif (/^shared$/)
|
|
|
|
{ $no_shared = 1; }
|
|
|
|
elsif (/^zlib$/)
|
|
|
|
{ $zlib = 0; }
|
2005-11-06 17:58:26 +00:00
|
|
|
elsif (/^static-engine$/)
|
|
|
|
{ }
|
2005-02-22 10:29:51 +00:00
|
|
|
elsif (/^zlib-dynamic$/)
|
|
|
|
{ }
|
|
|
|
elsif (/^sse2$/)
|
|
|
|
{ $no_sse2 = 1; }
|
|
|
|
else
|
|
|
|
{
|
|
|
|
my ($ALGO, $algo);
|
2011-03-25 09:29:46 +00:00
|
|
|
($ALGO = $algo = $_) =~ tr/[\-a-z]/[_A-Z]/;
|
2005-02-22 10:29:51 +00:00
|
|
|
|
|
|
|
if (/^asm$/ || /^err$/ || /^hw$/ || /^hw-/)
|
|
|
|
{
|
|
|
|
$openssl_other_defines .= "#define OPENSSL_NO_$ALGO\n";
|
|
|
|
print " OPENSSL_NO_$ALGO";
|
2014-05-26 16:19:28 +00:00
|
|
|
|
2005-06-22 23:44:44 +00:00
|
|
|
if (/^err$/) { $flags .= "-DOPENSSL_NO_ERR "; }
|
|
|
|
elsif (/^asm$/) { $no_asm = 1; }
|
2005-02-22 10:29:51 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2015-01-24 15:46:54 +00:00
|
|
|
($ALGO,$algo) = ("RMD160","rmd160") if ($algo eq "ripemd");
|
|
|
|
|
2005-02-22 10:29:51 +00:00
|
|
|
$openssl_algorithm_defines .= "#define OPENSSL_NO_$ALGO\n";
|
|
|
|
print " OPENSSL_NO_$ALGO";
|
|
|
|
|
2015-05-12 11:14:13 +00:00
|
|
|
push @skip, $algo;
|
|
|
|
# fix-up crypto/directory name(s)
|
|
|
|
$skip[$#skip]="whrlpool" if $algo eq "whirlpool";
|
|
|
|
$skip[$#skip]="ripemd" if $algo eq "rmd160";
|
2015-01-24 15:46:54 +00:00
|
|
|
|
2015-05-12 11:14:13 +00:00
|
|
|
print " (skip dir)";
|
2005-03-13 19:46:58 +00:00
|
|
|
|
2015-05-12 11:14:13 +00:00
|
|
|
$depflags .= " -DOPENSSL_NO_$ALGO";
|
2005-02-22 10:29:51 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
print "\n";
|
|
|
|
}
|
|
|
|
|
2008-12-02 01:21:39 +00:00
|
|
|
my $exp_cflags = "";
|
2011-04-10 17:31:03 +00:00
|
|
|
|
2008-12-02 01:21:39 +00:00
|
|
|
foreach (sort @experimental)
|
|
|
|
{
|
|
|
|
my $ALGO;
|
|
|
|
($ALGO = $_) =~ tr/[a-z]/[A-Z]/;
|
|
|
|
|
|
|
|
# opensslconf.h will set OPENSSL_NO_... unless OPENSSL_EXPERIMENTAL_... is defined
|
|
|
|
$openssl_experimental_defines .= "#define OPENSSL_NO_$ALGO\n";
|
|
|
|
$exp_cflags .= " -DOPENSSL_EXPERIMENTAL_$ALGO";
|
|
|
|
}
|
2005-02-22 10:29:51 +00:00
|
|
|
|
2015-05-18 00:54:28 +00:00
|
|
|
print "Configuring for $target\n";
|
|
|
|
|
|
|
|
# Support for legacy targets having a name starting with 'debug-'
|
|
|
|
my ($d, $t) = $target =~ m/^(debug-)?(.*)$/;
|
|
|
|
if ($d) {
|
|
|
|
$build_prefix = "debug_";
|
|
|
|
|
|
|
|
# If we do not find debug-foo in the table, the target is set to foo.
|
|
|
|
if (!$table{$target}) {
|
|
|
|
$target = $t;
|
|
|
|
}
|
|
|
|
}
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
$config{target} = $target;
|
2015-05-18 00:54:28 +00:00
|
|
|
delete $table{$base_target}->{template}; # or the next test will fail.
|
|
|
|
my %target = ( %{$table{$base_target}}, resolve_config($target) );
|
|
|
|
|
|
|
|
&usage if (!%target || $target{template});
|
|
|
|
|
2008-11-03 21:15:07 +00:00
|
|
|
$exe_ext=".exe" if ($target eq "Cygwin" || $target eq "DJGPP" || $target =~ /^mingw/);
|
2008-01-03 22:43:04 +00:00
|
|
|
$exe_ext=".nlm" if ($target =~ /netware/);
|
2004-07-18 16:19:34 +00:00
|
|
|
$exe_ext=".pm" if ($target =~ /vos/);
|
1999-04-24 22:59:36 +00:00
|
|
|
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
$default_ranlib = which("ranlib") || "true";
|
|
|
|
$config{perl} = $ENV{'PERL'} || which("perl5") || which("perl") || "perl";
|
|
|
|
my $make = $ENV{'MAKE'} || "make";
|
2004-06-28 22:01:37 +00:00
|
|
|
|
2009-10-15 23:43:54 +00:00
|
|
|
$cross_compile_prefix=$ENV{'CROSS_COMPILE'} if $cross_compile_prefix eq "";
|
2009-10-07 16:41:14 +00:00
|
|
|
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
$config{prefix} = "/usr/local" if !$config{prefix};
|
|
|
|
$config{openssldir} = "ssl" if !$config{openssldir};
|
|
|
|
$config{openssldir} = catdir($config{prefix}, $config{openssldir})
|
|
|
|
unless file_name_is_absolute($config{openssldir});
|
1998-12-21 10:52:47 +00:00
|
|
|
|
1999-03-07 15:21:08 +00:00
|
|
|
|
2009-01-18 12:06:37 +00:00
|
|
|
# Allow environment CC to override compiler...
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
$target{cc} = $ENV{CC} || $target{cc};
|
2015-03-06 01:00:21 +00:00
|
|
|
|
Rethink templates.
Because base templates express inheritance of values, the attribute is
renamed to 'inherit_from', and texts about this talk about 'inheritance(s)'
rather than base templates.
As they were previously implemented, base templates that were listed
together would override one another, the first one acting as defaults for
the next and so on.
However, it was pointed out that a strength of inheritance would be to
base configurations on several templates - for example one for CPU, one
for operating system and one for compiler - and that requires a different
way of combining those templates. With this change, inherited values
from several inheritances are concatenated by default (keep on reading).
Also, in-string templates with the double-curly syntax are removed,
replaced with the possibility to have a configuration value be a coderef
(i.e. a 'sub { /* your code goes here */ }') that gets the list of values
from all inheritances as the list @_. The result of executing such a
coderef on a list of values is assumed to become a string. ANY OTHER
FORM OF VALUE WILL CURRENTLY BREAK.
As a matter of fact, an attribute in the current config with no value is
assumed to have this coderef as value:
sub { join(' ', @_) }
While we're at it, rename debug-[cl]flags to debug_[cl]flags and
nodebug-[cl]flags to release_[cl]flags.
Reviewed-by: Andy Polyakov <appro@openssl.org>
2015-03-10 21:04:44 +00:00
|
|
|
# For cflags and lflags, add the debug_ or release_ attributes
|
2015-03-06 01:00:21 +00:00
|
|
|
# Do it in such a way that no spurious space is appended (hence the grep).
|
|
|
|
my $cflags = join(" ",
|
2015-05-18 00:57:24 +00:00
|
|
|
grep { $_ } ($target{cflags},
|
|
|
|
$target{$build_prefix."cflags"}));
|
2015-03-06 01:00:21 +00:00
|
|
|
my $lflags = join(" ",
|
2015-05-18 00:57:24 +00:00
|
|
|
grep { $_ } ($target{lflags},
|
|
|
|
$target{$build_prefix."lflags"}));
|
|
|
|
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
$target{ranlib} = $ENV{'RANLIB'} || $target{ranlib} || $default_ranlib;
|
|
|
|
$target{ar} = $ENV{'AR'} || "ar";
|
|
|
|
# Make sure build_scheme is consistent.
|
|
|
|
$target{build_scheme} = [ $target{build_scheme} ]
|
|
|
|
if ref($target{build_scheme}) ne "ARRAY";
|
|
|
|
|
|
|
|
# if $config{prefix}/lib$target{multilib} is not an existing directory, then
|
2010-07-16 08:13:39 +00:00
|
|
|
# assume that it's not searched by linker automatically, in
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
# which case adding $target{multilib} suffix causes more grief than
|
2010-07-16 08:13:39 +00:00
|
|
|
# we're ready to tolerate, so don't...
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
$target{multilib}="" if !-d "$config{prefix}/lib$target{multilib}";
|
2010-07-16 08:13:39 +00:00
|
|
|
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
$libdir="lib$target{multilib}" if $libdir eq "";
|
2009-12-29 10:33:37 +00:00
|
|
|
|
2008-12-02 01:21:39 +00:00
|
|
|
$cflags = "$cflags$exp_cflags";
|
|
|
|
|
2007-07-31 18:24:41 +00:00
|
|
|
# '%' in $lflags is used to split flags to "pre-" and post-flags
|
|
|
|
my ($prelflags,$postlflags)=split('%',$lflags);
|
|
|
|
if (defined($postlflags)) { $lflags=$postlflags; }
|
|
|
|
else { $lflags=$prelflags; undef $prelflags; }
|
|
|
|
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
if ($target =~ /^mingw/ && `$target{cc} --target-help 2>&1` !~ m/\-mno\-cygwin/m)
|
2010-11-30 22:18:02 +00:00
|
|
|
{
|
|
|
|
$cflags =~ s/\-mno\-cygwin\s*//;
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
$target{shared_ldflag} =~ s/\-mno\-cygwin\s*//;
|
2010-11-30 22:18:02 +00:00
|
|
|
}
|
|
|
|
|
2012-09-15 11:21:50 +00:00
|
|
|
if ($target =~ /linux.*\-mips/ && !$no_asm && $flags !~ /\-m(ips|arch=)/) {
|
|
|
|
# minimally required architecture flags for assembly modules
|
|
|
|
$cflags="-mips2 $cflags" if ($target =~ /mips32/);
|
|
|
|
$cflags="-mips3 $cflags" if ($target =~ /mips64/);
|
|
|
|
}
|
|
|
|
|
2003-01-11 11:40:39 +00:00
|
|
|
my $no_shared_warn=0;
|
2005-01-24 15:58:25 +00:00
|
|
|
my $no_user_cflags=0;
|
2003-01-11 11:40:39 +00:00
|
|
|
|
2005-01-24 15:58:25 +00:00
|
|
|
if ($flags ne "") { $cflags="$flags$cflags"; }
|
|
|
|
else { $no_user_cflags=1; }
|
1999-04-29 16:10:09 +00:00
|
|
|
|
2000-04-06 07:09:45 +00:00
|
|
|
# The DSO code currently always implements all functions so that no
|
|
|
|
# applications will have to worry about that from a compilation point
|
|
|
|
# of view. However, the "method"s may return zero unless that platform
|
|
|
|
# has support compiled in for them. Currently each method is enabled
|
|
|
|
# by a define "DSO_<name>" ... we translate the "dso_scheme" config
|
|
|
|
# string entry into using the following logic;
|
2000-04-06 11:56:45 +00:00
|
|
|
my $dso_cflags;
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
if (!$no_dso && $target{dso_scheme} ne "")
|
2000-04-06 07:09:45 +00:00
|
|
|
{
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
$target{dso_scheme} =~ tr/[a-z]/[A-Z]/;
|
|
|
|
if ($target{dso_scheme} eq "DLFCN")
|
2000-04-06 07:09:45 +00:00
|
|
|
{
|
2000-04-06 11:56:45 +00:00
|
|
|
$dso_cflags = "-DDSO_DLFCN -DHAVE_DLFCN_H";
|
2000-04-06 07:09:45 +00:00
|
|
|
}
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
elsif ($target{dso_scheme} eq "DLFCN_NO_H")
|
2000-04-06 07:09:45 +00:00
|
|
|
{
|
2000-04-06 11:56:45 +00:00
|
|
|
$dso_cflags = "-DDSO_DLFCN";
|
2000-04-06 07:09:45 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
$dso_cflags = "-DDSO_$target{dso_scheme}";
|
2000-04-06 07:09:45 +00:00
|
|
|
}
|
2000-04-06 11:56:45 +00:00
|
|
|
$cflags = "$dso_cflags $cflags";
|
2000-04-06 07:09:45 +00:00
|
|
|
}
|
2000-04-04 22:32:19 +00:00
|
|
|
|
1999-04-29 16:10:09 +00:00
|
|
|
my $thread_cflags;
|
2000-02-18 09:11:37 +00:00
|
|
|
my $thread_defines;
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
if ($target{thread_cflag} ne "(unknown)" && !$no_threads)
|
1999-04-29 16:10:09 +00:00
|
|
|
{
|
|
|
|
# If we know how to do it, support threads by default.
|
|
|
|
$threads = 1;
|
|
|
|
}
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
if ($target{thread_cflag} eq "(unknown)" && $threads)
|
1999-04-29 16:10:09 +00:00
|
|
|
{
|
2005-01-24 15:58:25 +00:00
|
|
|
# If the user asked for "threads", [s]he is also expected to
|
|
|
|
# provide any system-dependent compiler options that are
|
|
|
|
# necessary.
|
|
|
|
if ($no_user_cflags)
|
|
|
|
{
|
|
|
|
print "You asked for multi-threading support, but didn't\n";
|
|
|
|
print "provide any system-specific compiler options\n";
|
|
|
|
exit(1);
|
|
|
|
}
|
2001-02-19 16:06:34 +00:00
|
|
|
$thread_cflags="-DOPENSSL_THREADS $cflags" ;
|
|
|
|
$thread_defines .= "#define OPENSSL_THREADS\n";
|
1999-04-29 16:10:09 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
$thread_cflags="-DOPENSSL_THREADS $target{thread_cflag} $cflags";
|
2001-02-19 16:06:34 +00:00
|
|
|
$thread_defines .= "#define OPENSSL_THREADS\n";
|
2000-02-24 18:19:50 +00:00
|
|
|
# my $def;
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
# foreach $def (split ' ',$target{thread_cflag})
|
2000-02-24 18:19:50 +00:00
|
|
|
# {
|
|
|
|
# if ($def =~ s/^-D// && $def !~ /^_/)
|
|
|
|
# {
|
|
|
|
# $thread_defines .= "#define $def\n";
|
|
|
|
# }
|
|
|
|
# }
|
2014-05-26 16:19:28 +00:00
|
|
|
}
|
1999-04-29 16:10:09 +00:00
|
|
|
|
2002-12-19 21:55:48 +00:00
|
|
|
$lflags="$libs$lflags" if ($libs ne "");
|
1998-12-21 10:52:47 +00:00
|
|
|
|
1998-12-21 11:00:56 +00:00
|
|
|
if ($no_asm)
|
|
|
|
{
|
2011-01-30 00:01:09 +00:00
|
|
|
$cflags=~s/\-D[BL]_ENDIAN// if ($fips);
|
|
|
|
$thread_cflags=~s/\-D[BL]_ENDIAN// if ($fips);
|
1998-12-21 11:00:56 +00:00
|
|
|
}
|
2002-12-13 17:56:14 +00:00
|
|
|
|
1999-04-29 16:10:09 +00:00
|
|
|
if ($threads)
|
|
|
|
{
|
2005-01-24 15:58:25 +00:00
|
|
|
$cflags=$thread_cflags;
|
2001-07-12 09:11:14 +00:00
|
|
|
$openssl_thread_defines .= $thread_defines;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ($zlib)
|
|
|
|
{
|
|
|
|
$cflags = "-DZLIB $cflags";
|
2005-02-22 10:29:51 +00:00
|
|
|
if (defined($disabled{"zlib-dynamic"}))
|
|
|
|
{
|
2009-04-07 16:33:26 +00:00
|
|
|
if (defined($withargs{"zlib-lib"}))
|
|
|
|
{
|
|
|
|
$lflags = "$lflags -L" . $withargs{"zlib-lib"} . " -lz";
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
$lflags = "$lflags -lz";
|
|
|
|
}
|
2005-02-22 10:29:51 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
$cflags = "-DZLIB_SHARED $cflags";
|
|
|
|
}
|
1999-04-29 16:10:09 +00:00
|
|
|
}
|
|
|
|
|
2016-01-05 04:00:33 +00:00
|
|
|
# With "deprecated" disable all deprecated features.
|
|
|
|
if (defined($disabled{"deprecated"})) {
|
|
|
|
$api = $maxapi;
|
|
|
|
}
|
2014-12-17 13:17:26 +00:00
|
|
|
|
2016-01-12 21:25:30 +00:00
|
|
|
# You will find shlib_mark1 and shlib_mark2 explained in Makefile.in
|
2000-10-13 15:25:06 +00:00
|
|
|
my $shared_mark = "";
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
if ($target{shared_target} eq "")
|
2002-12-13 17:56:14 +00:00
|
|
|
{
|
2011-01-30 00:01:09 +00:00
|
|
|
$no_shared_warn = 1 if !$no_shared && !$fips;
|
2002-12-13 17:56:14 +00:00
|
|
|
$no_shared = 1;
|
|
|
|
}
|
|
|
|
if (!$no_shared)
|
2000-07-21 15:08:53 +00:00
|
|
|
{
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
if ($target{shared_cflag} ne "")
|
2000-10-13 15:25:06 +00:00
|
|
|
{
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
$cflags = "$target{shared_cflag} -DOPENSSL_PIC $cflags";
|
2000-10-13 15:25:06 +00:00
|
|
|
}
|
2000-10-09 00:48:30 +00:00
|
|
|
}
|
2000-07-21 15:08:53 +00:00
|
|
|
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
if ($target{build_scheme}->[0] ne "mk1mf")
|
2002-10-11 18:06:08 +00:00
|
|
|
{
|
2008-04-17 10:19:16 +00:00
|
|
|
# add {no-}static-engine to options to allow mkdef.pl to work without extra arguments
|
2005-11-06 17:58:26 +00:00
|
|
|
if ($no_shared)
|
|
|
|
{
|
|
|
|
$openssl_other_defines.="#define OPENSSL_NO_DYNAMIC_ENGINE\n";
|
2016-01-11 23:17:12 +00:00
|
|
|
$config{options}.=" static-engine";
|
2005-11-06 17:58:26 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
$openssl_other_defines.="#define OPENSSL_NO_STATIC_ENGINE\n";
|
2016-01-11 23:17:12 +00:00
|
|
|
$config{options}.=" no-static-engine";
|
2005-11-06 17:58:26 +00:00
|
|
|
}
|
2002-10-24 19:09:03 +00:00
|
|
|
}
|
2002-10-11 18:06:08 +00:00
|
|
|
|
2007-09-16 12:23:47 +00:00
|
|
|
#
|
|
|
|
# Platform fix-ups
|
|
|
|
#
|
|
|
|
if ($target =~ /\-icc$/) # Intel C compiler
|
2004-03-28 21:27:47 +00:00
|
|
|
{
|
2007-09-14 19:32:33 +00:00
|
|
|
my $iccver=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-18 20:35:23 +00:00
|
|
|
if (open(FD,"$target{cc} -V 2>&1 |"))
|
2007-09-14 19:32:33 +00:00
|
|
|
{
|
|
|
|
while(<FD>) { $iccver=$1 if (/Version ([0-9]+)\./); }
|
|
|
|
close(FD);
|
|
|
|
}
|
2004-03-28 21:27:47 +00:00
|
|
|
if ($iccver>=8)
|
|
|
|
{
|
2012-11-28 13:05:13 +00:00
|
|
|
$cflags=~s/\-KPIC/-fPIC/;
|
2004-03-28 21:27:47 +00:00
|
|
|
# Eliminate unnecessary dependency from libirc.a. This is
|
|
|
|
# essential for shared library support, as otherwise
|
|
|
|
# apps/openssl can end up in endless loop upon startup...
|
|
|
|
$cflags.=" -Dmemcpy=__builtin_memcpy -Dmemset=__builtin_memset";
|
|
|
|
}
|
2007-09-14 19:32:33 +00:00
|
|
|
if ($iccver>=9)
|
|
|
|
{
|
2012-11-28 13:05:13 +00:00
|
|
|
$lflags.=" -i-static";
|
|
|
|
$lflags=~s/\-no_cpprt/-no-cpprt/;
|
2007-09-14 19:32:33 +00:00
|
|
|
}
|
|
|
|
if ($iccver>=10)
|
|
|
|
{
|
2012-11-28 13:05:13 +00:00
|
|
|
$lflags=~s/\-i\-static/-static-intel/;
|
|
|
|
}
|
|
|
|
if ($iccver>=11)
|
|
|
|
{
|
|
|
|
$cflags.=" -no-intel-extensions"; # disable Cilk
|
|
|
|
$lflags=~s/\-no\-cpprt/-no-cxxlib/;
|
2007-09-14 19:32:33 +00:00
|
|
|
}
|
2004-03-28 21:27:47 +00:00
|
|
|
}
|
|
|
|
|
2007-09-16 12:23:47 +00:00
|
|
|
# Unlike other OSes (like Solaris, Linux, Tru64, IRIX) BSD run-time
|
|
|
|
# linkers (tested OpenBSD, NetBSD and FreeBSD) "demand" RPATH set on
|
|
|
|
# .so objects. Apparently application RPATH is not global and does
|
|
|
|
# not apply to .so linked with other .so. Problem manifests itself
|
|
|
|
# when libssl.so fails to load libcrypto.so. One can argue that we
|
|
|
|
# should engrave this into Makefile.shared rules or into BSD-* config
|
|
|
|
# lines above. Meanwhile let's try to be cautious and pass -rpath to
|
|
|
|
# linker only when --prefix is not /usr.
|
|
|
|
if ($target =~ /^BSD\-/)
|
|
|
|
{
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
$target{shared_ldflag}.=" -Wl,-rpath,\$\$(LIBRPATH)" if ($config{prefix} !~ m|^/usr[/]*$|);
|
2007-09-16 12:23:47 +00:00
|
|
|
}
|
|
|
|
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
if ($target{sys_id} ne "")
|
2001-02-19 16:06:34 +00:00
|
|
|
{
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
#$cflags="-DOPENSSL_SYS_$target{sys_id} $cflags";
|
|
|
|
$openssl_sys_defines="#define OPENSSL_SYS_$target{sys_id}\n";
|
2001-02-19 16:06:34 +00:00
|
|
|
}
|
|
|
|
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
if ($target{ranlib} eq "")
|
2001-03-09 13:04:06 +00:00
|
|
|
{
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
$target{ranlib} = $default_ranlib;
|
2001-03-09 13:04:06 +00:00
|
|
|
}
|
|
|
|
|
2015-05-18 00:54:28 +00:00
|
|
|
if (!$no_asm) {
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
$target{cpuid_obj}=$table{BASE}->{cpuid_obj} if ($processor eq "386");
|
|
|
|
$target{cpuid_obj}.=" uplink.o uplink-x86.o" if ($cflags =~ /\-DOPENSSL_USE_APPLINK/);
|
1999-02-14 22:47:21 +00:00
|
|
|
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
$target{bn_obj} =~ s/\w+-gf2m.o// if (defined($disabled{ec2m}));
|
2004-08-02 22:41:19 +00:00
|
|
|
|
2015-05-18 00:54:28 +00:00
|
|
|
# bn-586 is the only one implementing bn_*_part_words
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
$cflags.=" -DOPENSSL_BN_ASM_PART_WORDS" if ($target{bn_obj} =~ /bn-586/);
|
|
|
|
$cflags.=" -DOPENSSL_IA32_SSE2" if (!$no_sse2 && $target{bn_obj} =~ /86/);
|
1998-12-21 11:00:56 +00:00
|
|
|
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
$cflags.=" -DOPENSSL_BN_ASM_MONT" if ($target{bn_obj} =~ /-mont/);
|
|
|
|
$cflags.=" -DOPENSSL_BN_ASM_MONT5" if ($target{bn_obj} =~ /-mont5/);
|
|
|
|
$cflags.=" -DOPENSSL_BN_ASM_GF2m" if ($target{bn_obj} =~ /-gf2m/);
|
2005-10-07 14:18:06 +00:00
|
|
|
|
2015-05-18 00:54:28 +00:00
|
|
|
if ($fips) {
|
2011-01-26 12:31:30 +00:00
|
|
|
$openssl_other_defines.="#define OPENSSL_FIPS\n";
|
2015-05-18 00:54:28 +00:00
|
|
|
}
|
2011-01-26 12:31:30 +00:00
|
|
|
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
if ($target{sha1_obj} =~ /\.o$/) {
|
|
|
|
$cflags.=" -DSHA1_ASM" if ($target{sha1_obj} =~ /sx86/ || $target{sha1_obj} =~ /sha1/);
|
|
|
|
$cflags.=" -DSHA256_ASM" if ($target{sha1_obj} =~ /sha256/);
|
|
|
|
$cflags.=" -DSHA512_ASM" if ($target{sha1_obj} =~ /sha512/);
|
|
|
|
if ($target{sha1_obj} =~ /sse2/) {
|
2015-05-18 00:54:28 +00:00
|
|
|
if ($no_sse2) {
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
$target{sha1_obj} =~ s/\S*sse2\S+//;
|
2015-05-18 00:54:28 +00:00
|
|
|
} elsif ($cflags !~ /OPENSSL_IA32_SSE2/) {
|
|
|
|
$cflags.=" -DOPENSSL_IA32_SSE2";
|
2004-07-18 16:19:34 +00:00
|
|
|
}
|
1998-12-21 10:56:39 +00:00
|
|
|
}
|
2015-05-18 00:54:28 +00:00
|
|
|
}
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
if ($target{md5_obj} =~ /\.o$/) {
|
1998-12-21 10:56:39 +00:00
|
|
|
$cflags.=" -DMD5_ASM";
|
2015-05-18 00:54:28 +00:00
|
|
|
}
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
$target{cast_obj}=$table{BASE}->{cast_obj} if (!$no_shared); # CAST assembler is not PIC
|
|
|
|
if ($target{rmd160_obj} =~ /\.o$/) {
|
1998-12-21 10:56:39 +00:00
|
|
|
$cflags.=" -DRMD160_ASM";
|
2015-05-18 00:54:28 +00:00
|
|
|
}
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
if ($target{aes_obj} =~ /\.o$/) {
|
|
|
|
$cflags.=" -DAES_ASM" if ($target{aes_obj} =~ m/\baes\-/);;
|
2011-11-15 12:18:40 +00:00
|
|
|
# aes-ctr.o is not a real file, only indication that assembler
|
2010-07-09 12:21:52 +00:00
|
|
|
# module implements AES_ctr32_encrypt...
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
$cflags.=" -DAES_CTR_ASM" if ($target{aes_obj} =~ s/\s*aes\-ctr\.o//);
|
2013-06-12 23:22:32 +00:00
|
|
|
# aes-xts.o indicates presence of AES_xts_[en|de]crypt...
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
$cflags.=" -DAES_XTS_ASM" if ($target{aes_obj} =~ s/\s*aes\-xts\.o//);
|
|
|
|
$target{aes_obj} =~ s/\s*(vpaes|aesni)\-x86\.o//g if ($no_sse2);
|
|
|
|
$cflags.=" -DVPAES_ASM" if ($target{aes_obj} =~ m/vpaes/);
|
|
|
|
$cflags.=" -DBSAES_ASM" if ($target{aes_obj} =~ m/bsaes/);
|
2015-05-18 00:54:28 +00:00
|
|
|
}
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
if ($target{wp_obj} =~ /mmx/ && $processor eq "386") {
|
|
|
|
$target{wp_obj}=$table{BASE}->{wp_obj};
|
2015-05-18 00:54:28 +00:00
|
|
|
} elsif (!$disabled{"whirlpool"}) {
|
2005-12-16 13:23:57 +00:00
|
|
|
$cflags.=" -DWHIRLPOOL_ASM";
|
2015-05-18 00:54:28 +00:00
|
|
|
}
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
if ($target{modes_obj} =~ /ghash\-/) {
|
2010-04-22 21:36:26 +00:00
|
|
|
$cflags.=" -DGHASH_ASM";
|
2015-05-18 00:54:28 +00:00
|
|
|
}
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
if ($target{ec_obj} =~ /ecp_nistz256/) {
|
2014-09-11 22:38:57 +00:00
|
|
|
$cflags.=" -DECP_NISTZ256_ASM";
|
2015-05-18 00:54:28 +00:00
|
|
|
}
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
if ($target{poly1305_obj} =~ /\.o$/) {
|
2015-12-12 11:29:37 +00:00
|
|
|
$cflags.=" -DPOLY1305_ASM";
|
2015-05-18 00:54:28 +00:00
|
|
|
}
|
|
|
|
}
|
1998-12-21 10:52:47 +00:00
|
|
|
|
2002-05-30 18:06:35 +00:00
|
|
|
# "Stringify" the C flags string. This permits it to be made part of a string
|
|
|
|
# and works as well on command lines.
|
|
|
|
$cflags =~ s/([\\\"])/\\\1/g;
|
|
|
|
|
2016-01-11 23:17:12 +00:00
|
|
|
$config{version} = "unknown";
|
|
|
|
$config{version_num} = "unknown";
|
|
|
|
$config{major} = "unknown";
|
|
|
|
$config{minor} = "unknown";
|
|
|
|
$config{shlib_version_number} = "unknown";
|
|
|
|
$config{shlib_version_history} = "unknown";
|
|
|
|
$config{shlib_major} = "unknown";
|
|
|
|
$config{shlib_minor} = "unknown";
|
1999-04-28 16:16:31 +00:00
|
|
|
|
2015-03-26 20:33:18 +00:00
|
|
|
open(IN,'<include/openssl/opensslv.h') || die "unable to read opensslv.h:$!\n";
|
1999-04-28 16:16:31 +00:00
|
|
|
while (<IN>)
|
|
|
|
{
|
2016-01-11 23:17:12 +00:00
|
|
|
$config{version}=$1 if /OPENSSL.VERSION.TEXT.*OpenSSL (\S+) /;
|
|
|
|
$config{version_num}=$1 if /OPENSSL.VERSION.NUMBER.*(0x\S+)/;
|
|
|
|
$config{shlib_version_number}=$1 if /SHLIB_VERSION_NUMBER *"([^"]+)"/;
|
|
|
|
$config{shlib_version_history}=$1 if /SHLIB_VERSION_HISTORY *"([^"]*)"/;
|
1999-04-28 16:16:31 +00:00
|
|
|
}
|
|
|
|
close(IN);
|
2016-01-11 23:17:12 +00:00
|
|
|
if ($config{shlib_version_history} ne "") { $config{shlib_version_history} .= ":"; }
|
1999-04-28 16:16:31 +00:00
|
|
|
|
2016-01-11 23:17:12 +00:00
|
|
|
if ($config{version} =~ /(^[0-9]*)\.([0-9\.]*)/)
|
1999-04-28 16:16:31 +00:00
|
|
|
{
|
2016-01-11 23:17:12 +00:00
|
|
|
$config{major}=$1;
|
|
|
|
$config{minor}=$2;
|
1999-04-28 16:16:31 +00:00
|
|
|
}
|
|
|
|
|
2016-01-11 23:17:12 +00:00
|
|
|
if ($config{shlib_version_number} =~ /(^[0-9]*)\.([0-9\.]*)/)
|
2000-07-21 15:08:53 +00:00
|
|
|
{
|
2016-01-11 23:17:12 +00:00
|
|
|
$config{shlib_major}=$1;
|
|
|
|
$config{shlib_minor}=$2;
|
2000-07-21 15:08:53 +00:00
|
|
|
}
|
|
|
|
|
2016-01-05 04:00:33 +00:00
|
|
|
if (defined($api)) {
|
|
|
|
my $apiflag = sprintf("-DOPENSSL_API_COMPAT=%s", $apitable->{$api});
|
|
|
|
$default_depflags .= " $apiflag";
|
|
|
|
$cflags .= " $apiflag";
|
|
|
|
}
|
|
|
|
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
my $ecc = $target{cc};
|
|
|
|
$ecc = "clang" if `$target{cc} --version 2>&1` =~ /clang/;
|
2015-10-09 18:00:53 +00:00
|
|
|
|
2009-09-09 16:31:32 +00:00
|
|
|
if ($strict_warnings)
|
|
|
|
{
|
|
|
|
my $wopt;
|
2015-10-12 20:15:43 +00:00
|
|
|
die "ERROR --strict-warnings requires gcc or clang" unless ($ecc =~ /gcc(-\d(\.\d)*)?$/ or $ecc =~ /clang$/);
|
2009-09-09 16:31:32 +00:00
|
|
|
foreach $wopt (split /\s+/, $gcc_devteam_warn)
|
|
|
|
{
|
2015-11-09 08:50:56 +00:00
|
|
|
$cflags .= " $wopt" unless ($cflags =~ /(^|\s)$wopt(\s|$)/)
|
2009-09-09 16:31:32 +00:00
|
|
|
}
|
2015-04-19 13:10:54 +00:00
|
|
|
if ($ecc eq "clang")
|
|
|
|
{
|
|
|
|
foreach $wopt (split /\s+/, $clang_devteam_warn)
|
|
|
|
{
|
2015-11-09 08:50:56 +00:00
|
|
|
$cflags .= " $wopt" unless ($cflags =~ /(^|\s)$wopt(\s|$)/)
|
2015-04-19 13:10:54 +00:00
|
|
|
}
|
|
|
|
}
|
2015-12-02 17:44:26 +00:00
|
|
|
if ($target !~ /^mingw/)
|
|
|
|
{
|
|
|
|
foreach $wopt (split /\s+/, $memleak_devteam_backtrace)
|
|
|
|
{
|
|
|
|
$cflags .= " $wopt" unless ($cflags =~ /(^|\s)$wopt(\s|$)/)
|
|
|
|
}
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
if ($target =~ /^BSD-/)
|
|
|
|
{
|
|
|
|
$lflags .= " -lexecinfo";
|
|
|
|
}
|
|
|
|
}
|
2009-09-09 16:31:32 +00:00
|
|
|
}
|
|
|
|
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
# Write down our configuration where it fits #########################
|
|
|
|
|
|
|
|
open(OUT,">configdata.pm") || die "unable to create configdata.pm: $!\n";
|
|
|
|
print OUT <<"EOF";
|
|
|
|
package configdata;
|
|
|
|
|
|
|
|
use strict;
|
|
|
|
use warnings;
|
|
|
|
|
|
|
|
use Exporter;
|
|
|
|
#use vars qw(\@ISA \@EXPORT);
|
|
|
|
our \@ISA = qw(Exporter);
|
|
|
|
our \@EXPORT = qw(\%config \%target);
|
|
|
|
|
|
|
|
EOF
|
|
|
|
print OUT "our %config = (\n";
|
|
|
|
foreach (sort keys %config) {
|
|
|
|
if (ref($config{$_}) eq "ARRAY") {
|
|
|
|
print OUT " ", $_, " => [ ", join(", ",
|
|
|
|
map { quotify("perl", $_) }
|
|
|
|
@{$config{$_}}), " ],\n";
|
|
|
|
} else {
|
|
|
|
print OUT " ", $_, " => ", quotify("perl", $config{$_}), ",\n"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
print OUT <<"EOF";
|
|
|
|
);
|
|
|
|
|
|
|
|
EOF
|
|
|
|
print OUT "our %target = (\n";
|
|
|
|
foreach (sort keys %target) {
|
|
|
|
if (ref($target{$_}) eq "ARRAY") {
|
|
|
|
print OUT " ", $_, " => [ ", join(", ",
|
|
|
|
map { quotify("perl", $_) }
|
|
|
|
@{$target{$_}}), " ],\n";
|
|
|
|
} else {
|
|
|
|
print OUT " ", $_, " => ", quotify("perl", $target{$_}), ",\n"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
print OUT <<"EOF";
|
|
|
|
);
|
|
|
|
|
|
|
|
1;
|
|
|
|
EOF
|
|
|
|
close(OUT);
|
|
|
|
|
|
|
|
open(IN,"<Makefile.in") || die "unable to read Makefile.in: $!\n";
|
2002-07-16 08:53:32 +00:00
|
|
|
open(OUT,">$Makefile.new") || die "unable to create $Makefile.new:$!\n";
|
2016-01-12 21:25:30 +00:00
|
|
|
print OUT "### Generated automatically from Makefile.in by Configure.\n\n";
|
1999-04-27 01:14:46 +00:00
|
|
|
my $sdirs=0;
|
2011-08-23 23:35:30 +00:00
|
|
|
|
1998-12-21 10:52:47 +00:00
|
|
|
while (<IN>)
|
|
|
|
{
|
2006-04-03 09:15:15 +00:00
|
|
|
chomp;
|
1999-04-27 01:14:46 +00:00
|
|
|
$sdirs = 1 if /^SDIRS=/;
|
|
|
|
if ($sdirs) {
|
|
|
|
my $dir;
|
|
|
|
foreach $dir (@skip) {
|
2008-11-12 17:28:18 +00:00
|
|
|
s/(\s)$dir /$1/;
|
|
|
|
s/\s$dir$//;
|
1999-04-27 01:14:46 +00:00
|
|
|
}
|
|
|
|
}
|
1999-07-16 00:49:51 +00:00
|
|
|
$sdirs = 0 unless /\\$/;
|
2011-01-29 21:39:33 +00:00
|
|
|
s/fips // if (/^DIRS=/ && !$fips);
|
2009-02-15 15:28:18 +00:00
|
|
|
s/engines // if (/^DIRS=/ && $disabled{"engine"});
|
2016-01-11 23:17:12 +00:00
|
|
|
s/^VERSION=.*/VERSION=$config{version}/;
|
|
|
|
s/^MAJOR=.*/MAJOR=$config{major}/;
|
|
|
|
s/^MINOR=.*/MINOR=$config{minor}/;
|
|
|
|
s/^SHLIB_VERSION_NUMBER=.*/SHLIB_VERSION_NUMBER=$config{shlib_version_number}/;
|
|
|
|
s/^SHLIB_VERSION_HISTORY=.*/SHLIB_VERSION_HISTORY=$config{shlib_version_history}/;
|
|
|
|
s/^SHLIB_MAJOR=.*/SHLIB_MAJOR=$config{shlib_major}/;
|
|
|
|
s/^SHLIB_MINOR=.*/SHLIB_MINOR=$config{shlib_minor}/;
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
s/^SHLIB_EXT=.*/SHLIB_EXT=$target{shared_extension}/;
|
|
|
|
s/^INSTALLTOP=.*$/INSTALLTOP=$config{prefix}/;
|
|
|
|
s/^MULTILIB=.*$/MULTILIB=$target{multilib}/;
|
|
|
|
s/^OPENSSLDIR=.*$/OPENSSLDIR=$config{openssldir}/;
|
2009-08-10 14:48:40 +00:00
|
|
|
s/^LIBDIR=.*$/LIBDIR=$libdir/;
|
1999-04-29 21:52:08 +00:00
|
|
|
s/^INSTALL_PREFIX=.*$/INSTALL_PREFIX=$install_prefix/;
|
1998-12-21 11:00:56 +00:00
|
|
|
s/^PLATFORM=.*$/PLATFORM=$target/;
|
2016-01-11 23:17:12 +00:00
|
|
|
s/^OPTIONS=.*$/OPTIONS=$config{options}/;
|
2015-05-18 01:33:55 +00:00
|
|
|
my $argvstring = "(".join(", ", map { quotify("perl", $_) } @argvcopy).")";
|
2000-08-17 10:23:45 +00:00
|
|
|
s/^CONFIGURE_ARGS=.*$/CONFIGURE_ARGS=$argvstring/;
|
2006-10-21 13:38:16 +00:00
|
|
|
if ($cross_compile_prefix)
|
|
|
|
{
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
s/^CC=.*$/CROSS_COMPILE= $cross_compile_prefix\nCC= \$\(CROSS_COMPILE\)$target{cc}/;
|
2009-10-15 13:05:04 +00:00
|
|
|
s/^AR=\s*/AR= \$\(CROSS_COMPILE\)/;
|
|
|
|
s/^NM=\s*/NM= \$\(CROSS_COMPILE\)/;
|
|
|
|
s/^RANLIB=\s*/RANLIB= \$\(CROSS_COMPILE\)/;
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
s/^MAKEDEPPROG=.*$/MAKEDEPPROG= \$\(CROSS_COMPILE\)$target{cc}/ if $target{cc} eq "gcc";
|
2006-10-21 13:38:16 +00:00
|
|
|
}
|
|
|
|
else {
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
s/^CC=.*$/CC= $target{cc}/;
|
|
|
|
s/^AR=\s*ar/AR= $target{ar}/;
|
|
|
|
s/^RANLIB=.*/RANLIB= $target{ranlib}/;
|
|
|
|
s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $target{cc}/ if $ecc eq "gcc" || $ecc eq "clang";
|
2006-10-21 13:38:16 +00:00
|
|
|
}
|
1998-12-21 10:52:47 +00:00
|
|
|
s/^CFLAG=.*$/CFLAG= $cflags/;
|
2008-12-02 01:21:39 +00:00
|
|
|
s/^DEPFLAG=.*$/DEPFLAG=$depflags/;
|
2007-07-31 18:24:41 +00:00
|
|
|
s/^PEX_LIBS=.*$/PEX_LIBS= $prelflags/;
|
1998-12-21 10:52:47 +00:00
|
|
|
s/^EX_LIBS=.*$/EX_LIBS= $lflags/;
|
2001-04-04 15:50:30 +00:00
|
|
|
s/^EXE_EXT=.*$/EXE_EXT= $exe_ext/;
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
s/^CPUID_OBJ=.*$/CPUID_OBJ= $target{cpuid_obj}/;
|
|
|
|
s/^BN_ASM=.*$/BN_ASM= $target{bn_obj}/;
|
|
|
|
s/^EC_ASM=.*$/EC_ASM= $target{ec_obj}/;
|
|
|
|
s/^DES_ENC=.*$/DES_ENC= $target{des_obj}/;
|
|
|
|
s/^AES_ENC=.*$/AES_ENC= $target{aes_obj}/;
|
|
|
|
s/^BF_ENC=.*$/BF_ENC= $target{bf_obj}/;
|
|
|
|
s/^CAST_ENC=.*$/CAST_ENC= $target{cast_obj}/;
|
|
|
|
s/^RC4_ENC=.*$/RC4_ENC= $target{rc4_obj}/;
|
|
|
|
s/^RC5_ENC=.*$/RC5_ENC= $target{rc5_obj}/;
|
|
|
|
s/^MD5_ASM_OBJ=.*$/MD5_ASM_OBJ= $target{md5_obj}/;
|
|
|
|
s/^SHA1_ASM_OBJ=.*$/SHA1_ASM_OBJ= $target{sha1_obj}/;
|
|
|
|
s/^RMD160_ASM_OBJ=.*$/RMD160_ASM_OBJ= $target{rmd160_obj}/;
|
|
|
|
s/^WP_ASM_OBJ=.*$/WP_ASM_OBJ= $target{wp_obj}/;
|
|
|
|
s/^CMLL_ENC=.*$/CMLL_ENC= $target{cmll_obj}/;
|
|
|
|
s/^MODES_ASM_OBJ.=*$/MODES_ASM_OBJ= $target{modes_obj}/;
|
|
|
|
s/^ENGINES_ASM_OBJ.=*$/ENGINES_ASM_OBJ= $target{engines_obj}/;
|
|
|
|
s/^CHACHA_ENC=.*$/CHACHA_ENC= $target{chacha_obj}/;
|
|
|
|
s/^POLY1305_ASM_OBJ=.*$/POLY1305_ASM_OBJ= $target{poly1305_obj}/;
|
|
|
|
s/^PERLASM_SCHEME=.*$/PERLASM_SCHEME= $target{perlasm_scheme}/;
|
1999-03-31 12:38:27 +00:00
|
|
|
s/^PROCESSOR=.*/PROCESSOR= $processor/;
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
s/^ARFLAGS=.*/ARFLAGS= $target{arflags}/;
|
|
|
|
s/^PERL=.*/PERL= $config{perl}/;
|
2005-12-05 13:46:46 +00:00
|
|
|
s/^LIBZLIB=.*/LIBZLIB=$withargs{"zlib-lib"}/;
|
|
|
|
s/^ZLIB_INCLUDE=.*/ZLIB_INCLUDE=$withargs{"zlib-include"}/;
|
2011-01-26 12:31:30 +00:00
|
|
|
s/^FIPSLIBDIR=.*/FIPSLIBDIR=$fipslibdir/;
|
2011-09-14 15:20:59 +00:00
|
|
|
s/^FIPSCANLIB=.*/FIPSCANLIB=libcrypto/ if $fips;
|
|
|
|
s/^SHARED_FIPS=.*/SHARED_FIPS=/;
|
|
|
|
s/^SHLIBDIRS=.*/SHLIBDIRS= crypto ssl/;
|
2011-01-26 12:31:30 +00:00
|
|
|
s/^BASEADDR=.*/BASEADDR=$baseaddr/;
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
s/^SHLIB_TARGET=.*/SHLIB_TARGET=$target{shared_target}/;
|
2000-10-13 15:25:06 +00:00
|
|
|
s/^SHLIB_MARK=.*/SHLIB_MARK=$shared_mark/;
|
|
|
|
s/^SHARED_LIBS=.*/SHARED_LIBS=\$(SHARED_CRYPTO) \$(SHARED_SSL)/ if (!$no_shared);
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
if ($target{shared_extension} ne "" && $target{shared_extension} =~ /^\.s([ol])\.[^\.]*$/)
|
2000-10-21 21:24:11 +00:00
|
|
|
{
|
|
|
|
my $sotmp = $1;
|
2002-05-30 12:16:33 +00:00
|
|
|
s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp/;
|
|
|
|
}
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
elsif ($target{shared_extension} ne "" && $target{shared_extension} =~ /^\.[^\.]*\.dylib$/)
|
2002-05-30 12:16:33 +00:00
|
|
|
{
|
|
|
|
s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.dylib/;
|
2000-10-21 21:24:11 +00:00
|
|
|
}
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
elsif ($target{shared_extension} ne "" && $target{shared_extension} =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/)
|
2000-10-21 21:24:11 +00:00
|
|
|
{
|
|
|
|
my $sotmp = $1;
|
|
|
|
s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/;
|
|
|
|
}
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
elsif ($target{shared_extension} ne "" && $target{shared_extension} =~ /^\.[^\.]*\.[^\.]*\.dylib$/)
|
2002-05-30 12:16:33 +00:00
|
|
|
{
|
|
|
|
s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.\$(SHLIB_MAJOR).dylib .dylib/;
|
|
|
|
}
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
s/^SHARED_LDFLAGS=.*/SHARED_LDFLAGS=$target{shared_ldflag}/;
|
1998-12-21 10:52:47 +00:00
|
|
|
print OUT $_."\n";
|
|
|
|
}
|
|
|
|
close(IN);
|
|
|
|
close(OUT);
|
2002-07-16 08:53:32 +00:00
|
|
|
rename("$Makefile.new",$Makefile) || die "unable to rename $Makefile.new\n";
|
1998-12-28 22:05:44 +00:00
|
|
|
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
print "IsMK1MF =", ($target{build_scheme}->[0] eq "mk1mf" ? "yes" : "no"), "\n";
|
|
|
|
print "CC =$target{cc}\n";
|
1998-12-21 10:56:39 +00:00
|
|
|
print "CFLAG =$cflags\n";
|
|
|
|
print "EX_LIBS =$lflags\n";
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
print "CPUID_OBJ =$target{cpuid_obj}\n";
|
|
|
|
print "BN_ASM =$target{bn_obj}\n";
|
|
|
|
print "EC_ASM =$target{ec_obj}\n";
|
|
|
|
print "DES_ENC =$target{des_obj}\n";
|
|
|
|
print "AES_ENC =$target{aes_obj}\n";
|
|
|
|
print "BF_ENC =$target{bf_obj}\n";
|
|
|
|
print "CAST_ENC =$target{cast_obj}\n";
|
|
|
|
print "RC4_ENC =$target{rc4_obj}\n";
|
|
|
|
print "RC5_ENC =$target{rc5_obj}\n";
|
|
|
|
print "MD5_OBJ_ASM =$target{md5_obj}\n";
|
|
|
|
print "SHA1_OBJ_ASM =$target{sha1_obj}\n";
|
|
|
|
print "RMD160_OBJ_ASM=$target{rmd160_obj}\n";
|
|
|
|
print "CMLL_ENC =$target{cmll_obj}\n";
|
|
|
|
print "MODES_OBJ =$target{modes_obj}\n";
|
|
|
|
print "ENGINES_OBJ =$target{engines_obj}\n";
|
|
|
|
print "CHACHA_ENC =$target{chacha_obj}\n";
|
|
|
|
print "POLY1305_OBJ =$target{poly1305_obj}\n";
|
1999-03-31 12:38:27 +00:00
|
|
|
print "PROCESSOR =$processor\n";
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
print "RANLIB =$target{ranlib}\n";
|
|
|
|
print "ARFLAGS =$target{arflags}\n";
|
|
|
|
print "PERL =$config{perl}\n";
|
1998-12-21 10:52:47 +00:00
|
|
|
|
1998-12-28 17:08:48 +00:00
|
|
|
my $des_ptr=0;
|
|
|
|
my $des_risc1=0;
|
|
|
|
my $des_risc2=0;
|
|
|
|
my $des_unroll=0;
|
|
|
|
my $bn_ll=0;
|
|
|
|
my $def_int=2;
|
|
|
|
my $rc4_int=$def_int;
|
|
|
|
my $md2_int=$def_int;
|
|
|
|
my $idea_int=$def_int;
|
|
|
|
my $rc2_int=$def_int;
|
|
|
|
my $rc4_idx=0;
|
1999-10-07 12:03:59 +00:00
|
|
|
my $rc4_chunk=0;
|
1998-12-28 17:08:48 +00:00
|
|
|
my $bf_ptr=0;
|
|
|
|
my @type=("char","short","int","long");
|
|
|
|
my ($b64l,$b64,$b32,$b16,$b8)=(0,0,1,0,0);
|
Introduce the possibility to access global variables through
functions on platform were that's the best way to handle exporting
global variables in shared libraries. To enable this functionality,
one must configure with "EXPORT_VAR_AS_FN" or defined the C macro
"OPENSSL_EXPORT_VAR_AS_FUNCTION" in crypto/opensslconf.h (the latter
is normally done by Configure or something similar).
To implement a global variable, use the macro OPENSSL_IMPLEMENT_GLOBAL
in the source file (foo.c) like this:
OPENSSL_IMPLEMENT_GLOBAL(int,foo)=1;
OPENSSL_IMPLEMENT_GLOBAL(double,bar);
To declare a global variable, use the macros OPENSSL_DECLARE_GLOBAL
and OPENSSL_GLOBAL_REF in the header file (foo.h) like this:
OPENSSL_DECLARE_GLOBAL(int,foo);
#define foo OPENSSL_GLOBAL_REF(foo)
OPENSSL_DECLARE_GLOBAL(double,bar);
#define bar OPENSSL_GLOBAL_REF(bar)
The #defines are very important, and therefore so is including the
header file everywere where the defined globals are used.
The macro OPENSSL_EXPORT_VAR_AS_FUNCTION also affects the definition
of ASN.1 items, but that structure is a bt different.
The largest change is in util/mkdef.pl which has been enhanced with
better and easier to understand logic to choose which symbols should
go into the Windows .def files as well as a number of fixes and code
cleanup (among others, algorithm keywords are now sorted
lexicographically to avoid constant rewrites).
2001-03-02 10:38:19 +00:00
|
|
|
my $export_var_as_fn=0;
|
1998-12-28 17:08:48 +00:00
|
|
|
|
|
|
|
my $des_int;
|
1998-12-21 10:52:47 +00:00
|
|
|
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
foreach (sort split(/\s+/,$target{bn_ops}))
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
$des_ptr=1 if /DES_PTR/;
|
|
|
|
$des_risc1=1 if /DES_RISC1/;
|
|
|
|
$des_risc2=1 if /DES_RISC2/;
|
|
|
|
$des_unroll=1 if /DES_UNROLL/;
|
|
|
|
$des_int=1 if /DES_INT/;
|
|
|
|
$bn_ll=1 if /BN_LLONG/;
|
|
|
|
$rc4_int=0 if /RC4_CHAR/;
|
|
|
|
$rc4_int=3 if /RC4_LONG/;
|
|
|
|
$rc4_idx=1 if /RC4_INDEX/;
|
1999-10-07 12:03:59 +00:00
|
|
|
$rc4_chunk=1 if /RC4_CHUNK/;
|
|
|
|
$rc4_chunk=2 if /RC4_CHUNK_LL/;
|
1998-12-21 10:52:47 +00:00
|
|
|
$md2_int=0 if /MD2_CHAR/;
|
|
|
|
$md2_int=3 if /MD2_LONG/;
|
|
|
|
$idea_int=1 if /IDEA_SHORT/;
|
|
|
|
$idea_int=3 if /IDEA_LONG/;
|
|
|
|
$rc2_int=1 if /RC2_SHORT/;
|
|
|
|
$rc2_int=3 if /RC2_LONG/;
|
|
|
|
$bf_ptr=1 if $_ eq "BF_PTR";
|
|
|
|
$bf_ptr=2 if $_ eq "BF_PTR2";
|
|
|
|
($b64l,$b64,$b32,$b16,$b8)=(0,1,0,0,0) if /SIXTY_FOUR_BIT/;
|
1998-12-21 10:56:39 +00:00
|
|
|
($b64l,$b64,$b32,$b16,$b8)=(1,0,0,0,0) if /SIXTY_FOUR_BIT_LONG/;
|
1998-12-21 10:52:47 +00:00
|
|
|
($b64l,$b64,$b32,$b16,$b8)=(0,0,1,0,0) if /THIRTY_TWO_BIT/;
|
|
|
|
($b64l,$b64,$b32,$b16,$b8)=(0,0,0,1,0) if /SIXTEEN_BIT/;
|
|
|
|
($b64l,$b64,$b32,$b16,$b8)=(0,0,0,0,1) if /EIGHT_BIT/;
|
Introduce the possibility to access global variables through
functions on platform were that's the best way to handle exporting
global variables in shared libraries. To enable this functionality,
one must configure with "EXPORT_VAR_AS_FN" or defined the C macro
"OPENSSL_EXPORT_VAR_AS_FUNCTION" in crypto/opensslconf.h (the latter
is normally done by Configure or something similar).
To implement a global variable, use the macro OPENSSL_IMPLEMENT_GLOBAL
in the source file (foo.c) like this:
OPENSSL_IMPLEMENT_GLOBAL(int,foo)=1;
OPENSSL_IMPLEMENT_GLOBAL(double,bar);
To declare a global variable, use the macros OPENSSL_DECLARE_GLOBAL
and OPENSSL_GLOBAL_REF in the header file (foo.h) like this:
OPENSSL_DECLARE_GLOBAL(int,foo);
#define foo OPENSSL_GLOBAL_REF(foo)
OPENSSL_DECLARE_GLOBAL(double,bar);
#define bar OPENSSL_GLOBAL_REF(bar)
The #defines are very important, and therefore so is including the
header file everywere where the defined globals are used.
The macro OPENSSL_EXPORT_VAR_AS_FUNCTION also affects the definition
of ASN.1 items, but that structure is a bt different.
The largest change is in util/mkdef.pl which has been enhanced with
better and easier to understand logic to choose which symbols should
go into the Windows .def files as well as a number of fixes and code
cleanup (among others, algorithm keywords are now sorted
lexicographically to avoid constant rewrites).
2001-03-02 10:38:19 +00:00
|
|
|
$export_var_as_fn=1 if /EXPORT_VAR_AS_FN/;
|
1998-12-21 10:52:47 +00:00
|
|
|
}
|
|
|
|
|
1999-04-21 17:31:05 +00:00
|
|
|
open(IN,'<crypto/opensslconf.h.in') || die "unable to read crypto/opensslconf.h.in:$!\n";
|
2015-03-26 20:33:18 +00:00
|
|
|
open(OUT,'>include/openssl/opensslconf.h.new') || die "unable to create include/openssl/opensslconf.h.new:$!\n";
|
2000-02-18 11:15:32 +00:00
|
|
|
print OUT "/* opensslconf.h */\n";
|
2000-02-18 09:11:37 +00:00
|
|
|
print OUT "/* WARNING: Generated automatically from opensslconf.h.in by Configure. */\n\n";
|
2000-02-18 11:15:32 +00:00
|
|
|
|
2014-08-27 19:28:08 +00:00
|
|
|
print OUT "#ifdef __cplusplus\n";
|
|
|
|
print OUT "extern \"C\" {\n";
|
|
|
|
print OUT "#endif\n";
|
2000-02-18 11:15:32 +00:00
|
|
|
print OUT "/* OpenSSL was configured with the following options: */\n";
|
2016-01-05 04:00:33 +00:00
|
|
|
|
|
|
|
my $openssl_api_defines = "";
|
|
|
|
if (defined($api)) {
|
|
|
|
$openssl_api_defines = sprintf "#define OPENSSL_MIN_API %s\n", $apitable->{$api};
|
|
|
|
}
|
2001-02-22 17:36:41 +00:00
|
|
|
my $openssl_algorithm_defines_trans = $openssl_algorithm_defines;
|
2008-12-02 01:21:39 +00:00
|
|
|
$openssl_experimental_defines =~ s/^\s*#\s*define\s+OPENSSL_NO_(.*)/#ifndef OPENSSL_EXPERIMENTAL_$1\n# ifndef OPENSSL_NO_$1\n# define OPENSSL_NO_$1\n# endif\n#endif/mg;
|
2001-02-22 17:36:41 +00:00
|
|
|
$openssl_algorithm_defines_trans =~ s/^\s*#\s*define\s+OPENSSL_(.*)/# if defined(OPENSSL_$1) \&\& !defined($1)\n# define $1\n# endif/mg;
|
2001-02-19 16:06:34 +00:00
|
|
|
$openssl_algorithm_defines =~ s/^\s*#\s*define\s+(.*)/#ifndef $1\n# define $1\n#endif/mg;
|
2000-02-18 21:08:37 +00:00
|
|
|
$openssl_algorithm_defines = " /* no ciphers excluded */\n" if $openssl_algorithm_defines eq "";
|
2001-02-19 16:06:34 +00:00
|
|
|
$openssl_thread_defines =~ s/^\s*#\s*define\s+(.*)/#ifndef $1\n# define $1\n#endif/mg;
|
|
|
|
$openssl_sys_defines =~ s/^\s*#\s*define\s+(.*)/#ifndef $1\n# define $1\n#endif/mg;
|
|
|
|
$openssl_other_defines =~ s/^\s*#\s*define\s+(.*)/#ifndef $1\n# define $1\n#endif/mg;
|
2016-01-05 04:00:33 +00:00
|
|
|
|
2001-02-19 16:06:34 +00:00
|
|
|
print OUT $openssl_sys_defines;
|
2001-08-03 18:45:35 +00:00
|
|
|
print OUT "#ifndef OPENSSL_DOING_MAKEDEPEND\n\n";
|
2008-12-02 01:21:39 +00:00
|
|
|
print OUT $openssl_experimental_defines;
|
2016-01-05 04:00:33 +00:00
|
|
|
print OUT $openssl_api_defines;
|
2008-12-02 01:21:39 +00:00
|
|
|
print OUT "\n";
|
2001-02-19 16:06:34 +00:00
|
|
|
print OUT $openssl_algorithm_defines;
|
2008-12-02 01:21:39 +00:00
|
|
|
print OUT "\n#endif /* OPENSSL_DOING_MAKEDEPEND */\n\n";
|
2001-02-19 16:06:34 +00:00
|
|
|
print OUT $openssl_thread_defines;
|
|
|
|
print OUT $openssl_other_defines,"\n";
|
2000-02-18 11:15:32 +00:00
|
|
|
|
2001-02-22 17:36:41 +00:00
|
|
|
print OUT "/* The OPENSSL_NO_* macros are also defined as NO_* if the application\n";
|
|
|
|
print OUT " asks for it. This is a transient feature that is provided for those\n";
|
|
|
|
print OUT " who haven't had the time to do the appropriate changes in their\n";
|
|
|
|
print OUT " applications. */\n";
|
|
|
|
print OUT "#ifdef OPENSSL_ALGORITHM_DEFINES\n";
|
|
|
|
print OUT $openssl_algorithm_defines_trans;
|
|
|
|
print OUT "#endif\n\n";
|
|
|
|
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
print OUT "#define OPENSSL_CPUID_OBJ\n\n" if ($target{cpuid_obj} ne "mem_clr.o");
|
2004-07-26 22:01:50 +00:00
|
|
|
|
1998-12-21 10:52:47 +00:00
|
|
|
while (<IN>)
|
|
|
|
{
|
1999-04-25 10:28:26 +00:00
|
|
|
if (/^#define\s+OPENSSLDIR/)
|
2008-07-10 20:08:47 +00:00
|
|
|
{
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
my $foo = $config{openssldir};
|
2008-07-10 20:08:47 +00:00
|
|
|
$foo =~ s/\\/\\\\/g;
|
|
|
|
print OUT "#define OPENSSLDIR \"$foo\"\n";
|
|
|
|
}
|
2004-06-01 03:18:58 +00:00
|
|
|
elsif (/^#define\s+ENGINESDIR/)
|
2008-07-10 20:08:47 +00:00
|
|
|
{
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
my $foo = "$config{prefix}/$libdir/engines";
|
2008-07-10 20:08:47 +00:00
|
|
|
$foo =~ s/\\/\\\\/g;
|
|
|
|
print OUT "#define ENGINESDIR \"$foo\"\n";
|
|
|
|
}
|
Introduce the possibility to access global variables through
functions on platform were that's the best way to handle exporting
global variables in shared libraries. To enable this functionality,
one must configure with "EXPORT_VAR_AS_FN" or defined the C macro
"OPENSSL_EXPORT_VAR_AS_FUNCTION" in crypto/opensslconf.h (the latter
is normally done by Configure or something similar).
To implement a global variable, use the macro OPENSSL_IMPLEMENT_GLOBAL
in the source file (foo.c) like this:
OPENSSL_IMPLEMENT_GLOBAL(int,foo)=1;
OPENSSL_IMPLEMENT_GLOBAL(double,bar);
To declare a global variable, use the macros OPENSSL_DECLARE_GLOBAL
and OPENSSL_GLOBAL_REF in the header file (foo.h) like this:
OPENSSL_DECLARE_GLOBAL(int,foo);
#define foo OPENSSL_GLOBAL_REF(foo)
OPENSSL_DECLARE_GLOBAL(double,bar);
#define bar OPENSSL_GLOBAL_REF(bar)
The #defines are very important, and therefore so is including the
header file everywere where the defined globals are used.
The macro OPENSSL_EXPORT_VAR_AS_FUNCTION also affects the definition
of ASN.1 items, but that structure is a bt different.
The largest change is in util/mkdef.pl which has been enhanced with
better and easier to understand logic to choose which symbols should
go into the Windows .def files as well as a number of fixes and code
cleanup (among others, algorithm keywords are now sorted
lexicographically to avoid constant rewrites).
2001-03-02 10:38:19 +00:00
|
|
|
elsif (/^#((define)|(undef))\s+OPENSSL_EXPORT_VAR_AS_FUNCTION/)
|
|
|
|
{ printf OUT "#undef OPENSSL_EXPORT_VAR_AS_FUNCTION\n"
|
|
|
|
if $export_var_as_fn;
|
|
|
|
printf OUT "#%s OPENSSL_EXPORT_VAR_AS_FUNCTION\n",
|
|
|
|
($export_var_as_fn)?"define":"undef"; }
|
1999-06-09 13:23:38 +00:00
|
|
|
elsif (/^#define\s+OPENSSL_UNISTD/)
|
|
|
|
{
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
print OUT "#define OPENSSL_UNISTD $target{unistd}\n";
|
1999-06-09 13:23:38 +00:00
|
|
|
}
|
1999-04-24 22:59:36 +00:00
|
|
|
elsif (/^#((define)|(undef))\s+SIXTY_FOUR_BIT_LONG/)
|
1998-12-21 10:52:47 +00:00
|
|
|
{ printf OUT "#%s SIXTY_FOUR_BIT_LONG\n",($b64l)?"define":"undef"; }
|
|
|
|
elsif (/^#((define)|(undef))\s+SIXTY_FOUR_BIT/)
|
|
|
|
{ printf OUT "#%s SIXTY_FOUR_BIT\n",($b64)?"define":"undef"; }
|
|
|
|
elsif (/^#((define)|(undef))\s+THIRTY_TWO_BIT/)
|
|
|
|
{ printf OUT "#%s THIRTY_TWO_BIT\n",($b32)?"define":"undef"; }
|
|
|
|
elsif (/^#((define)|(undef))\s+SIXTEEN_BIT/)
|
|
|
|
{ printf OUT "#%s SIXTEEN_BIT\n",($b16)?"define":"undef"; }
|
|
|
|
elsif (/^#((define)|(undef))\s+EIGHT_BIT/)
|
|
|
|
{ printf OUT "#%s EIGHT_BIT\n",($b8)?"define":"undef"; }
|
|
|
|
elsif (/^#((define)|(undef))\s+BN_LLONG\s*$/)
|
|
|
|
{ printf OUT "#%s BN_LLONG\n",($bn_ll)?"define":"undef"; }
|
2016-01-13 17:12:17 +00:00
|
|
|
elsif (/^\#define\s+OSSL_DES_LONG\s+.*/)
|
|
|
|
{ printf OUT "#define OSSL_DES_LONG unsigned %s\n",
|
1998-12-21 10:52:47 +00:00
|
|
|
($des_int)?'int':'long'; }
|
1999-04-21 17:31:05 +00:00
|
|
|
elsif (/^\#(define|undef)\s+DES_PTR/)
|
1998-12-21 10:52:47 +00:00
|
|
|
{ printf OUT "#%s DES_PTR\n",($des_ptr)?'define':'undef'; }
|
|
|
|
elsif (/^\#(define|undef)\s+DES_RISC1/)
|
|
|
|
{ printf OUT "#%s DES_RISC1\n",($des_risc1)?'define':'undef'; }
|
|
|
|
elsif (/^\#(define|undef)\s+DES_RISC2/)
|
|
|
|
{ printf OUT "#%s DES_RISC2\n",($des_risc2)?'define':'undef'; }
|
|
|
|
elsif (/^\#(define|undef)\s+DES_UNROLL/)
|
|
|
|
{ printf OUT "#%s DES_UNROLL\n",($des_unroll)?'define':'undef'; }
|
1999-04-21 17:31:05 +00:00
|
|
|
elsif (/^#define\s+RC4_INT\s/)
|
1998-12-21 10:52:47 +00:00
|
|
|
{ printf OUT "#define RC4_INT unsigned %s\n",$type[$rc4_int]; }
|
1999-10-07 12:03:59 +00:00
|
|
|
elsif (/^#undef\s+RC4_CHUNK/)
|
|
|
|
{
|
|
|
|
printf OUT "#undef RC4_CHUNK\n" if $rc4_chunk==0;
|
|
|
|
printf OUT "#define RC4_CHUNK unsigned long\n" if $rc4_chunk==1;
|
|
|
|
printf OUT "#define RC4_CHUNK unsigned long long\n" if $rc4_chunk==2;
|
|
|
|
}
|
1999-04-21 17:31:05 +00:00
|
|
|
elsif (/^#((define)|(undef))\s+RC4_INDEX/)
|
1998-12-21 10:52:47 +00:00
|
|
|
{ printf OUT "#%s RC4_INDEX\n",($rc4_idx)?"define":"undef"; }
|
1999-05-05 00:23:53 +00:00
|
|
|
elsif (/^#(define|undef)\s+I386_ONLY/)
|
2005-02-22 10:29:51 +00:00
|
|
|
{ printf OUT "#%s I386_ONLY\n", ($processor eq "386")?
|
1999-05-05 00:23:53 +00:00
|
|
|
"define":"undef"; }
|
1999-04-21 17:31:05 +00:00
|
|
|
elsif (/^#define\s+MD2_INT\s/)
|
1998-12-21 10:52:47 +00:00
|
|
|
{ printf OUT "#define MD2_INT unsigned %s\n",$type[$md2_int]; }
|
1999-04-21 17:31:05 +00:00
|
|
|
elsif (/^#define\s+IDEA_INT\s/)
|
1998-12-21 10:52:47 +00:00
|
|
|
{printf OUT "#define IDEA_INT unsigned %s\n",$type[$idea_int];}
|
1999-04-21 17:31:05 +00:00
|
|
|
elsif (/^#define\s+RC2_INT\s/)
|
1998-12-21 10:52:47 +00:00
|
|
|
{printf OUT "#define RC2_INT unsigned %s\n",$type[$rc2_int];}
|
1999-04-21 17:31:05 +00:00
|
|
|
elsif (/^#(define|undef)\s+BF_PTR/)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
printf OUT "#undef BF_PTR\n" if $bf_ptr == 0;
|
|
|
|
printf OUT "#define BF_PTR\n" if $bf_ptr == 1;
|
|
|
|
printf OUT "#define BF_PTR2\n" if $bf_ptr == 2;
|
1999-04-21 17:31:05 +00:00
|
|
|
}
|
1998-12-21 10:52:47 +00:00
|
|
|
else
|
|
|
|
{ print OUT $_; }
|
|
|
|
}
|
1999-04-29 16:22:55 +00:00
|
|
|
close(IN);
|
2014-08-27 19:28:08 +00:00
|
|
|
print OUT "#ifdef __cplusplus\n";
|
|
|
|
print OUT "}\n";
|
|
|
|
print OUT "#endif\n";
|
1999-04-29 16:22:55 +00:00
|
|
|
close(OUT);
|
2015-03-26 20:33:18 +00:00
|
|
|
rename("include/openssl/opensslconf.h.new","include/openssl/opensslconf.h") || die "unable to rename include/openssl/opensslconf.h.new\n";
|
1999-02-13 23:13:32 +00:00
|
|
|
|
1999-06-09 13:23:38 +00:00
|
|
|
|
1999-02-13 23:13:32 +00:00
|
|
|
# Fix the date
|
|
|
|
|
1998-12-21 10:52:47 +00:00
|
|
|
print "SIXTY_FOUR_BIT_LONG mode\n" if $b64l;
|
|
|
|
print "SIXTY_FOUR_BIT mode\n" if $b64;
|
|
|
|
print "THIRTY_TWO_BIT mode\n" if $b32;
|
|
|
|
print "SIXTEEN_BIT mode\n" if $b16;
|
|
|
|
print "EIGHT_BIT mode\n" if $b8;
|
|
|
|
print "DES_PTR used\n" if $des_ptr;
|
|
|
|
print "DES_RISC1 used\n" if $des_risc1;
|
|
|
|
print "DES_RISC2 used\n" if $des_risc2;
|
|
|
|
print "DES_UNROLL used\n" if $des_unroll;
|
|
|
|
print "DES_INT used\n" if $des_int;
|
|
|
|
print "BN_LLONG mode\n" if $bn_ll;
|
|
|
|
print "RC4 uses u$type[$rc4_int]\n" if $rc4_int != $def_int;
|
|
|
|
print "RC4_INDEX mode\n" if $rc4_idx;
|
1999-10-07 12:03:59 +00:00
|
|
|
print "RC4_CHUNK is undefined\n" if $rc4_chunk==0;
|
|
|
|
print "RC4_CHUNK is unsigned long\n" if $rc4_chunk==1;
|
|
|
|
print "RC4_CHUNK is unsigned long long\n" if $rc4_chunk==2;
|
1998-12-21 10:52:47 +00:00
|
|
|
print "MD2 uses u$type[$md2_int]\n" if $md2_int != $def_int;
|
|
|
|
print "IDEA uses u$type[$idea_int]\n" if $idea_int != $def_int;
|
|
|
|
print "RC2 uses u$type[$rc2_int]\n" if $rc2_int != $def_int;
|
2014-05-26 16:19:28 +00:00
|
|
|
print "BF_PTR used\n" if $bf_ptr == 1;
|
|
|
|
print "BF_PTR2 used\n" if $bf_ptr == 2;
|
1999-03-07 14:05:36 +00:00
|
|
|
|
2016-01-12 21:25:30 +00:00
|
|
|
# Copy all Makefile.in to Makefile (except top-level)
|
|
|
|
use File::Find;
|
|
|
|
use IO::File;
|
|
|
|
find(sub {
|
|
|
|
return if ($_ ne "Makefile.in" || $File::Find::dir eq ".");
|
|
|
|
my $in = IO::File->new($_, "r") or
|
|
|
|
die sprintf "Error reading Makefile.in in %s: !$\n",
|
|
|
|
$File::Find::dir;
|
|
|
|
my $out = IO::File->new("Makefile", "w") or
|
|
|
|
die sprintf "Error writing Makefile in %s: !$\n",
|
|
|
|
$File::Find::dir;
|
|
|
|
print $out "# Generated from $_, do not edit\n";
|
|
|
|
while (my $line = <$in>) { print $out $line }
|
|
|
|
$in->close() or
|
|
|
|
die sprintf "Error reading Makefile.in in %s: !$\n",
|
|
|
|
$File::Find::dir;
|
|
|
|
$out->close() or
|
2016-01-12 22:35:22 +00:00
|
|
|
die sprintf "Error writing Makefile in %s: !$\n",
|
2016-01-12 21:25:30 +00:00
|
|
|
$File::Find::dir;
|
|
|
|
}, ".");
|
|
|
|
|
Refactor config - @MK1MF_Builds out, general build scheme in
Time to get rid of @MK1MF_Builds and introduce a more flexible
'build_scheme' configuration key. Its value may be a string or an
array of strings, meaning we need to teach resolve_config how to
handle ARRAY referenses.
The build scheme is a word that selects a function to create the
appropriate result files for a certain configuration. Currently valid
build schemes aer "mk1mf" and "unixmake", the plan is however to add
at least one other for a more universal build scheme.
Incidently, this also adds the functions 'add' and 'add_before', which
can be used in a configuration, so instead of having to repeatedly
write a sub like this:
key1 => sub { join(" ", @_, "myvalues"); },
key2 => sub { join(" ", "myvalues", @_); },
one could write this:
key1 => add(" ", "myvalues"),
key2 => add_before(" ", "myvalues"),
The good point with 'add' and 'add_before' is that they handle
inheritances where the values are a misture of scalars and ARRAYs. If
there are any ARRAY to be found, the resulting value will be an ARRAY,
otherwise it will be a scalar with all the incoming valued joined
together with the separator given as first argument to add/add_before.
Reviewed-by: Rich Salz <rsalz@openssl.org>
2015-05-18 12:31:49 +00:00
|
|
|
my %builders = (
|
|
|
|
unixmake => sub {
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
my $make_command = "$make PERL=\'$config{perl}\'";
|
Refactor config - @MK1MF_Builds out, general build scheme in
Time to get rid of @MK1MF_Builds and introduce a more flexible
'build_scheme' configuration key. Its value may be a string or an
array of strings, meaning we need to teach resolve_config how to
handle ARRAY referenses.
The build scheme is a word that selects a function to create the
appropriate result files for a certain configuration. Currently valid
build schemes aer "mk1mf" and "unixmake", the plan is however to add
at least one other for a more universal build scheme.
Incidently, this also adds the functions 'add' and 'add_before', which
can be used in a configuration, so instead of having to repeatedly
write a sub like this:
key1 => sub { join(" ", @_, "myvalues"); },
key2 => sub { join(" ", "myvalues", @_); },
one could write this:
key1 => add(" ", "myvalues"),
key2 => add_before(" ", "myvalues"),
The good point with 'add' and 'add_before' is that they handle
inheritances where the values are a misture of scalars and ARRAYs. If
there are any ARRAY to be found, the resulting value will be an ARRAY,
otherwise it will be a scalar with all the incoming valued joined
together with the separator given as first argument to add/add_before.
Reviewed-by: Rich Salz <rsalz@openssl.org>
2015-05-18 12:31:49 +00:00
|
|
|
my $make_targets = "";
|
|
|
|
$make_targets .= " depend" if $depflags ne $default_depflags && $make_depend;
|
|
|
|
(system $make_command.$make_targets) == 0 or die "make $make_targets failed"
|
|
|
|
if $make_targets ne "";
|
|
|
|
if ($depflags ne $default_depflags && !$make_depend) {
|
|
|
|
$warn_make_depend++;
|
|
|
|
}
|
|
|
|
},
|
|
|
|
mk1mf => sub {
|
1999-07-21 20:49:15 +00:00
|
|
|
open (OUT,">crypto/buildinf.h") || die "Can't open buildinf.h";
|
2015-05-18 00:46:21 +00:00
|
|
|
printf OUT <<"EOF";
|
1999-07-29 12:57:23 +00:00
|
|
|
#ifndef MK1MF_BUILD
|
|
|
|
/* auto-generated by Configure for crypto/cversion.c:
|
|
|
|
* for Unix builds, crypto/Makefile.ssl generates functional definitions;
|
|
|
|
* Windows builds (and other mk1mf builds) compile cversion.c with
|
|
|
|
* -DMK1MF_BUILD and use definitions added to this file by util/mk1mf.pl. */
|
|
|
|
#error "Windows builds (PLATFORM=$target) use mk1mf.pl-created Makefiles"
|
|
|
|
#endif
|
1999-07-09 14:04:57 +00:00
|
|
|
EOF
|
1999-04-21 17:31:05 +00:00
|
|
|
close(OUT);
|
|
|
|
|
Refactor config - @MK1MF_Builds out, general build scheme in
Time to get rid of @MK1MF_Builds and introduce a more flexible
'build_scheme' configuration key. Its value may be a string or an
array of strings, meaning we need to teach resolve_config how to
handle ARRAY referenses.
The build scheme is a word that selects a function to create the
appropriate result files for a certain configuration. Currently valid
build schemes aer "mk1mf" and "unixmake", the plan is however to add
at least one other for a more universal build scheme.
Incidently, this also adds the functions 'add' and 'add_before', which
can be used in a configuration, so instead of having to repeatedly
write a sub like this:
key1 => sub { join(" ", @_, "myvalues"); },
key2 => sub { join(" ", "myvalues", @_); },
one could write this:
key1 => add(" ", "myvalues"),
key2 => add_before(" ", "myvalues"),
The good point with 'add' and 'add_before' is that they handle
inheritances where the values are a misture of scalars and ARRAYs. If
there are any ARRAY to be found, the resulting value will be an ARRAY,
otherwise it will be a scalar with all the incoming valued joined
together with the separator given as first argument to add/add_before.
Reviewed-by: Rich Salz <rsalz@openssl.org>
2015-05-18 12:31:49 +00:00
|
|
|
# create the ms/version32.rc file if needed
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
if (! grep /^netware/, @{$target{build_scheme}}) {
|
Refactor config - @MK1MF_Builds out, general build scheme in
Time to get rid of @MK1MF_Builds and introduce a more flexible
'build_scheme' configuration key. Its value may be a string or an
array of strings, meaning we need to teach resolve_config how to
handle ARRAY referenses.
The build scheme is a word that selects a function to create the
appropriate result files for a certain configuration. Currently valid
build schemes aer "mk1mf" and "unixmake", the plan is however to add
at least one other for a more universal build scheme.
Incidently, this also adds the functions 'add' and 'add_before', which
can be used in a configuration, so instead of having to repeatedly
write a sub like this:
key1 => sub { join(" ", @_, "myvalues"); },
key2 => sub { join(" ", "myvalues", @_); },
one could write this:
key1 => add(" ", "myvalues"),
key2 => add_before(" ", "myvalues"),
The good point with 'add' and 'add_before' is that they handle
inheritances where the values are a misture of scalars and ARRAYs. If
there are any ARRAY to be found, the resulting value will be an ARRAY,
otherwise it will be a scalar with all the incoming valued joined
together with the separator given as first argument to add/add_before.
Reviewed-by: Rich Salz <rsalz@openssl.org>
2015-05-18 12:31:49 +00:00
|
|
|
my ($v1, $v2, $v3, $v4);
|
2016-01-11 23:17:12 +00:00
|
|
|
if ($config{version_num} =~ /^0x([0-9a-f]{1})([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{1})L$/i) {
|
2002-10-04 21:22:47 +00:00
|
|
|
$v1=hex $1;
|
|
|
|
$v2=hex $2;
|
|
|
|
$v3=hex $3;
|
|
|
|
$v4=hex $4;
|
Refactor config - @MK1MF_Builds out, general build scheme in
Time to get rid of @MK1MF_Builds and introduce a more flexible
'build_scheme' configuration key. Its value may be a string or an
array of strings, meaning we need to teach resolve_config how to
handle ARRAY referenses.
The build scheme is a word that selects a function to create the
appropriate result files for a certain configuration. Currently valid
build schemes aer "mk1mf" and "unixmake", the plan is however to add
at least one other for a more universal build scheme.
Incidently, this also adds the functions 'add' and 'add_before', which
can be used in a configuration, so instead of having to repeatedly
write a sub like this:
key1 => sub { join(" ", @_, "myvalues"); },
key2 => sub { join(" ", "myvalues", @_); },
one could write this:
key1 => add(" ", "myvalues"),
key2 => add_before(" ", "myvalues"),
The good point with 'add' and 'add_before' is that they handle
inheritances where the values are a misture of scalars and ARRAYs. If
there are any ARRAY to be found, the resulting value will be an ARRAY,
otherwise it will be a scalar with all the incoming valued joined
together with the separator given as first argument to add/add_before.
Reviewed-by: Rich Salz <rsalz@openssl.org>
2015-05-18 12:31:49 +00:00
|
|
|
}
|
|
|
|
open (OUT,">ms/version32.rc") || die "Can't open ms/version32.rc";
|
|
|
|
print OUT <<"EOF";
|
2002-10-04 21:22:47 +00:00
|
|
|
#include <winver.h>
|
|
|
|
|
|
|
|
LANGUAGE 0x09,0x01
|
|
|
|
|
|
|
|
1 VERSIONINFO
|
|
|
|
FILEVERSION $v1,$v2,$v3,$v4
|
|
|
|
PRODUCTVERSION $v1,$v2,$v3,$v4
|
|
|
|
FILEFLAGSMASK 0x3fL
|
|
|
|
#ifdef _DEBUG
|
|
|
|
FILEFLAGS 0x01L
|
|
|
|
#else
|
|
|
|
FILEFLAGS 0x00L
|
|
|
|
#endif
|
|
|
|
FILEOS VOS__WINDOWS32
|
|
|
|
FILETYPE VFT_DLL
|
|
|
|
FILESUBTYPE 0x0L
|
|
|
|
BEGIN
|
|
|
|
BLOCK "StringFileInfo"
|
|
|
|
BEGIN
|
|
|
|
BLOCK "040904b0"
|
|
|
|
BEGIN
|
2014-05-26 16:19:28 +00:00
|
|
|
// Required:
|
2002-10-04 21:22:47 +00:00
|
|
|
VALUE "CompanyName", "The OpenSSL Project, http://www.openssl.org/\\0"
|
|
|
|
VALUE "FileDescription", "OpenSSL Shared Library\\0"
|
2016-01-11 23:17:12 +00:00
|
|
|
VALUE "FileVersion", "$config{version}\\0"
|
2002-10-04 21:22:47 +00:00
|
|
|
#if defined(CRYPTO)
|
|
|
|
VALUE "InternalName", "libeay32\\0"
|
|
|
|
VALUE "OriginalFilename", "libeay32.dll\\0"
|
|
|
|
#elif defined(SSL)
|
|
|
|
VALUE "InternalName", "ssleay32\\0"
|
|
|
|
VALUE "OriginalFilename", "ssleay32.dll\\0"
|
2015-02-04 22:51:01 +00:00
|
|
|
#endif
|
2002-10-04 21:22:47 +00:00
|
|
|
VALUE "ProductName", "The OpenSSL Toolkit\\0"
|
2016-01-11 23:17:12 +00:00
|
|
|
VALUE "ProductVersion", "$config{version}\\0"
|
2002-10-04 21:22:47 +00:00
|
|
|
// Optional:
|
|
|
|
//VALUE "Comments", "\\0"
|
2015-09-27 07:23:08 +00:00
|
|
|
VALUE "LegalCopyright", "Copyright © 1998-2015 The OpenSSL Project. Copyright © 1995-1998 Eric A. Young, Tim J. Hudson. All rights reserved.\\0"
|
2002-10-04 21:22:47 +00:00
|
|
|
//VALUE "LegalTrademarks", "\\0"
|
|
|
|
//VALUE "PrivateBuild", "\\0"
|
|
|
|
//VALUE "SpecialBuild", "\\0"
|
|
|
|
END
|
|
|
|
END
|
|
|
|
BLOCK "VarFileInfo"
|
|
|
|
BEGIN
|
|
|
|
VALUE "Translation", 0x409, 0x4b0
|
|
|
|
END
|
|
|
|
END
|
|
|
|
EOF
|
Refactor config - @MK1MF_Builds out, general build scheme in
Time to get rid of @MK1MF_Builds and introduce a more flexible
'build_scheme' configuration key. Its value may be a string or an
array of strings, meaning we need to teach resolve_config how to
handle ARRAY referenses.
The build scheme is a word that selects a function to create the
appropriate result files for a certain configuration. Currently valid
build schemes aer "mk1mf" and "unixmake", the plan is however to add
at least one other for a more universal build scheme.
Incidently, this also adds the functions 'add' and 'add_before', which
can be used in a configuration, so instead of having to repeatedly
write a sub like this:
key1 => sub { join(" ", @_, "myvalues"); },
key2 => sub { join(" ", "myvalues", @_); },
one could write this:
key1 => add(" ", "myvalues"),
key2 => add_before(" ", "myvalues"),
The good point with 'add' and 'add_before' is that they handle
inheritances where the values are a misture of scalars and ARRAYs. If
there are any ARRAY to be found, the resulting value will be an ARRAY,
otherwise it will be a scalar with all the incoming valued joined
together with the separator given as first argument to add/add_before.
Reviewed-by: Rich Salz <rsalz@openssl.org>
2015-05-18 12:31:49 +00:00
|
|
|
close(OUT);
|
|
|
|
}
|
|
|
|
},
|
|
|
|
);
|
|
|
|
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
my ($builder, @builder_opts) = @{$target{build_scheme}};
|
Refactor config - @MK1MF_Builds out, general build scheme in
Time to get rid of @MK1MF_Builds and introduce a more flexible
'build_scheme' configuration key. Its value may be a string or an
array of strings, meaning we need to teach resolve_config how to
handle ARRAY referenses.
The build scheme is a word that selects a function to create the
appropriate result files for a certain configuration. Currently valid
build schemes aer "mk1mf" and "unixmake", the plan is however to add
at least one other for a more universal build scheme.
Incidently, this also adds the functions 'add' and 'add_before', which
can be used in a configuration, so instead of having to repeatedly
write a sub like this:
key1 => sub { join(" ", @_, "myvalues"); },
key2 => sub { join(" ", "myvalues", @_); },
one could write this:
key1 => add(" ", "myvalues"),
key2 => add_before(" ", "myvalues"),
The good point with 'add' and 'add_before' is that they handle
inheritances where the values are a misture of scalars and ARRAYs. If
there are any ARRAY to be found, the resulting value will be an ARRAY,
otherwise it will be a scalar with all the incoming valued joined
together with the separator given as first argument to add/add_before.
Reviewed-by: Rich Salz <rsalz@openssl.org>
2015-05-18 12:31:49 +00:00
|
|
|
$builders{$builder}->(@builder_opts);
|
2014-05-26 16:19:28 +00:00
|
|
|
|
2015-05-18 00:46:21 +00:00
|
|
|
print <<"EOF";
|
1999-09-09 20:21:10 +00:00
|
|
|
|
2000-02-01 01:35:29 +00:00
|
|
|
Configured for $target.
|
1999-09-09 20:21:10 +00:00
|
|
|
EOF
|
1999-04-29 16:10:09 +00:00
|
|
|
|
2015-05-18 00:46:21 +00:00
|
|
|
print <<"EOF" if (!$no_threads && !$threads);
|
1999-04-29 16:10:09 +00:00
|
|
|
|
|
|
|
The library could not be configured for supporting multi-threaded
|
|
|
|
applications as the compiler options required on this system are not known.
|
1999-06-26 21:25:01 +00:00
|
|
|
See file INSTALL for details if you need multi-threading.
|
1999-04-23 22:13:45 +00:00
|
|
|
EOF
|
|
|
|
|
2015-05-18 00:46:21 +00:00
|
|
|
print <<"EOF" if ($no_shared_warn);
|
2003-01-11 11:40:39 +00:00
|
|
|
|
2015-12-10 17:31:01 +00:00
|
|
|
You gave the option 'shared', which is not supported on this platform, so
|
|
|
|
we will pretend you gave the option 'no-shared'. If you know how to implement
|
|
|
|
shared libraries, please let us know (but please first make sure you have
|
|
|
|
tried with a current version of OpenSSL).
|
|
|
|
EOF
|
|
|
|
|
2015-05-18 00:46:21 +00:00
|
|
|
print <<"EOF" if ($warn_make_depend);
|
2015-12-10 17:31:01 +00:00
|
|
|
|
|
|
|
*** Because of configuration changes, you MUST do the following before
|
|
|
|
*** building:
|
|
|
|
|
|
|
|
make depend
|
2003-01-11 11:40:39 +00:00
|
|
|
EOF
|
|
|
|
|
1998-12-21 10:52:47 +00:00
|
|
|
exit(0);
|
|
|
|
|
2015-05-18 00:57:24 +00:00
|
|
|
######################################################################
|
|
|
|
#
|
|
|
|
# Helpers and utility functions
|
|
|
|
#
|
|
|
|
|
|
|
|
# Configuration file reading #########################################
|
|
|
|
|
|
|
|
# Helper function to implement conditional inheritance depending on the
|
|
|
|
# value of $no_asm. Used in inherit_from values as follows:
|
|
|
|
#
|
|
|
|
# inherit_from => [ "template", asm("asm_tmpl") ]
|
|
|
|
#
|
|
|
|
sub asm {
|
|
|
|
my @x = @_;
|
|
|
|
sub {
|
|
|
|
$no_asm ? () : @x;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Refactor config - @MK1MF_Builds out, general build scheme in
Time to get rid of @MK1MF_Builds and introduce a more flexible
'build_scheme' configuration key. Its value may be a string or an
array of strings, meaning we need to teach resolve_config how to
handle ARRAY referenses.
The build scheme is a word that selects a function to create the
appropriate result files for a certain configuration. Currently valid
build schemes aer "mk1mf" and "unixmake", the plan is however to add
at least one other for a more universal build scheme.
Incidently, this also adds the functions 'add' and 'add_before', which
can be used in a configuration, so instead of having to repeatedly
write a sub like this:
key1 => sub { join(" ", @_, "myvalues"); },
key2 => sub { join(" ", "myvalues", @_); },
one could write this:
key1 => add(" ", "myvalues"),
key2 => add_before(" ", "myvalues"),
The good point with 'add' and 'add_before' is that they handle
inheritances where the values are a misture of scalars and ARRAYs. If
there are any ARRAY to be found, the resulting value will be an ARRAY,
otherwise it will be a scalar with all the incoming valued joined
together with the separator given as first argument to add/add_before.
Reviewed-by: Rich Salz <rsalz@openssl.org>
2015-05-18 12:31:49 +00:00
|
|
|
# Helper function to implement adding values to already existing configuration
|
|
|
|
# values. It handles elements that are ARRAYs, CODEs and scalars
|
|
|
|
sub _add {
|
|
|
|
my $separator = shift;
|
|
|
|
|
|
|
|
# If there's any ARRAY in the collection of values, we will return
|
|
|
|
# an ARRAY of combined values, otherwise a string of joined values
|
|
|
|
# with $separator as the separator.
|
|
|
|
my $found_array = 0;
|
|
|
|
|
|
|
|
my @values =
|
|
|
|
map {
|
|
|
|
if (ref($_) eq "ARRAY") {
|
|
|
|
$found_array = 1;
|
|
|
|
@$_;
|
|
|
|
} else {
|
|
|
|
$_;
|
|
|
|
}
|
|
|
|
} (@_);
|
|
|
|
|
|
|
|
if ($found_array) {
|
|
|
|
[ @values ];
|
|
|
|
} else {
|
|
|
|
join($separator, @values);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
sub add_before {
|
|
|
|
my $separator = shift;
|
|
|
|
my @x = @_;
|
|
|
|
sub { _add($separator, @x, @_) };
|
|
|
|
}
|
|
|
|
sub add {
|
|
|
|
my $separator = shift;
|
|
|
|
my @x = @_;
|
|
|
|
sub { _add($separator, @_, @x) };
|
|
|
|
}
|
|
|
|
|
2015-05-18 00:57:24 +00:00
|
|
|
# configuration reader, evaluates the input file as a perl script and expects
|
|
|
|
# it to fill %targets with target configurations. Those are then added to
|
|
|
|
# %table.
|
|
|
|
sub read_config {
|
|
|
|
my $fname = shift;
|
|
|
|
open(CONFFILE, "< $fname")
|
|
|
|
or die "Can't open configuration file '$fname'!\n";
|
|
|
|
my $x = $/;
|
|
|
|
undef $/;
|
|
|
|
my $content = <CONFFILE>;
|
|
|
|
$/ = $x;
|
|
|
|
close(CONFFILE);
|
|
|
|
my %targets = ();
|
|
|
|
{
|
|
|
|
local %table = %::table; # Protect %table from tampering
|
|
|
|
|
|
|
|
eval $content;
|
|
|
|
warn $@ if $@;
|
|
|
|
}
|
|
|
|
|
|
|
|
# For each target, check that it's configured with a hash table.
|
|
|
|
foreach (keys %targets) {
|
|
|
|
if (ref($targets{$_}) ne "HASH") {
|
|
|
|
if (ref($targets{$_}) eq "") {
|
|
|
|
warn "Deprecated target configuration for $_, ignoring...\n";
|
|
|
|
} else {
|
|
|
|
warn "Misconfigured target configuration for $_ (should be a hash table), ignoring...\n";
|
|
|
|
}
|
|
|
|
delete $targets{$_};
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
%table = (%table, %targets);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
# configuration resolver. Will only resolve all the lazy evalutation
|
|
|
|
# codeblocks for the chozen target and all those it inherits from,
|
|
|
|
# recursively
|
|
|
|
sub resolve_config {
|
|
|
|
my $target = shift;
|
|
|
|
my @breadcrumbs = @_;
|
|
|
|
|
|
|
|
if (grep { $_ eq $target } @breadcrumbs) {
|
|
|
|
die "inherit_from loop! target backtrace:\n "
|
|
|
|
,$target,"\n ",join("\n ", @breadcrumbs),"\n";
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!defined($table{$target})) {
|
|
|
|
warn "Warning! target $target doesn't exist!\n";
|
|
|
|
return ();
|
|
|
|
}
|
|
|
|
# Recurse through all inheritances. They will be resolved on the
|
|
|
|
# fly, so when this operation is done, they will all just be a
|
|
|
|
# bunch of attributes with string values.
|
|
|
|
# What we get here, though, are keys with references to lists of
|
|
|
|
# the combined values of them all. We will deal with lists after
|
|
|
|
# this stage is done.
|
|
|
|
my %combined_inheritance = ();
|
|
|
|
if ($table{$target}->{inherit_from}) {
|
|
|
|
my @inherit_from =
|
|
|
|
map { ref($_) eq "CODE" ? $_->() : $_ } @{$table{$target}->{inherit_from}};
|
|
|
|
foreach (@inherit_from) {
|
|
|
|
my %inherited_config = resolve_config($_, $target, @breadcrumbs);
|
|
|
|
|
|
|
|
# 'template' is a marker that's considered private to
|
|
|
|
# the config that had it.
|
|
|
|
delete $inherited_config{template};
|
|
|
|
|
|
|
|
map {
|
|
|
|
if (!$combined_inheritance{$_}) {
|
|
|
|
$combined_inheritance{$_} = [];
|
|
|
|
}
|
|
|
|
push @{$combined_inheritance{$_}}, $inherited_config{$_};
|
|
|
|
} keys %inherited_config;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
# We won't need inherit_from in this target any more, since we've
|
|
|
|
# resolved all the inheritances that lead to this
|
|
|
|
delete $table{$target}->{inherit_from};
|
|
|
|
|
|
|
|
# Now is the time to deal with those lists. Here's the place to
|
|
|
|
# decide what shall be done with those lists, all based on the
|
|
|
|
# values of the target we're currently dealing with.
|
|
|
|
# - If a value is a coderef, it will be executed with the list of
|
|
|
|
# inherited values as arguments.
|
|
|
|
# - If the corresponding key doesn't have a value at all or is the
|
|
|
|
# emoty string, the inherited value list will be run through the
|
|
|
|
# default combiner (below), and the result becomes this target's
|
|
|
|
# value.
|
|
|
|
# - Otherwise, this target's value is assumed to be a string that
|
|
|
|
# will simply override the inherited list of values.
|
Refactor config - @MK1MF_Builds out, general build scheme in
Time to get rid of @MK1MF_Builds and introduce a more flexible
'build_scheme' configuration key. Its value may be a string or an
array of strings, meaning we need to teach resolve_config how to
handle ARRAY referenses.
The build scheme is a word that selects a function to create the
appropriate result files for a certain configuration. Currently valid
build schemes aer "mk1mf" and "unixmake", the plan is however to add
at least one other for a more universal build scheme.
Incidently, this also adds the functions 'add' and 'add_before', which
can be used in a configuration, so instead of having to repeatedly
write a sub like this:
key1 => sub { join(" ", @_, "myvalues"); },
key2 => sub { join(" ", "myvalues", @_); },
one could write this:
key1 => add(" ", "myvalues"),
key2 => add_before(" ", "myvalues"),
The good point with 'add' and 'add_before' is that they handle
inheritances where the values are a misture of scalars and ARRAYs. If
there are any ARRAY to be found, the resulting value will be an ARRAY,
otherwise it will be a scalar with all the incoming valued joined
together with the separator given as first argument to add/add_before.
Reviewed-by: Rich Salz <rsalz@openssl.org>
2015-05-18 12:31:49 +00:00
|
|
|
my $default_combiner = add(" ");
|
2015-05-18 00:57:24 +00:00
|
|
|
|
|
|
|
my %all_keys =
|
|
|
|
map { $_ => 1 } (keys %combined_inheritance,
|
|
|
|
keys %{$table{$target}});
|
|
|
|
foreach (sort keys %all_keys) {
|
|
|
|
|
|
|
|
# Current target doesn't have a value for the current key?
|
|
|
|
# Assign it the default combiner, the rest of this loop body
|
|
|
|
# will handle it just like any other coderef.
|
|
|
|
if (!exists $table{$target}->{$_}) {
|
|
|
|
$table{$target}->{$_} = $default_combiner;
|
|
|
|
}
|
|
|
|
|
|
|
|
my $valuetype = ref($table{$target}->{$_});
|
|
|
|
if ($valuetype eq "CODE") {
|
|
|
|
# CODE reference, execute it with the inherited values as
|
|
|
|
# arguments.
|
|
|
|
$table{$target}->{$_} =
|
|
|
|
$table{$target}->{$_}->(@{$combined_inheritance{$_}});
|
Refactor config - @MK1MF_Builds out, general build scheme in
Time to get rid of @MK1MF_Builds and introduce a more flexible
'build_scheme' configuration key. Its value may be a string or an
array of strings, meaning we need to teach resolve_config how to
handle ARRAY referenses.
The build scheme is a word that selects a function to create the
appropriate result files for a certain configuration. Currently valid
build schemes aer "mk1mf" and "unixmake", the plan is however to add
at least one other for a more universal build scheme.
Incidently, this also adds the functions 'add' and 'add_before', which
can be used in a configuration, so instead of having to repeatedly
write a sub like this:
key1 => sub { join(" ", @_, "myvalues"); },
key2 => sub { join(" ", "myvalues", @_); },
one could write this:
key1 => add(" ", "myvalues"),
key2 => add_before(" ", "myvalues"),
The good point with 'add' and 'add_before' is that they handle
inheritances where the values are a misture of scalars and ARRAYs. If
there are any ARRAY to be found, the resulting value will be an ARRAY,
otherwise it will be a scalar with all the incoming valued joined
together with the separator given as first argument to add/add_before.
Reviewed-by: Rich Salz <rsalz@openssl.org>
2015-05-18 12:31:49 +00:00
|
|
|
} elsif ($valuetype eq "ARRAY" || $valuetype eq "") {
|
|
|
|
# ARRAY or Scalar, just leave it as is.
|
2015-05-18 00:57:24 +00:00
|
|
|
} else {
|
|
|
|
# Some other type of reference that we don't handle.
|
|
|
|
# Better to abort at this point.
|
|
|
|
die "cannot handle reference type $valuetype,"
|
|
|
|
," found in target $target -> $_\n";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
# Finally done, return the result.
|
|
|
|
return %{$table{$target}};
|
|
|
|
}
|
|
|
|
|
1999-04-24 22:59:36 +00:00
|
|
|
sub usage
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
1999-04-24 22:59:36 +00:00
|
|
|
print STDERR $usage;
|
2000-02-21 00:55:45 +00:00
|
|
|
print STDERR "\npick os/compiler from:\n";
|
1998-12-28 17:08:48 +00:00
|
|
|
my $j=0;
|
1999-02-07 18:22:15 +00:00
|
|
|
my $i;
|
2000-02-21 00:55:45 +00:00
|
|
|
my $k=0;
|
1999-02-07 18:22:15 +00:00
|
|
|
foreach $i (sort keys %table)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
2015-05-18 00:57:24 +00:00
|
|
|
next if $table{$i}->{template};
|
1999-04-24 22:59:36 +00:00
|
|
|
next if $i =~ /^debug/;
|
2000-02-21 00:55:45 +00:00
|
|
|
$k += length($i) + 1;
|
|
|
|
if ($k > 78)
|
|
|
|
{
|
|
|
|
print STDERR "\n";
|
|
|
|
$k=length($i);
|
|
|
|
}
|
|
|
|
print STDERR $i . " ";
|
1999-04-24 22:59:36 +00:00
|
|
|
}
|
|
|
|
foreach $i (sort keys %table)
|
|
|
|
{
|
2015-05-18 00:57:24 +00:00
|
|
|
next if $table{$i}->{template};
|
1999-04-24 22:59:36 +00:00
|
|
|
next if $i !~ /^debug/;
|
2000-02-21 00:55:45 +00:00
|
|
|
$k += length($i) + 1;
|
|
|
|
if ($k > 78)
|
|
|
|
{
|
|
|
|
print STDERR "\n";
|
|
|
|
$k=length($i);
|
|
|
|
}
|
|
|
|
print STDERR $i . " ";
|
1998-12-21 10:52:47 +00:00
|
|
|
}
|
2000-02-21 00:55:45 +00:00
|
|
|
print STDERR "\n\nNOTE: If in doubt, on Unix-ish systems use './config'.\n";
|
1999-04-24 22:59:36 +00:00
|
|
|
exit(1);
|
1998-12-21 10:52:47 +00:00
|
|
|
}
|
|
|
|
|
2015-05-18 10:53:38 +00:00
|
|
|
# Configuration printer ##############################################
|
|
|
|
|
|
|
|
sub print_table_entry
|
|
|
|
{
|
|
|
|
my $target = shift;
|
|
|
|
my %target = resolve_config($target);
|
|
|
|
my $type = shift;
|
|
|
|
|
|
|
|
# Don't print the templates
|
|
|
|
return if $target{template};
|
|
|
|
|
|
|
|
my @sequence = (
|
|
|
|
"cc",
|
|
|
|
"cflags",
|
|
|
|
"debug_cflags",
|
|
|
|
"release_cflags",
|
|
|
|
"unistd",
|
|
|
|
"thread_cflag",
|
|
|
|
"sys_id",
|
|
|
|
"lflags",
|
|
|
|
"debug_lflags",
|
|
|
|
"release_lflags",
|
|
|
|
"bn_ops",
|
|
|
|
"cpuid_obj",
|
|
|
|
"bn_obj",
|
|
|
|
"ec_obj",
|
|
|
|
"des_obj",
|
|
|
|
"aes_obj",
|
|
|
|
"bf_obj",
|
|
|
|
"md5_obj",
|
|
|
|
"sha1_obj",
|
|
|
|
"cast_obj",
|
|
|
|
"rc4_obj",
|
|
|
|
"rmd160_obj",
|
|
|
|
"rc5_obj",
|
|
|
|
"wp_obj",
|
|
|
|
"cmll_obj",
|
|
|
|
"modes_obj",
|
|
|
|
"engines_obj",
|
|
|
|
"perlasm_scheme",
|
|
|
|
"dso_scheme",
|
|
|
|
"shared_target",
|
|
|
|
"shared_cflag",
|
|
|
|
"shared_ldflag",
|
|
|
|
"shared_extension",
|
|
|
|
"ranlib",
|
|
|
|
"arflags",
|
|
|
|
"multilib",
|
|
|
|
);
|
|
|
|
|
|
|
|
if ($type eq "TABLE") {
|
|
|
|
print "\n";
|
|
|
|
print "*** $target\n";
|
|
|
|
printf "\$%-12s = %s\n", $_, $target{$_} foreach (@sequence);
|
|
|
|
} elsif ($type eq "HASH") {
|
|
|
|
my $largest =
|
|
|
|
length((sort { length($a) <=> length($b) } @sequence)[-1]);
|
|
|
|
print " '$target' => {\n";
|
|
|
|
foreach (@sequence) {
|
|
|
|
if ($target{$_}) {
|
|
|
|
print " '",$_,"'"," " x ($largest - length($_))," => '",$target{$_},"',\n";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
print " },\n";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
# Utility routines ###################################################
|
|
|
|
|
1999-04-01 12:34:33 +00:00
|
|
|
sub which
|
|
|
|
{
|
|
|
|
my($name)=@_;
|
|
|
|
my $path;
|
|
|
|
foreach $path (split /:/, $ENV{PATH})
|
|
|
|
{
|
2004-06-28 22:01:37 +00:00
|
|
|
if (-f "$path/$name$exe_ext" and -x _)
|
1999-04-01 12:34:33 +00:00
|
|
|
{
|
2004-06-28 22:01:37 +00:00
|
|
|
return "$path/$name$exe_ext" unless ($name eq "perl" and
|
|
|
|
system("$path/$name$exe_ext -e " . '\'exit($]<5.0);\''));
|
1999-04-01 12:34:33 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
sub print_table_entry
|
1999-04-24 22:59:36 +00:00
|
|
|
{
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
my $target = shift;
|
|
|
|
my %target = resolve_config($target);
|
|
|
|
my $type = shift;
|
|
|
|
|
|
|
|
# Don't print the templates
|
|
|
|
return if $target{template};
|
|
|
|
|
|
|
|
if ($type eq "TABLE") {
|
|
|
|
print <<"EOF"
|
|
|
|
|
|
|
|
*** $target
|
|
|
|
\$cc = $target{cc}
|
|
|
|
\$cflags = $target{cflags}
|
|
|
|
\$debug_cflags = $target{debug_cflags}
|
|
|
|
\$release_cflags = $target{release_cflags}
|
|
|
|
\$unistd = $target{unistd}
|
|
|
|
\$thread_cflag = $target{thread_cflag}
|
|
|
|
\$sys_id = $target{sys_id}
|
|
|
|
\$lflags = $target{lflags}
|
|
|
|
\$debug_lflags = $target{debug_lflags}
|
|
|
|
\$release_lflags = $target{release_lflags}
|
|
|
|
\$bn_ops = $target{bn_ops}
|
|
|
|
\$cpuid_obj = $target{cpuid_obj}
|
|
|
|
\$bn_obj = $target{bn_obj}
|
|
|
|
\$ec_obj = $target{ec_obj}
|
|
|
|
\$des_obj = $target{des_obj}
|
|
|
|
\$aes_obj = $target{aes_obj}
|
|
|
|
\$bf_obj = $target{bf_obj}
|
|
|
|
\$md5_obj = $target{md5_obj}
|
|
|
|
\$sha1_obj = $target{sha1_obj}
|
|
|
|
\$cast_obj = $target{cast_obj}
|
|
|
|
\$rc4_obj = $target{rc4_obj}
|
|
|
|
\$rmd160_obj = $target{rmd160_obj}
|
|
|
|
\$rc5_obj = $target{rc5_obj}
|
|
|
|
\$wp_obj = $target{wp_obj}
|
|
|
|
\$cmll_obj = $target{cmll_obj}
|
|
|
|
\$modes_obj = $target{modes_obj}
|
|
|
|
\$engines_obj = $target{engines_obj}
|
|
|
|
\$chacha_obj = $target{chacha_obj}
|
|
|
|
\$poly1305_obj = $target{poly1305_obj}
|
|
|
|
\$perlasm_scheme = $target{perlasm_scheme}
|
|
|
|
\$dso_scheme = $target{dso_scheme}
|
|
|
|
\$shared_target= $target{shared_target}
|
|
|
|
\$shared_cflag = $target{shared_cflag}
|
|
|
|
\$shared_ldflag = $target{shared_ldflag}
|
|
|
|
\$shared_extension = $target{shared_extension}
|
|
|
|
\$ranlib = $target{ranlib}
|
|
|
|
\$arflags = $target{arflags}
|
|
|
|
\$multilib = $target{multilib}
|
|
|
|
EOF
|
|
|
|
} elsif ($type eq "HASH") {
|
|
|
|
my @sequence = (
|
|
|
|
"cc",
|
|
|
|
"cflags",
|
|
|
|
"debug_cflags",
|
|
|
|
"release_cflags",
|
|
|
|
"unistd",
|
|
|
|
"thread_cflag",
|
|
|
|
"sys_id",
|
|
|
|
"lflags",
|
|
|
|
"debug_lflags",
|
|
|
|
"release_lflags",
|
|
|
|
"bn_ops",
|
|
|
|
"cpuid_obj",
|
|
|
|
"bn_obj",
|
|
|
|
"ec_obj",
|
|
|
|
"des_obj",
|
|
|
|
"aes_obj",
|
|
|
|
"bf_obj",
|
|
|
|
"md5_obj",
|
|
|
|
"sha1_obj",
|
|
|
|
"cast_obj",
|
|
|
|
"rc4_obj",
|
|
|
|
"rmd160_obj",
|
|
|
|
"rc5_obj",
|
|
|
|
"wp_obj",
|
|
|
|
"cmll_obj",
|
|
|
|
"modes_obj",
|
|
|
|
"engines_obj",
|
|
|
|
"chacha_obj",
|
|
|
|
"poly1305_obj",
|
|
|
|
"perlasm_scheme",
|
|
|
|
"dso_scheme",
|
|
|
|
"shared_target",
|
|
|
|
"shared_cflag",
|
|
|
|
"shared_ldflag",
|
|
|
|
"shared_extension",
|
|
|
|
"ranlib",
|
|
|
|
"arflags",
|
|
|
|
"multilib",
|
|
|
|
);
|
|
|
|
my $largest =
|
|
|
|
length((sort { length($a) <=> length($b) } @sequence)[-1]);
|
|
|
|
print " '$target' => {\n";
|
|
|
|
foreach (@sequence) {
|
|
|
|
if ($target{$_}) {
|
|
|
|
print " '",$_,"'"," " x ($largest - length($_))," => '",$target{$_},"',\n";
|
1999-04-24 22:59:36 +00:00
|
|
|
}
|
Refactor file writing - introduce template driven file writing
apps/CA.pl and tools/c_rehash are built from template files. So far,
this was done by Configure, which created its own problems as it
forced everyone to reconfigure just because one of the template files
had changed.
Instead, have those files created as part of the normal build in apps/
and in tools/.
Furthermore, this prepares for a future where Configure may produce
entirely other build files than Makefile, and the latter can't be
guaranteed to be the holder of all information for other scripts.
Instead, configdata.pm (described below) becomes the center of
configuration information.
This introduces a few new things:
%config a hash table to hold all kinds of configuration data
that can be used by any other script.
configdata.pm a perl module that Configure writes. It currently
holds the hash tables %config and %target.
util/dofile.pl a script that takes a template on STDIN and outputs
the result after applying configuration data on it.
It's supposed to be called like this:
perl -I$(TOP) -Mconfigdata < template > result
or
perl -I$(TOP) -Mconfigdata templ1 templ2 ... > result
Note: util/dofile.pl requires Text::Template.
As part of this changed, remove a number of variables that are really
just copies of entries in %target, and use %target directly. The
exceptions are $target{cflags} and $target{lflags}, they do get copied
to $cflags and $lflags. The reason for this is that those variable
potentially go through a lot of changes and would rather deserve a
place in %config. That, however, is for another commit.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-05-18 20:35:23 +00:00
|
|
|
}
|
|
|
|
print " },\n";
|
|
|
|
}
|
1999-04-24 22:59:36 +00:00
|
|
|
}
|
1999-05-28 23:18:51 +00:00
|
|
|
|
2015-05-18 01:33:55 +00:00
|
|
|
sub quotify {
|
|
|
|
my %processors = (
|
|
|
|
perl => sub { my $x = shift;
|
|
|
|
$x =~ s/([\\\$\@"])/\\$1/g;
|
|
|
|
return '"'.$x.'"'; },
|
|
|
|
);
|
|
|
|
my $for = shift;
|
|
|
|
my $processor =
|
|
|
|
defined($processors{$for}) ? $processors{$for} : sub { shift; };
|
|
|
|
|
|
|
|
map { $processor->($_); } @_;
|
|
|
|
}
|