summaryrefslogtreecommitdiffstats
path: root/Configurations
AgeCommit message (Collapse)Author
2016-11-06Windows: use default ZLIB1 unless --with-zlib-lib is setRichard Levitte
Reviewed-by: Andy Polyakov <appro@openssl.org> (Merged from https://github.com/openssl/openssl/pull/1772) (cherry picked from commit 475592e2419c5cb3098dfea4c9229d0c09ea7010)
2016-11-06Fix the LIBZ macro on VC config targetsRichard Levitte
If zlib-dynamic was given but not --with-zlib-lib, LIBZ was defined to the empty string. Instead, give it the default "ZLIB1". Reviewed-by: Andy Polyakov <appro@openssl.org> (Merged from https://github.com/openssl/openssl/pull/1772) (cherry picked from commit 111b234c8f80371e7e31d922946cbd546491d4e8)
2016-11-06VMS: pretend to use -znodeleteRichard Levitte
VMS only unloads shared libraries at process rundown, so tell the OpenSSL code so by pretending we linked with -znodelete. Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/1862) (cherry picked from commit 1186a2b3d40e33cbf42d4fd3c7cc679f9f6e14f2)
2016-11-04VMS build file template: assign 'arch' to local symbol tableRichard Levitte
Since the local symbol table is looked up before the global symbol table, 'arch' assigned in the local symbol table of the DCL where MMS is called would be seen before the 'arch' defined in descrip.mms. Assigning it to the local symbol table in descrip.mms removes that issue. Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/1853) (cherry picked from commit 3ee24d4acaff1c247db89c5cfcac17749dc3d7bc)
2016-11-03Enable memory debugging while testingRichard Levitte
Pre 1.1.0, 'make test' would set the environment variable OPENSSL_DEBUG_MEMORY to "on". This got lost when translating the old build files to the new templates. This changes reintroduces that variable. Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/1840) (cherry picked from commit 6d4bc8a3d2c2f7701588bbfdea80a1f7a3973f26)
2016-11-03Clang doesn't like -znodelete, make it a linker flag insteadRichard Levitte
gcc is kinder, it silently passes quite a few flags to ld, while clang is stricter and wants them prefixed with -Wl, Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/1836) (cherry picked from commit 075e9da055454ec5586962b43d9923e44bdcb313)
2016-11-02Link using -znodeleteMatt Caswell
Instead of deliberately leaking a reference to ourselves, use nodelete which does this more neatly. Only for Linux at the moment. Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit b6d5ba1a9f004d637acac18ae3519fe063b6b5e1)
2016-10-31Unix Makefile: Some sed implementation truncate long lines. Use perl instead.Richard Levitte
Fixes #1781 Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/1813) (cherry picked from commit ebca7961a6bc2652ecb3cf6dda3f43943e2965d3)
2016-10-31Mark VC templates correctly.Richard Levitte
VC-noCE-common and VC-WIN64-common were missing this line: template => 1, Fixes GH#1809 Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/1811) (cherry picked from commit be1f4812111aa76f12db91d9059ead3b43314b4c)
2016-10-26VMS: tell the C compiler to use the ISO C94 standardRichard Levitte
The current version of the VMS compiler provides C99 features, strictly language wise. Unfortunately, even the most recent standard library isn't fully updated for that standard, so we need to use an earlier standard that the compiler supports. Most importantly, this affects the __STDC_VERSION__ value, which the compiler unfortunately currently defaults to 199901L. With this change we won't have to give VMS special treatment when looking for features based on that macro. Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/1785) (cherry picked from commit 4f3015bb30b7d95bb97408776b70e6a35fb91e8a)
2016-10-22Efence is antiquated, remove all traces of using itRichard Levitte
Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/1768) (cherry picked from commit 4fab3e24d62c810bc9165920af1c67c6215c7418)
2016-10-13Remove automatic RPATH - add user rpath supportRichard Levitte
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> (cherry picked from commit fad599f7f147ee71e5581211fb654c2c8c491cd8)
2016-10-13Remove automatic RPATHRichard Levitte
Before OpenSSL 1.1.0, binaries were installed in a non-standard location by default, and runpath directories were therefore added in those binaries, to make sure the executables would be able to find the shared libraries they were linked with. With OpenSSL 1.1.0 and on, binaries are installed in standard directories by default, and the addition of runpath directories is therefore not needed any more. Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 075f7e2c6062a33352f570eeafe3c95e41419521)
2016-10-02Remove untrue comment.Ben Laurie
Reviewed-by: Richard Levitte <levitte@openssl.org>
2016-10-02Make dependencies if Makefile is new.Ben Laurie
Reviewed-by: Richard Levitte <levitte@openssl.org>
2016-09-21descrip.mms.tmpl: in obj2bin, make sure an empty @deps means no empty linesRichard Levitte
Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 47852e6ae763a40ddc3538c76a02be06fd0595a5)
2016-09-17Simplify configudata.pm dependency generationRichard Levitte
While we're at it, correct the fault in windows-makefile.tmpl Reviewed-by: Andy Polyakov <appro@openssl.org> (cherry picked from commit 41240e68d745972d56dd037caf439d9c5032813f)
2016-09-16Simplify the dependencies for remaking configdata.pmRichard Levitte
Reviewed-by: Andy Polyakov <appro@openssl.org> (cherry picked from commit c5ad3076a6c076ac9f8449c393dd14c16b737560)
2016-09-16Use the registered conf file names as dependencies to build configdata.pmRichard Levitte
Reviewed-by: Andy Polyakov <appro@openssl.org> (cherry picked from commit dc660c70b52c552aa4eb9659963bfbe6ab18bec0)
2016-09-15Finally, make sure vms_term_sock.c is built on VMSRichard Levitte
Reviewed-by: Andy Polyakov <appro@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit d602c2b680aefd3e0d00d090783ef5f912caf06a)
2016-09-13Remove -xtarget=ultra from solaris(64)-sparcv9-cc builds.Andy Grundman
This flag got moved after -xarch=v9 in 1.1.0 and had the unexpected side effect of the compiler building for 32-bit v8plusa instead of v9. GH#1521 CLA: none; trivial Signed-off-by: Andy Polyakov <appro@openssl.org> Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit fa4618a2805e7115cf47d0cf0d15cb7b3c944bba)
2016-09-12Add enginesdir to libcrypto.pc pkg-config fileDavid Woodhouse
Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit cdbbf9900253e8006868eba948248b1092a057de)
2016-09-08Configurations/10-main.cf: AIX "facelift".Andy Polyakov
Improve interchangeability of aix*-gcc targets by linking shared libraries with -static-libgcc, and address linking problems with vendor compiler. Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit f780eaad5be140cf192191b8d79dc3671443e0b2)
2016-09-07Allow asan, msan and ubsan to be configured with shared librariesRichard Levitte
The background story is that util/shlib_wrap.sh was setting LD_PRELOAD or similar platform dependent variables, just in case the shared libraries were built with -rpath. Unfortunately, this doesn't work too well with asan, msan or ubsan. So, the solution is to forbid the combination of shared libraries, -rpath and any of the sanity analyzers we can configure. This changes util/shlib_wrap.sh so it only contains the code that sets LD_PRELOAD when -rpath has been used when configuring. Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 342a1a23793cb99921abeabe882adf8652ba715d)
2016-09-05Unix build: have the makedepend and cc actions in one recipeRichard Levitte
In the case of using an independent makedepend, we had split that into two separate recipes, one depending on the other. However, there are cases where the makedepend recipe was always trying, but doesn't update the time stamp of the .d file because there are no actual changes, and thereby causing constant updates of the object files. This change makes one recipe that takes care of both makedepend och cc, thereby avoiding these extra updates. Reviewed-by: Andy Polyakov <appro@openssl.org> (cherry picked from commit 7e5b8b93f2ffa8300b992d2e79c50f0e5266c61b)
2016-09-02Configurations/10-main.conf: fix omittions in commentary.Andy Polyakov
Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit d5a39c12f0331dd0d14dbfcf2b98921be4cbb1da)
2016-09-02Configurations/10-main.conf: remove solaris-x86-cc target.Andy Polyakov
Since vendor assembler can't assemble our modules with -KPIC flag, it, assembly support, was not available as an option. But this means lack of side-channel resistant code, which is incompatible with security by todays standards. Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 216a0cc4d6a35a21e613f1e7e9eee957768bf9dd)
2016-08-31Have Configure's HASH or TABLE produce complete listsRichard Levitte
Because some targets execute perl code that might die, we risk incomplete lists. Make it so dying doesn't happen when we're listing targets. Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit d63c12c697faa4e2fa0e5d7565521a5813c86415)
2016-08-26VMS: honor --openssldir settingRichard Levitte
Because of a perl operator priority mixup, the --openssldir argument wasn't honored. Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit 661a396373fbd2082eee4ad6829336219ec7dac6)
2016-08-24Configurations/10-main.conf: fix solaris64-*-cc link problems.Andy Polyakov
Reviewed-by: Richard Levitte <levitte@openssl.org>
2016-08-22VMS: Use strict refdef extern model when building library object filesRichard Levitte
Most of the time, this isn't strictly needed. However, in the default extern model (called relaxed refdef), symbols are treated as weak common objects unless they are initialised. The librarian doesn't include weak symbols in the (static) libraries, which renders them invisible when linking a program with said those libraries, which is a problem at times. Using the strict refdef model is much more like standard C on all other platforms, and thereby avoid the issues that come with the relaxed refdef model. Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-08-05spelling fixes, just comments and readme.klemens
Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/1413)
2016-08-04When tr gets bracketed arguments, they need to be quotedRichard Levitte
Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-08-04Remove some unused options from 10-main.confBenjamin Kaduk
The options RC4_CHUNK_LL, DES_PTR, and BF_PTR were removed by Rich in commit 3e9e810f2e047effb1056211794d2d12ec2b04e7 but were still sticking around in a coupule configuration entries. Since they're unused, remove them. Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/1390)
2016-08-03VMS: make sure to provide an absolute source directory for pod2htmlRichard Levitte
Experience shows that pod2html changes directory during its process without properly adjusting the given source directory. Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-08-02Don't overwrite existing installed openssl.cnfRichard Levitte
Instead, install the new one as openssl.cnf.dist (openssl.cnf-dist on VMS), and only install it as openssl.cnf if that file doesn't already exist. Also, don't install with exec privileges on VMS. Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-08-02All of ssldirs installation should be done by the install_ssldirs targetRichard Levitte
The Unix build file template didn't do that quite right. Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-08-01apps/openssl.c: UTF-y Windows argv.Andy Polyakov
Windows never composes UTF-8 strings as result of user interaction such as passing command-line argument. The only way to compose one is programmatic conversion from WCHAR string, which in turn can be picked up on command line. [For reference, why not wmain, it's not an option on MinGW.] Reviewed-by: Richard Levitte <levitte@openssl.org>
2016-08-01Configurations/00-base-templates.conf: harmonize BASE_Windows.Andy Polyakov
Reviewed-by: Richard Levitte <levitte@openssl.org>
2016-07-31Configurations/unix-Makefile.tmpl: add LC_ALL=C to unify messages.Andy Polyakov
RT#4138 Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-07-26Add Hurd shared extensionKurt Roeckx
Reviewed-by: Rich Salz <rsalz@openssl.org> GH: #1345
2016-07-22VMS: Rearrange installation targets for shared librariesRichard Levitte
The way it was implemented before this change, the shared libraries were installed twice. On a file system that supports file generations, that's a waste. Slightly rearranging the install targets solves the problem. Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-07-20Install shared libraries in runtime installRichard Levitte
On non-Windows platforms, shared libraries are both development and runtime files. We only installed them as development files, this makes sure they get installed as runtime files as well. Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-07-20VMS: fix typo, shared libraries have the extension .EXE, not .OLBRichard Levitte
Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-07-18Don't make a difference between building test programs and other programsRichard Levitte
This adds a new target 'build_programs' and makes 'build_apps' and 'build_tests' aliases for it, for backward compatibility. Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-07-18Adapt the build files to the new "install" hash tableRichard Levitte
Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-07-18Document the _NO_INST variantsRichard Levitte
Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-07-15Windows: allow input and output flags to end with a space, or notRichard Levitte
With a number of tools, especially those coming with Visual Studio, some command options are separated from their argument with a space, others with a space. Since we parametrise them, we can't know beforehand which it will be, so we must allow the input and output options to have either. However, spaces at the end of nmake macro values are trimmed, so allow spaces to exist by adding a reference to an undefined macro at the end. Reviewed-by: Andy Polyakov <appro@openssl.org>
2016-07-14Small fixes in unix-Makefile.tmplRichard Levitte
Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-07-14Install applink.c with the public header files.Richard Levitte
This is only done for the platforms where 'OPENSSL_USE_APPLINK' is defined. Also, change the docs of OPENSSL_Applink to say where to find applink.c in the installation directory. Reviewed-by: Rich Salz <rsalz@openssl.org>