[openssl-commits] [openssl] master update
Richard Levitte
levitte at openssl.org
Wed Sep 12 22:41:29 UTC 2018
The branch master has been updated
via aa343982d2a2449633382a3ba032871949c788b4 (commit)
via f619622715af3904ee1d6e0affd563f8ed799ff0 (commit)
from c402e943cd0d748ca2a74a37caeccdfc59ce2870 (commit)
- Log -----------------------------------------------------------------
commit aa343982d2a2449633382a3ba032871949c788b4
Author: Richard Levitte <levitte at openssl.org>
Date: Wed Sep 12 13:32:14 2018 +0200
Update the documentation on libobj2shlib / obj2shlib
Reviewed-by: Tim Hudson <tjh at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7198)
commit f619622715af3904ee1d6e0affd563f8ed799ff0
Author: Richard Levitte <levitte at openssl.org>
Date: Wed Sep 12 10:59:06 2018 +0200
VMS: stop trying to build shared libraries from static ones
The possibility to do this was killed when we started producing object
file names with encoded intention (and possibly different builds), and
leads to build errors.
With that, 'libobj2shlib' is renamed to 'obj2shlib' to reflect this
design change. The old name is still used if the new one isn't
available, for the sake of backward compatibility.
Reviewed-by: Tim Hudson <tjh at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7198)
-----------------------------------------------------------------------
Summary of changes:
Configurations/README | 58 +++++++++++-----------
Configurations/README.design | 95 +++++++++++++++++-------------------
Configurations/common.tmpl | 5 +-
Configurations/descrip.mms.tmpl | 6 +--
Configurations/unix-Makefile.tmpl | 2 +-
Configurations/windows-makefile.tmpl | 2 +-
6 files changed, 82 insertions(+), 86 deletions(-)
diff --git a/Configurations/README b/Configurations/README
index 4457b94..6ae981f 100644
--- a/Configurations/README
+++ b/Configurations/README
@@ -636,8 +636,9 @@ They are all expected to return a string with the lines they produce.
incs => [ "INCL/PATH", ... ]
intent => one of "lib", "dso", "bin" );
- 'obj' has the intended object file *without*
- extension, src2obj() is expected to add that.
+ 'obj' has the intended object file with '.o'
+ extension, src2obj() is expected to change it to
+ something more suitable for the platform.
'srcs' has the list of source files to build the
object file, with the first item being the source
file that directly corresponds to the object file.
@@ -657,33 +658,36 @@ They are all expected to return a string with the lines they produce.
'lib' has the intended library file name *without*
extension, obj2lib is expected to add that. 'objs'
- has the list of object files (also *without*
- extension) to build this library.
+ has the list of object files to build this library.
- libobj2shlib - function that produces build file lines to build a
+ libobj2shlib - backward compatibility function that's used the
+ same way as obj2shlib (described next), and was
+ expected to build the shared library from the
+ corresponding static library when that was suitable.
+ NOTE: building a shared library from a static
+ library is now DEPRECATED, as they no longer share
+ object files. Attempting to do this will fail.
+
+ obj2shlib - function that produces build file lines to build a
shareable object library file ("libfoo.so" in Unix
- terms) from the corresponding static library file
- or object files.
+ terms) from the corresponding object files.
called like this:
- libobj2shlib(shlib => "PATH/TO/shlibfile",
- lib => "PATH/TO/libfile",
- objs => [ "PATH/TO/objectfile", ... ],
- deps => [ "PATH/TO/otherlibfile", ... ]);
+ obj2shlib(shlib => "PATH/TO/shlibfile",
+ lib => "PATH/TO/libfile",
+ objs => [ "PATH/TO/objectfile", ... ],
+ deps => [ "PATH/TO/otherlibfile", ... ]);
- 'lib' has the intended library file name *without*
- extension, libobj2shlib is expected to add that.
+ 'lib' has the base (static) library ffile name
+ *without* extension. This is useful in case
+ supporting files are needed (such as import
+ libraries on Windows).
'shlib' has the corresponding shared library name
*without* extension. 'deps' has the list of other
libraries (also *without* extension) this library
needs to be linked with. 'objs' has the list of
- object files (also *without* extension) to build
- this library.
-
- This function has a choice; it can use the
- corresponding static library as input to make the
- shared library, or the list of object files.
+ object files to build this library.
obj2dso - function that produces build file lines to build a
dynamic shared object file from object files.
@@ -695,12 +699,9 @@ They are all expected to return a string with the lines they produce.
deps => [ "PATH/TO/otherlibfile",
... ]);
- This is almost the same as libobj2shlib, but the
+ This is almost the same as obj2shlib, but the
intent is to build a shareable library that can be
- loaded in runtime (a "plugin"...). The differences
- are subtle, one of the most visible ones is that the
- resulting shareable library is produced from object
- files only.
+ loaded in runtime (a "plugin"...).
obj2bin - function that produces build file lines to build an
executable file from object files.
@@ -713,11 +714,10 @@ They are all expected to return a string with the lines they produce.
'bin' has the intended executable file name
*without* extension, obj2bin is expected to add
- that. 'objs' has the list of object files (also
- *without* extension) to build this library. 'deps'
- has the list of library files (also *without*
- extension) that the programs needs to be linked
- with.
+ that. 'objs' has the list of object files to build
+ this library. 'deps' has the list of library files
+ (also *without* extension) that the programs needs
+ to be linked with.
in2script - function that produces build file lines to build a
script file from some input.
diff --git a/Configurations/README.design b/Configurations/README.design
index cae08fc..8c50a92 100644
--- a/Configurations/README.design
+++ b/Configurations/README.design
@@ -471,8 +471,9 @@ etc.
incs => [ "INCL/PATH", ... ]
intent => one of "lib", "dso", "bin" );
- 'obj' has the intended object file *without*
- extension, src2obj() is expected to add that.
+ 'obj' has the intended object file with '.o'
+ extension, src2obj() is expected to change it to
+ something more suitable for the platform.
'srcs' has the list of source files to build the
object file, with the first item being the source
file that directly corresponds to the object file.
@@ -492,51 +493,50 @@ etc.
'lib' has the intended library file name *without*
extension, obj2lib is expected to add that. 'objs'
- has the list of object files (also *without*
- extension) to build this library.
+ has the list of object files to build this library.
- libobj2shlib - function that produces build file lines to build a
+ libobj2shlib - backward compatibility function that's used the
+ same way as obj2shlib (described next), and was
+ expected to build the shared library from the
+ corresponding static library when that was suitable.
+ NOTE: building a shared library from a static
+ library is now DEPRECATED, as they no longer share
+ object files. Attempting to do this will fail.
+
+ obj2shlib - function that produces build file lines to build a
shareable object library file ("libfoo.so" in Unix
- terms) from the corresponding static library file
- or object files.
+ terms) from the corresponding object files.
called like this:
- libobj2shlib(shlib => "PATH/TO/shlibfile",
- lib => "PATH/TO/libfile",
- objs => [ "PATH/TO/objectfile", ... ],
- deps => [ "PATH/TO/otherlibfile", ... ]);
+ obj2shlib(shlib => "PATH/TO/shlibfile",
+ lib => "PATH/TO/libfile",
+ objs => [ "PATH/TO/objectfile", ... ],
+ deps => [ "PATH/TO/otherlibfile", ... ]);
- 'lib' has the intended library file name *without*
- extension, libobj2shlib is expected to add that.
+ 'lib' has the base (static) library file name
+ *without* extension. This is useful in case
+ supporting files are needed (such as import
+ libraries on Windows).
'shlib' has the corresponding shared library name
*without* extension. 'deps' has the list of other
libraries (also *without* extension) this library
needs to be linked with. 'objs' has the list of
- object files (also *without* extension) to build
- this library.
+ object files to build this library.
- This function has a choice; it can use the
- corresponding static library as input to make the
- shared library, or the list of object files.
-
- obj2dynlib - function that produces build file lines to build a
- dynamically loadable library file ("libfoo.so" on
- Unix) from object files.
+ obj2dso - function that produces build file lines to build a
+ dynamic shared object file from object files.
called like this:
- obj2dynlib(lib => "PATH/TO/libfile",
- objs => [ "PATH/TO/objectfile", ... ],
- deps => [ "PATH/TO/otherlibfile",
- ... ]);
+ obj2dso(lib => "PATH/TO/libfile",
+ objs => [ "PATH/TO/objectfile", ... ],
+ deps => [ "PATH/TO/otherlibfile",
+ ... ]);
- This is almost the same as libobj2shlib, but the
+ This is almost the same as obj2shlib, but the
intent is to build a shareable library that can be
- loaded in runtime (a "plugin"...). The differences
- are subtle, one of the most visible ones is that the
- resulting shareable library is produced from object
- files only.
+ loaded in runtime (a "plugin"...).
obj2bin - function that produces build file lines to build an
executable file from object files.
@@ -549,11 +549,10 @@ etc.
'bin' has the intended executable file name
*without* extension, obj2bin is expected to add
- that. 'objs' has the list of object files (also
- *without* extension) to build this library. 'deps'
- has the list of library files (also *without*
- extension) that the programs needs to be linked
- with.
+ that. 'objs' has the list of object files to build
+ this library. 'deps' has the list of library files
+ (also *without* extension) that the programs needs
+ to be linked with.
in2script - function that produces build file lines to build a
script file from some input.
@@ -577,34 +576,30 @@ As an example with the smaller build.info set we've seen as an
example, producing the rules to build 'libcrypto' would result in the
following calls:
- # Note: libobj2shlib will only be called if shared libraries are
+ # Note: obj2shlib will only be called if shared libraries are
# to be produced.
- # Note 2: libobj2shlib gets both the name of the static library
- # and the names of all the object files that go into it. It's up
- # to the implementation to decide which to use as input.
- # Note 3: common.tmpl peals off the ".o" extension from all object
- # files, as the platform at hand may have a different one.
- libobj2shlib(shlib => "libcrypto",
- lib => "libcrypto",
- objs => [ "crypto/aes", "crypto/evp", "crypto/cversion" ],
- deps => [ ]);
+ # Note 2: obj2shlib must convert the '.o' extension to whatever
+ # is suitable on the local platform.
+ obj2shlib(shlib => "libcrypto",
+ objs => [ "crypto/aes.o", "crypto/evp.o", "crypto/cversion.o" ],
+ deps => [ ]);
obj2lib(lib => "libcrypto"
- objs => [ "crypto/aes", "crypto/evp", "crypto/cversion" ]);
+ objs => [ "crypto/aes.o", "crypto/evp.o", "crypto/cversion.o" ]);
- src2obj(obj => "crypto/aes"
+ src2obj(obj => "crypto/aes.o"
srcs => [ "crypto/aes.c" ],
deps => [ ],
incs => [ "include" ],
intent => "lib");
- src2obj(obj => "crypto/evp"
+ src2obj(obj => "crypto/evp.o"
srcs => [ "crypto/evp.c" ],
deps => [ ],
incs => [ "include" ],
intent => "lib");
- src2obj(obj => "crypto/cversion"
+ src2obj(obj => "crypto/cversion.o"
srcs => [ "crypto/cversion.c" ],
deps => [ "crypto/buildinf.h" ],
incs => [ "include" ],
diff --git a/Configurations/common.tmpl b/Configurations/common.tmpl
index 94e4931..dffa513 100644
--- a/Configurations/common.tmpl
+++ b/Configurations/common.tmpl
@@ -116,14 +116,15 @@
}
# dolib is responsible for building libraries. It will call
- # libobj2shlib is shared libraries are produced, and obj2lib in all
+ # obj2shlib is shared libraries are produced, and obj2lib in all
# cases. It also makes sure all object files for the library are
# built.
sub dolib {
my $lib = shift;
return "" if $cache{$lib};
unless ($disabled{shared} || $lib =~ /\.a$/) {
- $OUT .= libobj2shlib(shlib => $unified_info{sharednames}->{$lib},
+ my $obj2shlib = defined &obj2shlib ? \&obj2shlib : \&libobj2shlib;
+ $OUT .= $obj2shlib->(shlib => $unified_info{sharednames}->{$lib},
lib => $lib,
objs => $unified_info{shared_sources}->{$lib},
deps => [ reducedepends(resolvedepends($lib)) ],
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index f85848f..95fa521 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -902,7 +902,7 @@ $obj.OBJ : $deps
- PURGE $obj.OBJ
EOF
}
- sub libobj2shlib {
+ sub obj2shlib {
my %args = @_;
my $lib = $args{lib};
my $shlib = $args{shlib};
@@ -914,7 +914,7 @@ EOF
my @defs = grep { $_ =~ /\.opt$/ } @{$args{objs}};
my @deps = compute_lib_depends(@{$args{deps}});
die "More than one symbol vector" if scalar @defs > 1;
- my $deps = join(", -\n\t\t", @defs, @deps);
+ my $deps = join(", -\n\t\t", @objs, @defs, @deps);
my $shlib_target = $disabled{shared} ? "" : $target{shared_target};
my $translatesyms_pl = abs2rel(rel2abs(catfile($config{sourcedir},
"VMS", "translatesyms.pl")),
@@ -934,7 +934,7 @@ EOF
"WRITE OPT_FILE \"$x\"" } @deps)
|| "\@ !";
return <<"EOF"
-$shlib.EXE : $lib.OLB $deps
+$shlib.EXE : $deps
\$(PERL) $translatesyms_pl \$(BLDDIR)CXX\$DEMANGLER_DB. < $defs[0] > $defs[0]-translated
OPEN/WRITE/SHARE=READ OPT_FILE $lib-components.OPT
$write_opt1
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index bb6755b..17f76a5 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -1085,7 +1085,7 @@ EOF
# On Unix, we build shlibs from static libs, so we're ignoring the
# object file array. We *know* this routine is only called when we've
# configure 'shared'.
- sub libobj2shlib {
+ sub obj2shlib {
my %args = @_;
my $lib = $args{lib};
my $shlib = $args{shlib};
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index c8b0cf1..148ddf4 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -616,7 +616,7 @@ EOF
# On Unix, we build shlibs from static libs, so we're ignoring the
# object file array. We *know* this routine is only called when we've
# configure 'shared'.
- sub libobj2shlib {
+ sub obj2shlib {
my %args = @_;
my $lib = $args{lib};
my $shlib = $args{shlib};
More information about the openssl-commits
mailing list