Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
84af1bae
T
Third Party Openssl
项目概览
OpenHarmony
/
Third Party Openssl
大约 1 年 前同步成功
通知
9
Star
18
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
Third Party Openssl
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
84af1bae
编写于
2月 22, 2016
作者:
R
Richard Levitte
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Clean away $config{no_shared} since we have $disabled{shared}
Reviewed-by:
N
Rich Salz
<
rsalz@openssl.org
>
上级
9e04edf2
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
28 addition
and
29 deletion
+28
-29
Configurations/10-main.conf
Configurations/10-main.conf
+1
-1
Configurations/README
Configurations/README
+1
-1
Configurations/common.tmpl
Configurations/common.tmpl
+1
-1
Configurations/descrip.mms.tmpl
Configurations/descrip.mms.tmpl
+8
-8
Configurations/unix-Makefile.tmpl
Configurations/unix-Makefile.tmpl
+8
-8
Configure
Configure
+4
-5
Makefile.in
Makefile.in
+1
-1
VMS/openssl_shutdown.com.in
VMS/openssl_shutdown.com.in
+2
-2
VMS/openssl_startup.com.in
VMS/openssl_startup.com.in
+2
-2
未找到文件。
Configurations/10-main.conf
浏览文件 @
84af1bae
...
...
@@ -1163,7 +1163,7 @@
#### MinGW
"mingw"
=> {
inherit_from
=> [
asm
(
"x86_asm"
),
sub
{ $
config
{
no_
shared
} ? () :
"x86_uplink"
} ],
sub
{ $
disabled
{
shared
} ? () :
"x86_uplink"
} ],
cc
=>
"gcc"
,
cflags
=>
"-DL_ENDIAN -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE -m32 -Wall"
,
debug_cflags
=>
"-g -O0"
,
...
...
Configurations/README
浏览文件 @
84af1bae
...
...
@@ -430,7 +430,7 @@ example, the above would have "something" used, since 1 is true.
Together with the use of Text::Template, this can be used as
conditions based on something in the passed variables, for example:
IF[{- $
config{no_
shared} -}]
IF[{- $
disabled{
shared} -}]
LIBS=libcrypto
SOURCE[libcrypto]=...
ELSE
...
...
Configurations/common.tmpl
浏览文件 @
84af1bae
...
...
@@ -54,7 +54,7 @@
# built.
sub
dolib
{
my
$lib
=
shift
;
if
(
!
$config
{
no_
shared
})
{
unless
(
$disabled
{
shared
})
{
my
%ordinals
=
$unified_info
{
ordinals
}
->
{
$lib
}
?
(
ordinals
=>
$unified_info
{
ordinals
}
->
{
$lib
})
:
();
...
...
Configurations/descrip.mms.tmpl
浏览文件 @
84af1bae
...
...
@@ -296,12 +296,12 @@ install_dev : check_INSTALLTOP
{- join("\n ",
map { "COPY/PROT=W:R $_.OLB ossl_installroot:[LIB.'arch']" }
@{$unified_info{libraries}}) -}
@ {- output_off() if $
config{no_
shared}; "" -} !
@ {- output_off() if $
disabled{
shared}; "" -} !
{- join("\n ",
map { "COPY/PROT=W:RE $_.EXE ossl_installroot:[LIB.'arch']" }
map { $unified_info{sharednames}->{$_} || () }
@{$unified_info{libraries}}) -}
@ {- output_on() if $
config{no_
shared}; "" -} !
@ {- output_on() if $
disabled{
shared}; "" -} !
install_runtime : check_INSTALLTOP
@ WRITE SYS$OUTPUT "*** Installing runtime files"
...
...
@@ -363,7 +363,7 @@ vmsconfig.pm : configdata.pm
WRITE CONFIG "our %config = ("
WRITE CONFIG " target => '{- $config{target} -}',"
WRITE CONFIG " version => '$(MAJOR).$(MINOR)',"
WRITE CONFIG " no_shared => '","{- $
config{no_
shared} -}","',"
WRITE CONFIG " no_shared => '","{- $
disabled{
shared} -}","',"
WRITE CONFIG " INSTALLTOP => '$(INSTALLTOP)',"
WRITE CONFIG " OPENSSLDIR => '$(OPENSSLDIR)',"
WRITE CONFIG " pointersize => '","{- $target{pointersize} -}","',"
...
...
@@ -470,10 +470,10 @@ EOF
my $libn = basename($lib);
(my $mkdef_key = $libn) =~ s/^${osslprefix_q}lib//i;
my @deps = map {
$
config{no_
shared} ? $_.".OLB"
$
disabled{
shared} ? $_.".OLB"
: $unified_info{sharednames}->{$_}.".EXE"; } @{$args{deps}};
my $deps = join(", -\n\t\t", @deps);
my $shlib_target = $
config{no_
shared} ? "" : $target{shared_target};
my $shlib_target = $
disabled{
shared} ? "" : $target{shared_target};
my $ordinalsfile = defined($args{ordinals}) ? $args{ordinals}->[1] : "";
my $engine_opt = abs2rel(rel2abs(catfile($config{sourcedir},
"VMS", "engine.opt")),
...
...
@@ -522,10 +522,10 @@ EOF
(my $libn_nolib = $libn) =~ s/^lib//;
my @objs = map { "$_.OBJ" } @{$args{objs}};
my @deps = map {
$
config{no_
shared} ? $_.".OLB"
$
disabled{
shared} ? $_.".OLB"
: $unified_info{sharednames}->{$_}.".EXE"; } @{$args{deps}};
my $deps = join(", -\n\t\t", @objs, @deps);
my $shlib_target = $
config{no_
shared} ? "" : $target{shared_target};
my $shlib_target = $
disabled{
shared} ? "" : $target{shared_target};
my $engine_opt = abs2rel(rel2abs(catfile($config{sourcedir},
"VMS", "engine.opt")),
rel2abs($config{builddir}));
...
...
@@ -572,7 +572,7 @@ EOF
my $binn = basename($bin);
my @objs = map { "$_.OBJ" } @{$args{objs}};
my @deps = map {
$
config{no_
shared} ? $_.".OLB"
$
disabled{
shared} ? $_.".OLB"
: $unified_info{sharednames}->{$_}.".EXE"; } @{$args{deps}};
my $deps = join(", -\n\t\t", @objs, @deps);
# The "[]" hack is because in .OPT files, each line inherits the
...
...
Configurations/unix-Makefile.tmpl
浏览文件 @
84af1bae
...
...
@@ -34,12 +34,12 @@
# removed. On some systems, they may therefore return the exact same
# string.
sub shlib {
return () if $
config{no_
shared};
return () if $
disabled{
shared};
my $lib = shift;
return $unified_info{sharednames}->{$lib} . $shlibext;
}
sub shlib_simple {
return () if $
config{no_
shared};
return () if $
disabled{
shared};
my $lib = shift;
if (windowsdll()) {
...
...
@@ -320,7 +320,7 @@ install_dev:
mv -f $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn.new \
$(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn; \
done
@ : {- output_off() if $
config{no_
shared}; "" -}
@ : {- output_off() if $
disabled{
shared}; "" -}
@set -e; for s in $(SHLIB_INFO); do \
s1=`echo "$$s" | cut -f1 -d";"`; \
s2=`echo "$$s" | cut -f2 -d";"`; \
...
...
@@ -344,7 +344,7 @@ install_dev:
$(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn2; \
: {- output_on() unless windowsdll(); "" -}; \
done
@ : {- output_on() if $
config{no_
shared}; "" -}
@ : {- output_on() if $
disabled{
shared}; "" -}
@$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig
@echo "install libcrypto.pc -> $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libcrypto.pc"
@cp libcrypto.pc $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig
...
...
@@ -371,7 +371,7 @@ uninstall_dev:
echo "$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn"; \
$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn; \
done
@ : {- output_off() if $
config{no_
shared}; "" -}
@ : {- output_off() if $
disabled{
shared}; "" -}
@set -e; for s in $(SHLIB_INFO); do \
s1=`echo "$$s" | cut -f1 -d";"`; \
s2=`echo "$$s" | cut -f2 -d";"`; \
...
...
@@ -389,7 +389,7 @@ uninstall_dev:
$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn2; \
: {- output_on() unless windowsdll(); "" -}; \
done
@ : {- output_on() if $
config{no_
shared}; "" -}
@ : {- output_on() if $
disabled{
shared}; "" -}
@echo "$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libcrypto.pc"
@$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libcrypto.pc
@echo "$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libssl.pc"
...
...
@@ -832,7 +832,7 @@ configdata.pm: {- $config{build_file_template} -} $(SRCDIR)/Configure $(SRCDIR)/
# Helper function to figure out dependencies on libraries
# It takes a list of library names and outputs a list of dependencies
sub compute_lib_depends {
if ($
config{no_
shared}) {
if ($
disabled{
shared}) {
return map { $_.$libext } @_;
}
...
...
@@ -969,7 +969,7 @@ EOF
$d = "." if $d eq $f;
(my $l = $f) =~ s/^lib//;
" -L$d -l$l" } @{$args{deps}});
my $shlib_target = $
config{no_
shared} ? "" : $target{shared_target};
my $shlib_target = $
disabled{
shared} ? "" : $target{shared_target};
return <<"EOF";
$bin$exeext: $objs $deps
\$(RM) $bin$exeext
...
...
Configure
浏览文件 @
84af1bae
...
...
@@ -210,7 +210,6 @@ my $nofipscanistercheck=0;
$config
{
baseaddr
}
=
"
0xFB00000
";
my
$no_threads
=
0
;
my
$threads
=
0
;
$config
{
no_shared
}
=
0
;
# but "no-shared" is default
my
$zlib
=
1
;
# but "no-zlib" is default
my
$no_rfc3779
=
0
;
my
$no_asm
=
0
;
...
...
@@ -784,7 +783,7 @@ foreach (sort (keys %disabled))
elsif
(
/^threads$/
)
{
$no_threads
=
1
;
}
elsif
(
/^shared$/
)
{
$config
{
no_shared
}
=
1
;
}
{
}
elsif
(
/^pic$/
)
{
}
elsif
(
/^zlib$/
)
...
...
@@ -1024,9 +1023,9 @@ if (defined($disabled{"deprecated"})) {
if
(
$target
{
shared_target
}
eq
"")
{
$no_shared_warn
=
1
if
((
!
$
config
{
no_
shared
}
||
!
$disabled
{"
dynamic-engine
"})
if
((
!
$
disabled
{
shared
}
||
!
$disabled
{"
dynamic-engine
"})
&&
!
$config
{
fips
});
$
config
{
no_shared
}
=
1
;
$
disabled
{
shared
}
=
"
no-shared-target
"
;
$disabled
{
pic
}
=
$disabled
{
shared
}
=
$disabled
{"
dynamic-engine
"}
=
"
no-shared-target
";
}
...
...
@@ -1447,7 +1446,7 @@ EOF
push
@
{
$unified_info
{
rawlines
}},
@rawlines
;
if
(
!
$config
{
no_
shared
})
{
unless
(
$disabled
{
shared
})
{
# Check sharednames.
foreach
(
keys
%sharednames
)
{
my
$dest
=
cleanfile
(
$buildd
,
$_
,
$blddir
);
...
...
Makefile.in
浏览文件 @
84af1bae
...
...
@@ -193,7 +193,7 @@ TOP= .
LIBS
=
libcrypto.a libssl.a
SHARED_CRYPTO
=
libcrypto
$(SHLIB_EXT)
SHARED_SSL
=
libssl
$(SHLIB_EXT)
SHARED_LIBS
=
{- '
$(SHARED_CRYPTO)
$(SHARED_SSL)
'
if (!
$config
{no_shared})
-}
SHARED_LIBS
=
{- '
$(SHARED_CRYPTO)
$(SHARED_SSL)
'
unless
$disabled
{shared}
-}
SHARED_CFLAG
=
{-
$target
{shared_cflag} -}
SHARED_LDFLAG
=
{-
$target
{shared_ldflag}
# Unlike other OSes (like Solaris, Linux, Tru64,
...
...
VMS/openssl_shutdown.com.in
浏览文件 @
84af1bae
...
...
@@ -39,7 +39,7 @@ $ DEAS OSSL$LIB'v'
$ DEAS OSSL$SHARE'v'
$ DEAS OSSL$ENGINES'v'
$ DEAS OSSL$EXE'v'
$ {- output_off() if $
config{no_
shared} -}
$ {- output_off() if $
disabled{
shared} -}
$ {- join("\n\$ ", map { "DEAS $_'v'" } map { $unified_info{sharednames}->{$_} || () } @{$unified_info{libraries}}) -}
$ {- output_on() -}
$ IF P2 .NES. "NOALIASES"
...
...
@@ -51,7 +51,7 @@ $ DEAS OSSL$SHARE
$ DEAS OSSL$ENGINES
$ DEAS OSSL$EXE
$ DEAS OPENSSL
$ {- output_off() if $
config{no_
shared} -}
$ {- output_off() if $
disabled{
shared} -}
$ {- join("\n\$ ", map { "DEAS $_" } map { $unified_info{sharednames}->{$_} || () } @{$unified_info{libraries}}) -}
$ {- output_on() -}
$ ENDIF
...
...
VMS/openssl_startup.com.in
浏览文件 @
84af1bae
...
...
@@ -88,7 +88,7 @@ $ DEF OSSL$LIB'v' OSSL$INSTROOT:['arch'.LIB]
$ DEF OSSL$SHARE'v' OSSL$INSTROOT:['arch'.LIB]
$ DEF OSSL$ENGINES'v' OSSL$INSTROOT:['arch'.ENGINES]
$ DEF OSSL$EXE'v' OSSL$INSTROOT:['arch'.EXE]
$ {- output_off() if $
config{no_
shared} -}
$ {- output_off() if $
disabled{
shared} -}
$ {- join("\n\$ ", map { "DEF $_'v' OSSL\$SHARE:$_" } map { $unified_info{sharednames}->{$_} || () } @{$unified_info{libraries}}) -}
$ {- output_on() -}
$ IF P2 .NES. "NOALIASES"
...
...
@@ -100,7 +100,7 @@ $ DEF OSSL$SHARE OSSL$SHARE'v'
$ DEF OSSL$ENGINES OSSL$ENGINES'v'
$ DEF OSSL$EXE OSSL$EXE'v'
$ DEF OPENSSL OSSL$INCLUDE:[OPENSSL]
$ {- output_off() if $
config{no_
shared} -}
$ {- output_off() if $
disabled{
shared} -}
$ {- join("\n\$ ", map { "DEF $_ $_'v'" } map { $unified_info{sharednames}->{$_} || () } @{$unified_info{libraries}}) -}
$ {- output_on() -}
$ ENDIF
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录