提交 5386287c 编写于 作者: R Richard Levitte

Small rename fest in unified, obj2dynlib -> obj2dso

Since we're using the acronym DSO everywhere else and that's a common
name for that kind of object, we might as well do so here as well.
Reviewed-by: NAndy Polyakov <appro@openssl.org>
上级 c8c2b779
...@@ -542,16 +542,15 @@ They are all expected to return a string with the lines they produce. ...@@ -542,16 +542,15 @@ They are all expected to return a string with the lines they produce.
corresponding static library as input to make the corresponding static library as input to make the
shared library, or the list of object files. shared library, or the list of object files.
obj2dynlib - function that produces build file lines to build a obj2dso - function that produces build file lines to build a
dynamically loadable library file ("libfoo.so" on dynamic shared object file from object files.
Unix) from object files.
called like this: called like this:
obj2dynlib(lib => "PATH/TO/libfile", obj2dso(lib => "PATH/TO/libfile",
objs => [ "PATH/TO/objectfile", ... ], objs => [ "PATH/TO/objectfile", ... ],
deps => [ "PATH/TO/otherlibfile", deps => [ "PATH/TO/otherlibfile",
... ]); ... ]);
This is almost the same as libobj2shlib, but the This is almost the same as libobj2shlib, but the
intent is to build a shareable library that can be intent is to build a shareable library that can be
......
...@@ -70,14 +70,14 @@ ...@@ -70,14 +70,14 @@
} }
# doengine is responsible for building engines. It will call # doengine is responsible for building engines. It will call
# obj2dynlib, and also makes sure all object files for the library # obj2dso, and also makes sure all object files for the library
# are built. # are built.
sub doengine { sub doengine {
my $lib = shift; my $lib = shift;
$OUT .= obj2dynlib(lib => $lib, $OUT .= obj2dso(lib => $lib,
objs => [ map { (my $x = $_) =~ s|\.o$||; $x } objs => [ map { (my $x = $_) =~ s|\.o$||; $x }
@{$unified_info{sources}->{$lib}} ], @{$unified_info{sources}->{$lib}} ],
deps => [ resolvedepends($lib) ]); deps => [ resolvedepends($lib) ]);
map { doobj($_, $lib, intent => "lib") } @{$unified_info{sources}->{$lib}}; map { doobj($_, $lib, intent => "lib") } @{$unified_info{sources}->{$lib}};
} }
......
...@@ -512,7 +512,7 @@ $shlib.EXE : $lib.OLB $deps $ordinalsfile ...@@ -512,7 +512,7 @@ $shlib.EXE : $lib.OLB $deps $ordinalsfile
- PURGE $shlib.EXE,$shlib.OPT,$shlib.MAP - PURGE $shlib.EXE,$shlib.OPT,$shlib.MAP
EOF EOF
} }
sub obj2dynlib { sub obj2dso {
my %args = @_; my %args = @_;
my $lib = $args{lib}; my $lib = $args{lib};
my $libd = dirname($lib); my $libd = dirname($lib);
......
...@@ -866,7 +866,7 @@ EOF ...@@ -866,7 +866,7 @@ EOF
cp -p $shlib\$(SHLIB_EXT) test/ cp -p $shlib\$(SHLIB_EXT) test/
EOF EOF
} }
sub obj2dynlib { sub obj2dso {
my %args = @_; my %args = @_;
my $lib = $args{lib}; my $lib = $args{lib};
my $libd = dirname($lib); my $libd = dirname($lib);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册