X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=Configurations%2Funix-Makefile.tmpl;h=132b83cd2c63a7839f5b60526712b5363ca2e394;hp=b610b5834dd8444a0e3b7ef920045ffb33de3c93;hb=aa24cd1bfbf4fb51bc51d8b3b5c68563616a28ab;hpb=b7c9aa645e4eddf5d198d2b20f1c6a74ab96f98e diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index b610b5834d..132b83cd2c 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -38,20 +38,26 @@ # removed. On some systems, they may therefore return the exact same # string. sub shlib { - return () if $disabled{shared}; my $lib = shift; + return () if $disabled{shared} || $lib =~ /\.a$/; return $unified_info{sharednames}->{$lib} . $shlibext; } sub shlib_simple { - return () if $disabled{shared}; - my $lib = shift; + return () if $disabled{shared} || $lib =~ /\.a$/; + if (windowsdll()) { return $lib . $shlibextimport; } return $lib . $shlibextsimple; } + # Easy fixing of static library names + sub lib { + (my $lib = shift) =~ s/\.a$//; + return $lib . $libext; + } + # dso is a complement to shlib / shlib_simple that returns the # given libname with the simple shared extension (possible SO version # removed). This differs from shlib_simple() by being unconditional. @@ -84,7 +90,7 @@ SHLIB_MAJOR={- $config{shlib_major} -} SHLIB_MINOR={- $config{shlib_minor} -} SHLIB_TARGET={- $target{shared_target} -} -LIBS={- join(" ", map { $_.$libext } @{$unified_info{libraries}}) -} +LIBS={- join(" ", map { lib($_) } @{$unified_info{libraries}}) -} SHLIBS={- join(" ", map { shlib($_) } @{$unified_info{libraries}}) -} SHLIB_INFO={- join(" ", map { "\"".shlib($_).";".shlib_simple($_)."\"" } @{$unified_info{libraries}}) -} ENGINES={- join(" ", map { dso($_) } @{$unified_info{engines}}) -} @@ -103,7 +109,7 @@ GENERATED={- join(" ", grep { /\.o$/ } keys %{$unified_info{sources}} ), ( grep { /\.h$/ } keys %{$unified_info{generate}} )) -} -INSTALL_LIBS={- join(" ", map { $_.$libext } @{$unified_info{install}->{libraries}}) -} +INSTALL_LIBS={- join(" ", map { lib($_) } @{$unified_info{install}->{libraries}}) -} INSTALL_SHLIBS={- join(" ", map { shlib($_) } @{$unified_info{install}->{libraries}}) -} INSTALL_SHLIB_INFO={- join(" ", map { "\"".shlib($_).";".shlib_simple($_)."\"" } @{$unified_info{install}->{libraries}}) -} INSTALL_ENGINES={- join(" ", map { dso($_) } @{$unified_info{install}->{engines}}) -} @@ -153,6 +159,10 @@ LIBDIR={- # ENGINESDIR={- use File::Spec::Functions; 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 DOCDIR=$(INSTALLTOP)/share/doc/$(BASENAME) HTMLDIR=$(DOCDIR)/html @@ -169,27 +179,19 @@ CROSS_COMPILE= {- $config{cross_compile_prefix} -} CC= $(CROSS_COMPILE){- $target{cc} -} CFLAGS={- our $cflags2 = join(" ",(map { "-D".$_} @{$target{defines}}, @{$config{defines}}),"-DOPENSSLDIR=\"\\\"\$(OPENSSLDIR)\\\"\"","-DENGINESDIR=\"\\\"\$(ENGINESDIR)\\\"\"") -} {- $target{cflags} -} {- $config{cflags} -} CFLAGS_Q={- $cflags2 =~ s|([\\"])|\\$1|g; $cflags2 -} {- $config{cflags} -} +CXX= $(CROSS_COMPILE){- $target{cxx} -} +CXXFLAGS={- our $cxxflags2 = join(" ",(map { "-D".$_} @{$target{defines}}, @{$config{defines}}),"-DOPENSSLDIR=\"\\\"\$(OPENSSLDIR)\\\"\"","-DENGINESDIR=\"\\\"\$(ENGINESDIR)\\\"\"") -} {- $target{cxxflags} -} {- $config{cxxflags} -} -std=c++11 LDFLAGS= {- $target{lflags} -} PLIB_LDFLAGS= {- $target{plib_lflags} -} EX_LIBS= {- $target{ex_libs} -} {- $config{ex_libs} -} LIB_CFLAGS={- $target{shared_cflag} || "" -} -LIB_LDFLAGS={- $target{shared_ldflag}." ".$config{shared_ldflag} - # 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. - . ($config{target} =~ m|^BSD-| && $prefix !~ m|^/usr/.*$| - ? " -Wl,-rpath,\$\$(LIBRPATH)" : "") -} +LIB_CXXFLAGS={- $target{shared_cxxflag} || "" -} +LIB_LDFLAGS={- $target{shared_ldflag}." ".$config{shared_ldflag} -} DSO_CFLAGS={- $target{shared_cflag} || "" -} +DSO_CXXFLAGS={- $target{shared_cxxflag} || "" -} DSO_LDFLAGS=$(LIB_LDFLAGS) BIN_CFLAGS={- $target{bin_cflags} -} +BIN_CXXFLAGS={- $target{bin_cxxflag} || "" -} PERL={- $config{perl} -} @@ -255,6 +257,7 @@ test: tests PERL="$(PERL)" \ EXE_EXT={- $exeext -} \ OPENSSL_ENGINES=../$(BLDDIR)/engines \ + OPENSSL_DEBUG_MEMORY=on \ $(PERL) ../$(SRCDIR)/test/run_tests.pl $(TESTS) ) @ : {- if ($disabled{tests}) { output_on(); } else { output_off(); } "" -} @echo "Tests are not supported with your chosen Configure options" @@ -292,7 +295,8 @@ clean: libclean -$(RM) `find . -name '*{- $depext -}' -a \! -path "./.git/*"` -$(RM) `find . -name '*{- $objext -}' -a \! -path "./.git/*"` $(RM) core - $(RM) tags TAGS + $(RM) tags TAGS doc-nits + $(RM) test/.rnd $(RM) openssl.pc libcrypto.pc libssl.pc -$(RM) `find . -type l -a \! -path "./.git/*"` $(RM) $(TARFILE) @@ -306,7 +310,7 @@ distclean: clean depend: @: {- output_off() if $disabled{makedepend}; "" -} @if egrep "^# DO NOT DELETE THIS LINE" Makefile >/dev/null && [ -z "`find $(DEPS) -newer Makefile 2>/dev/null; exit 0`" ]; then :; else \ - ( sed -e '/^# DO NOT DELETE THIS LINE.*/,$$d' < Makefile; \ + ( $(PERL) -pe 'exit 0 if /^# DO NOT DELETE THIS LINE.*/' < Makefile; \ echo '# DO NOT DELETE THIS LINE -- make depend depends on it.'; \ echo; \ for f in $(DEPS); do \ @@ -565,115 +569,29 @@ uninstall_runtime: @ : {- output_on() unless windowsdll(); "" -} -$(RMDIR) $(DESTDIR)$(INSTALLTOP)/bin -# A method to extract all names from a .pod file -# The first sed extracts everything between "=head1 NAME" and the next =head1 -# The perl command joins all the lines into one -# The second sed removes the description and turns all commas into spaces -# Voilà, you have a space separated list of names! -EXTRACT_NAMES=sed -e '1,/^=head1 *NAME *$$/d;/^=head1/,$$d' | \ - $(PERL) -p -0 -e 's/\n/ /g; END {print "\n"}' | \ - sed -e 's/ - .*$$//;s/,/ /g' -PROCESS_PODS=\ - set -e; \ - here=`cd $(SRCDIR); pwd`; \ - point=$$here/util/point.sh; \ - for ds in apps:1 crypto:3 ssl:3; do \ - defdir=`echo $$ds | cut -f1 -d:`; \ - defsec=`echo $$ds | cut -f2 -d:`; \ - for p in $(SRCDIR)/doc/$$defdir/*.pod; do \ - SEC=`sed -ne 's/^=for *comment *openssl_manual_section: *\([0-9]\) *$$/\1/p' $$p`; \ - [ -z "$$SEC" ] && SEC=$$defsec; \ - fn=`basename $$p .pod`; \ - Name=$$fn; \ - NAME=`echo $$fn | tr '[a-z]' '[A-Z]'`; \ - suf=`eval "echo $$OUTSUFFIX"`; \ - top=`eval "echo $$OUTTOP"`; \ - $(PERL) $(SRCDIR)/util/mkdir-p.pl $$top/man$$SEC; \ - echo "install $$p -> $$top/man$$SEC/$$fn$$suf"; \ - cat $$p | eval "$$GENERATE" \ - > $$top/man$$SEC/$$fn$$suf; \ - names=`cat $$p | $(EXTRACT_NAMES)`; \ - ( cd $$top/man$$SEC; \ - for n in $$names; do \ - comp_n="$$n"; \ - comp_fn="$$fn"; \ - case "$(PLATFORM)" in DJGPP|Cygwin*|mingw*|darwin*-*-cc) \ - comp_n=`echo "$$n" | tr '[A-Z]' '[a-z]'`; \ - comp_fn=`echo "$$fn" | tr '[A-Z]' '[a-z]'`; \ - ;; \ - esac; \ - if [ "$$comp_n" != "$$comp_fn" ]; then \ - echo "link $$top/man$$SEC/$$n$$suf -> $$top/man$$SEC/$$fn$$suf"; \ - PLATFORM=$(PLATFORM) $$point $$fn$$suf $$n$$suf; \ - fi; \ - done ); \ - done; \ - done -UNINSTALL_DOCS=\ - set -e; \ - here=`cd $(SRCDIR); pwd`; \ - for ds in apps:1 crypto:3 ssl:3; do \ - defdir=`echo $$ds | cut -f1 -d:`; \ - defsec=`echo $$ds | cut -f2 -d:`; \ - for p in $(SRCDIR)/doc/$$defdir/*.pod; do \ - SEC=`sed -ne 's/^=for *comment *openssl_manual_section: *\([0-9]\) *$$/\1/p' $$p`; \ - [ -z "$$SEC" ] && SEC=$$defsec; \ - fn=`basename $$p .pod`; \ - suf=`eval "echo $$OUTSUFFIX"`; \ - top=`eval "echo $$OUTTOP"`; \ - echo "$(RM) $$top/man$$SEC/$$fn$$suf"; \ - $(RM) $$top/man$$SEC/$$fn$$suf; \ - names=`cat $$p | $(EXTRACT_NAMES)`; \ - for n in $$names; do \ - comp_n="$$n"; \ - comp_fn="$$fn"; \ - case "$(PLATFORM)" in DJGPP|Cygwin*|mingw*|darwin*-*-cc) \ - comp_n=`echo "$$n" | tr '[A-Z]' '[a-z]'`; \ - comp_fn=`echo "$$fn" | tr '[A-Z]' '[a-z]'`; \ - ;; \ - esac; \ - if [ "$$comp_n" != "$$comp_fn" ]; then \ - echo "$(RM) $$top/man$$SEC/$$n$$suf"; \ - $(RM) $$top/man$$SEC/$$n$$suf; \ - fi; \ - done; \ - ( $(RMDIR) $$top/man$$SEC 2>/dev/null || exit 0 ); \ - done; \ - done install_man_docs: @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1) @echo "*** Installing manpages" - @\ - OUTSUFFIX='.$${SEC}$(MANSUFFIX)'; \ - OUTTOP="$(DESTDIR)$(MANDIR)"; \ - GENERATE='pod2man --name=$$NAME --section=$$SEC --center=OpenSSL --release=$(VERSION)'; \ - $(PROCESS_PODS) + $(PERL) $(SRCDIR)/util/process_docs.pl \ + --destdir=$(DESTDIR)$(MANDIR) --type=man --suffix=$(MANSUFFIX) uninstall_man_docs: @echo "*** Uninstalling manpages" - @\ - OUTSUFFIX='.$${SEC}$(MANSUFFIX)'; \ - OUTTOP="$(DESTDIR)$(MANDIR)"; \ - $(UNINSTALL_DOCS) + $(PERL) $(SRCDIR)/util/process_docs.pl \ + --destdir=$(DESTDIR)$(MANDIR) --type=man --suffix=$(MANSUFFIX) \ + --remove install_html_docs: @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1) @echo "*** Installing HTML manpages" - @\ - OUTSUFFIX='.$(HTMLSUFFIX)'; \ - OUTTOP="$(DESTDIR)$(HTMLDIR)"; \ - GENERATE="pod2html --podroot=$(SRCDIR)/doc --htmldir=.. \ - --podpath=apps:crypto:ssl --title=\$$Name \ - | perl -pe 's|href=\"http://man.he.net/man|href=\"../man|g; s|href=\"(.*/man.*)(?|href=\"\$$1.html\">|g;'"; \ - $(PROCESS_PODS) + $(PERL) $(SRCDIR)/util/process_docs.pl \ + --destdir=$(DESTDIR)$(HTMLDIR) --type=html uninstall_html_docs: @echo "*** Uninstalling manpages" - @\ - OUTSUFFIX='.$(HTMLSUFFIX)'; \ - OUTTOP="$(DESTDIR)$(HTMLDIR)"; \ - $(UNINSTALL_DOCS) + $(PERL) $(SRCDIR)/util/process_docs.pl \ + --destdir=$(DESTDIR)$(HTMLDIR) --type=html --remove # Developer targets (note: these are only available on Unix) ######### @@ -683,6 +601,10 @@ update: generate errors ordinals generate: generate_apps generate_crypto_bn generate_crypto_objects \ generate_crypto_conf generate_crypto_asn1 +doc-nits: + (cd $(SRCDIR); $(PERL) util/find-doc-nits -n ) >doc-nits + if [ -s doc-nits ] ; then cat doc-nits; rm doc-nits ; exit 1; fi + # Test coverage is a good idea for the future #coverage: $(PROGRAMS) $(TESTPROGRAMS) # ... @@ -778,7 +700,7 @@ tar: cd $(SRCDIR); ls -l $(TARFILE).gz dist: - @$(MAKE) PREPARE_CMD='./Configure dist' tar + @$(MAKE) PREPARE_CMD='$(PERL) ./Configure dist' tar # Helper targets ##################################################### @@ -837,7 +759,7 @@ openssl.pc: configdata.pm: $(SRCDIR)/Configure $(SRCDIR)/config {- join(" ", @{$config{build_file_templates}}, @{$config{build_infos}}, @{$config{conf_files}}) -} @echo "Detected changed: $?" @echo "Reconfiguring..." - $(SRCDIR)/Configure reconf + $(PERL) $(SRCDIR)/Configure reconf @echo "**************************************************" @echo "*** ***" @echo "*** Please run the same make command again ***" @@ -853,13 +775,13 @@ configdata.pm: $(SRCDIR)/Configure $(SRCDIR)/config {- join(" ", @{$config{build # It takes a list of library names and outputs a list of dependencies sub compute_lib_depends { if ($disabled{shared}) { - return map { $_.$libext } @_; + return map { lib($_) } @_; } # Depending on shared libraries: # On Windows POSIX layers, we depend on {libname}.dll.a # On Unix platforms, we depend on {shlibname}.so - return map { shlib_simple($_) } @_; + return map { $_ =~ /\.a$/ ? $`.$libext : shlib_simple($_) } @_; } sub generatesrc { @@ -944,16 +866,26 @@ EOF $incs .= " -I".$withargs{zlib_include}; } } - my $ecflags = { lib => '$(LIB_CFLAGS)', - dso => '$(DSO_CFLAGS)', - bin => '$(BIN_CFLAGS)' } -> {$args{intent}}; + my $cc = '$(CC)'; + my $cflags = '$(CFLAGS)'; + if (grep /\.(cc|cpp)$/, @srcs) { + $cc = '$(CXX)'; + $cflags = '$(CXXFLAGS)'; + $cflags .= ' ' . { lib => '$(LIB_CXXFLAGS)', + dso => '$(DSO_CXXFLAGS)', + bin => '$(BIN_CXXFLAGS)' } -> {$args{intent}}; + } else { + $cflags .= ' ' . { lib => '$(LIB_CFLAGS)', + dso => '$(DSO_CFLAGS)', + bin => '$(BIN_CFLAGS)' } -> {$args{intent}}; + } my $makedepprog = $config{makedepprog}; my $recipe = <<"EOF"; $obj$objext: $deps EOF if (!$disabled{makedepend} && $makedepprog !~ /\/makedepend/) { $recipe .= <<"EOF"; - \$(CC) $incs \$(CFLAGS) $ecflags -MMD -MF $obj$depext.tmp -MT \$\@ -c -o \$\@ $srcs + $cc $incs $cflags -MMD -MF $obj$depext.tmp -MT \$\@ -c -o \$\@ $srcs \@touch $obj$depext.tmp \@if cmp $obj$depext.tmp $obj$depext > /dev/null 2> /dev/null; then \\ rm -f $obj$depext.tmp; \\ @@ -963,11 +895,11 @@ EOF EOF } else { $recipe .= <<"EOF"; - \$(CC) $incs \$(CFLAGS) $ecflags -c -o \$\@ $srcs + $cc $incs $cflags -c -o \$\@ $srcs EOF if (!$disabled{makedepend} && $makedepprog =~ /\/makedepend/) { $recipe .= <<"EOF"; - -\$(MAKEDEPEND) -f- -o"|\$\@" -- $incs \$(CFLAGS) $ecflags -- $srcs \\ + -\$(MAKEDEPEND) -f- -o"|\$\@" -- $incs $cflags -- $srcs \\ >$obj$depext.tmp 2>/dev/null -\$(PERL) -i -pe 's/^.*\\|//; s/ \\/(\\\\.|[^ ])*//; \$\$_ = undef if (/: *\$\$/ || /^(#.*| *)\$\$/); \$\$_.="\\n" unless !defined(\$\$_) or /\\R\$\$/g;' $obj$depext.tmp \@if cmp $obj$depext.tmp $obj$depext > /dev/null 2> /dev/null; then \\ @@ -1057,7 +989,7 @@ EOF } sub obj2lib { my %args = @_; - my $lib = $args{lib}; + (my $lib = $args{lib}) =~ s/\.a$//; my $objs = join(" ", map { $_.$objext } @{$args{objs}}); return <<"EOF"; $lib$libext: $objs @@ -1072,12 +1004,23 @@ EOF my $binn = basename($bin); my $objs = join(" ", map { $_.$objext } @{$args{objs}}); my $deps = join(" ",compute_lib_depends(@{$args{deps}})); - my $linklibs = join("", map { my $d = dirname($_); - my $f = basename($_); - $d = "." if $d eq $f; - (my $l = $f) =~ s/^lib//; - " -L$d -l$l" } @{$args{deps}}); + my $linklibs = join("", map { if ($_ =~ /\.a$/) { + " $_"; + } else { + my $d = dirname($_); + my $f = basename($_); + $d = "." if $d eq $f; + (my $l = $f) =~ s/^lib//; + " -L$d -l$l" + } + } @{$args{deps}}); my $shlib_target = $disabled{shared} ? "" : $target{shared_target}; + my $cc = '$(CC)'; + my $cflags = '$(CFLAGS) $(BIN_CFLAGS)'; + if (grep /_cc$/, @{$args{objs}}) { + $cc = '$(CXX)'; + $cflags = '$(CXXFLAGS) $(BIN_CXXFLAGS)'; + } return <<"EOF"; $bin$exeext: $objs $deps \$(RM) $bin$exeext @@ -1085,8 +1028,8 @@ $bin$exeext: $objs $deps PERL="\$(PERL)" SRCDIR=\$(SRCDIR) \\ APPNAME=$bin$exeext OBJECTS="$objs" \\ LIBDEPS='\$(PLIB_LDFLAGS) '"$linklibs"' \$(EX_LIBS)' \\ - CC='\$(CC)' CFLAGS='\$(CFLAGS) \$(BIN_CFLAGS)' \\ - LDFLAGS='\$(LDFLAGS)' LIBRPATH='\$(INSTALLTOP)/\$(LIBDIR)' \\ + CC='$cc' CFLAGS='$cflags' \\ + LDFLAGS='\$(LDFLAGS)' \\ link_app.$shlib_target EOF }