mirror of https://github.com/openssl/openssl
Remove automatic RPATH - add user rpath support
Make Configure recognise -rpath and -R to support user added rpaths for OSF1 and Solaris. For convenience, add a variable LIBRPATH in the Unix Makefile, which the users can use as follows: ./config [options] -Wl,-rpath,\$(LIBRPATH) Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
parent
075f7e2c60
commit
fad599f7f1
|
@ -153,6 +153,10 @@ LIBDIR={- #
|
||||||
ENGINESDIR={- use File::Spec::Functions;
|
ENGINESDIR={- use File::Spec::Functions;
|
||||||
catdir($prefix,$libdir,"engines-$sover") -}
|
catdir($prefix,$libdir,"engines-$sover") -}
|
||||||
|
|
||||||
|
# Convenience variable for those who want to set the rpath in shared
|
||||||
|
# libraries and applications
|
||||||
|
LIBRPATH=$(INSTALLTOP)/$(LIBDIR)
|
||||||
|
|
||||||
MANDIR=$(INSTALLTOP)/share/man
|
MANDIR=$(INSTALLTOP)/share/man
|
||||||
DOCDIR=$(INSTALLTOP)/share/doc/$(BASENAME)
|
DOCDIR=$(INSTALLTOP)/share/doc/$(BASENAME)
|
||||||
HTMLDIR=$(DOCDIR)/html
|
HTMLDIR=$(DOCDIR)/html
|
||||||
|
@ -1094,7 +1098,7 @@ $bin$exeext: $objs $deps
|
||||||
APPNAME=$bin$exeext OBJECTS="$objs" \\
|
APPNAME=$bin$exeext OBJECTS="$objs" \\
|
||||||
LIBDEPS='\$(PLIB_LDFLAGS) '"$linklibs"' \$(EX_LIBS)' \\
|
LIBDEPS='\$(PLIB_LDFLAGS) '"$linklibs"' \$(EX_LIBS)' \\
|
||||||
CC='$cc' CFLAGS='$cflags' \\
|
CC='$cc' CFLAGS='$cflags' \\
|
||||||
LDFLAGS='\$(LDFLAGS)' LIBRPATH='\$(INSTALLTOP)/\$(LIBDIR)' \\
|
LDFLAGS='\$(LDFLAGS)' \\
|
||||||
link_app.$shlib_target
|
link_app.$shlib_target
|
||||||
EOF
|
EOF
|
||||||
}
|
}
|
||||||
|
|
11
Configure
11
Configure
|
@ -545,8 +545,9 @@ $config{build_type} = "release";
|
||||||
|
|
||||||
my %unsupported_options = ();
|
my %unsupported_options = ();
|
||||||
my %deprecated_options = ();
|
my %deprecated_options = ();
|
||||||
foreach (@argvcopy)
|
while (@argvcopy)
|
||||||
{
|
{
|
||||||
|
$_ = shift @argvcopy;
|
||||||
# VMS is a case insensitive environment, and depending on settings
|
# VMS is a case insensitive environment, and depending on settings
|
||||||
# out of our control, we may receive options uppercased. Let's
|
# out of our control, we may receive options uppercased. Let's
|
||||||
# downcase at least the part before any equal sign.
|
# downcase at least the part before any equal sign.
|
||||||
|
@ -733,6 +734,14 @@ foreach (@argvcopy)
|
||||||
{
|
{
|
||||||
$libs.=$_." ";
|
$libs.=$_." ";
|
||||||
}
|
}
|
||||||
|
elsif (/^-rpath$/ or /^-R$/)
|
||||||
|
# -rpath is the OSF1 rpath flag
|
||||||
|
# -R is the old Solaris rpath flag
|
||||||
|
{
|
||||||
|
my $rpath = shift(@argvcopy) || "";
|
||||||
|
$rpath .= " " if $rpath ne "";
|
||||||
|
$libs.=$_." ".$rpath;
|
||||||
|
}
|
||||||
elsif (/^-static$/)
|
elsif (/^-static$/)
|
||||||
{
|
{
|
||||||
$libs.=$_." ";
|
$libs.=$_." ";
|
||||||
|
|
Loading…
Reference in New Issue