summaryrefslogtreecommitdiff
path: root/Configure
Commit message (Collapse)AuthorAgeFilesLines
* Check gcc version to see if it supports -MM and friendsRichard Levitte2016-03-091-1/+5
| | | | | | | | | According to manuals found here: https://gcc.gnu.org/onlinedocs/, GNU C version 3 and on support the dependency generation options. We therefore need to check the gcc version to see if we're going to use it or makedepend for dependency generation. Reviewed-by: Andy Polyakov <appro@openssl.org>
* Add the configure option 'no-makedepend'Richard Levitte2016-03-091-5/+13
| | | | | | | If no makedepend program or equaly capable compiler is present, 'makedepend' gets disabled automatically. Reviewed-by: Rich Salz <rsalz@openssl.org>
* Add the Configure option --classic, to fall back on classic build schemesRichard Levitte2016-03-081-1/+23
| | | | Reviewed-by: Matt Caswell <matt@openssl.org>
* Revert "unified build scheme: Try to nudge users to try the "unified" build"Richard Levitte2016-03-081-49/+1
| | | | | | This reverts commit 242ffb05a2e4aa3fc7ffc131037e077b7e242189. Reviewed-by: Matt Caswell <matt@openssl.org>
* Fix building without multiblock supportMatt Caswell2016-03-081-0/+1
| | | | | | | | | Not all platforms support multiblock. Building without it fails prior to this fix. RT#4396 Reviewed-by: Richard Levitte <levitte@openssl.org>
* Unified - Add the build.info command OVERRIDE, to avoid build file clashesRichard Levitte2016-03-071-1/+10
| | | | | | | | | | | | | | | | Should it be needed because the recipes within a RAW section might clash with those generated by Configure, it's possible to tell it not to generate them with the use of OVERRIDES, for example: SOURCE[libfoo]=foo.c bar.c OVERRIDES=bar.o BEGINRAW[Makefile(unix)] bar.o: bar.c $(CC) $(CFLAGS) -DSPECIAL -c -o $@ $< ENDRAW[Makefile(unix)] Reviewed-by: Rich Salz <rsalz@openssl.org>
* Unified - Add the build.info command GENERATE, to generate source filesRichard Levitte2016-03-071-0/+18
| | | | | | | | | | | | | | | | In some cases, one might want to generate some source files from others, that's done as follows: GENERATE[foo.s]=asm/something.pl $(CFLAGS) GENERATE[bar.s]=asm/bar.S The value of each GENERATE line is a command line or part of it. Configure places no rules on the command line, except the the first item muct be the generator file. It is, however, entirely up to the build file template to define exactly how those command lines should be handled, how the output is captured and so on. Reviewed-by: Rich Salz <rsalz@openssl.org>
* Misc afalg build fixesMatt Caswell2016-03-071-4/+7
| | | | | | | Misc afalg build fixes as suggested by Richard Levitte for the latest Configure changes. Reviewed-by: Richard Levitte <levitte@openssl.org>
* Rework based on feedback:clucey2016-03-071-1/+5
| | | | | | | | | | | | | | 1. Cleaned up eventfd handling 2. Reworked socket setup code to allow other algorithms to be added in future 3. Fixed compile errors for static build 4. Added error to error stack in all cases of ALG_PERR/ALG_ERR 5. Called afalg_aes_128_cbc() from bind() to avoid race conditions 6. Used MAX_INFLIGHT define in io_getevents system call 7. Coding style fixes Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org>
* ALG: Add AFALG engineclucey2016-03-071-0/+13
| | | | | Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org>
* Change names of ordinals and libs, libeay => libcrypto and ssleay => libsslRichard Levitte2016-03-051-6/+6
| | | | Reviewed-by: Rich Salz <rsalz@openssl.org>
* Disable SSLv3 by defaultKurt Roeckx2016-03-041-0/+2
| | | | | | | Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Emilia Kasper <emilia@openssl.org> MR: #2203
* Don't build RC4 ciphersuites into libssl by defaultMatt Caswell2016-03-041-12/+17
| | | | | | | | RC4 based ciphersuites in libssl have been disabled by default. They can be added back by building OpenSSL with the "enable-weak-ssl-ciphers" Configure option at compile time. Reviewed-by: Rich Salz <rsalz@openssl.org>
* Restore the zlib / zlib-dynamic logicRichard Levitte2016-03-041-0/+5
| | | | | | | | | | | The proper logic is that both zlib and zlib-dynamic are disabled by default and that enabling zlib-dynamic would enable zlib. Somewhere along the way, the logic got changed, zlib-dynamic was enabled by default and zlib didn't get automatically enabled. This change restores the original logic. Reviewed-by: Rich Salz <rsalz@openssl.org>
* Don't copy from %target to %config so much, see %config as a complementRichard Levitte2016-03-021-15/+17
| | | | | | | | | | | We copied $target{cflags}, $target{defines} and a few more to %config, just to add to the entries. Avoid doing so, and let the build templates deal with combining the two. There are a few cases where we still fiddle with %target, but that's acceptable. Reviewed-by: Andy Polyakov <appro@openssl.org>
* Configure - Get rid of the special thread_cflag, replace with thread_schemeRichard Levitte2016-03-021-37/+52
| | | | | | | | | | | | | | | | | | | | | | | The thread_cflag setting filled a double role, as kinda sorta an indicator of thread scheme, and as cflags. Some configs also added lflags and ex_libs for multithreading regardless of if threading would be enabled or not. Instead of this, add threading cflags among in the cflag setting, threading lflags in the lflag setting and so on if and only if threads are enabled (which they are by default). Also, for configs where there are no special cflags for threading (the VMS configs are of that kind), this makes it possible to still clearly mention what thread scheme is used. The exact value of thread scheme is currently ignored except when it's "(unknown)", and thereby only serves as a flag to tell if we know how to build for multi-threading in a particular config. Yet, the currently used values are "(unknown)", "pthreads", "uithreads" (a.k.a solaris threads) and "winthreads". Reviewed-by: Andy Polyakov <appro@openssl.org>
* Configure - get rid of the special debug_ and release_ settingsRichard Levitte2016-03-021-22/+7
| | | | | | | | | | | | | | Instead, make the build type ("debug" or "release") available through $config{build_type} and let the configs themselves figure out what the usual settings (such as "cflags", "lflags" and so on) should be accordingly. The benefit with this is that we can now have debug and release variants of any setting, not just those Configure supports, and may also involve other factors (the MSVC flags /MD[d] and /MT[d] involve both build type and whether threading is enabled or not) Reviewed-by: Andy Polyakov <appro@openssl.org>
* Minimize copied config settingsRichard Levitte2016-03-021-8/+2
| | | | | | | $target{lflags} and $target{plib_flag} were copied to %config for no good reason. Reviewed-by: Andy Polyakov <appro@openssl.org>
* Configure - move the addition of the zlib / libz lib to configsRichard Levitte2016-03-021-21/+1
| | | | | | | | | | | | | | Configure had the Unix centric addition of -lz when linking with zlib is enabled, which doesn't work on other platforms. Therefore, we move it to the BASE_unix config template and add corresponding ones in the other BASE_* config templates. The Windows one is probably incomplete, but that doesn't matter for the moment, as mk1mf does it's own thing anyway. This required making the %withargs table global, so perl snippets in the configs can use it. Reviewed-by: Andy Polyakov <appro@openssl.org>
* Configure - Rename BASE to DEFAULTS and add a few inheritable BASEsRichard Levitte2016-03-021-7/+4
| | | | | | | | | | These BASE templates are intended to hold values that are common for all configuration variants for whole families of configurations. So far, three "families" are identified: Unix, Windows and VMS, mostly characterised by the build system they currently use. Reviewed-by: Andy Polyakov <appro@openssl.org>
* Configure - Allow CODErefs and ARRAYrefs in configuration setting arraysRichard Levitte2016-03-021-19/+43
| | | | | | | | | | | | This provides for more powerful lazy evaluation and buildup of the setting contents. For example, something like this becomes possible: defines => [ sub { $config{thisorthat} ? "FOO" : () } ] Any undefined result of such functions (such as 'undef' or the empty list) will be ignored. Reviewed-by: Andy Polyakov <appro@openssl.org>
* Configure - make the use of environment variables for overrides consistentRichard Levitte2016-03-021-15/+6
| | | | | | | We allow some commands to be overriden, but didn't handle that in a consistent manner. Reviewed-by: Andy Polyakov <appro@openssl.org>
* Make uplink auxiliary source separate from cpuid sourceRichard Levitte2016-03-021-0/+2
| | | | | | | | There are cases, for example when configuring no-asm, that the added uplink source files got in the way of the cpuid ones. The best way to solve this is to separate the two. Reviewed-by: Andy Polyakov <appro@openssl.org>
* Unified - have configdata.pm depend on a few more thingsRichard Levitte2016-03-011-0/+3
| | | | Reviewed-by: Andy Polyakov <appro@openssl.org>
* Remove last remains of old config stringsRichard Levitte2016-02-271-5/+0
| | | | Reviewed-by: Andy Polyakov <appro@openssl.org>
* Apply default after having checked the given config target is validRichard Levitte2016-02-271-1/+4
| | | | Reviewed-by: Rich Salz <rsalz@openssl.org>
* Make the table entry printer in Configure aware of ARRAYsRichard Levitte2016-02-261-2/+12
| | | | Reviewed-by: Rich Salz <rsalz@openssl.org>
* Forgotten change of add() call in ConfigureRichard Levitte2016-02-261-1/+1
| | | | Reviewed-by: Matt Caswell <matt@openssl.org>
* Configure - neater looking add() and add_before()Richard Levitte2016-02-261-2/+10
| | | | | | | | | | | They now default to " " as separator, but that can be overridden by having a hash with parameters as last argument. The only currently recognised parameter is `separator'. The special separator `undef' will force the result to become a list rather than a concatenated string. Reviewed-by: Andy Polyakov <appro@openssl.org>
* Add OPENSSL_PIC backRichard Levitte2016-02-221-0/+4
| | | | | | | | In the earlier change, where static libraries get built with position independent code, OPENSSL_PIC was removed by mistake. This adds it back. Reviewed-by: Tim Hudson <tjh@openssl.org>
* Remove unused parameters from internal functionsRich Salz2016-02-221-3/+3
| | | | Reviewed-by: Richard Levitte <levitte@openssl.org>
* The build files use %disabled, make sure to pass it to themRichard Levitte2016-02-221-1/+1
| | | | Reviewed-by: Rich Salz <rsalz@openssl.org>
* Partial revert of 1288f26 and fix for no-asyncMatt Caswell2016-02-221-1/+1
| | | | | | | The commit 1288f26 says that it fixes no-async, but instead seems to break it. Therefore revert that change and fix no-async. Reviewed-by: Rich Salz <rsalz@openssl.org>
* Clean away $no_dso since with have $disabled{dso}Richard Levitte2016-02-221-3/+2
| | | | Reviewed-by: Rich Salz <rsalz@openssl.org>
* Clean away $no_asm since with have $disabled{asm}Richard Levitte2016-02-221-7/+5
| | | | Reviewed-by: Rich Salz <rsalz@openssl.org>
* Clean away $no_rfc3779 since we don't appear to use it at allRichard Levitte2016-02-221-1/+0
| | | | Reviewed-by: Rich Salz <rsalz@openssl.org>
* Clean away $zlib since with have $disabled{zlib}Richard Levitte2016-02-221-3/+2
| | | | Reviewed-by: Rich Salz <rsalz@openssl.org>
* Clean away $no_threads since we have $disabled{threads}Richard Levitte2016-02-221-4/+3
| | | | Reviewed-by: Rich Salz <rsalz@openssl.org>
* Clean away $config{no_shared} since we have $disabled{shared}Richard Levitte2016-02-221-5/+4
| | | | Reviewed-by: Rich Salz <rsalz@openssl.org>
* Expose %disables to the perl fragments in build.info files.Richard Levitte2016-02-221-14/+15
| | | | | | | This way, we can use them as conditions instead of relying to more or less obscure aliases in %config or variables directly in Configure. Reviewed-by: Rich Salz <rsalz@openssl.org>
* Fix a few typosRichard Levitte2016-02-221-1/+1
| | | | Reviewed-by: Rich Salz <rsalz@openssl.org>
* Get back "ssl2" as a deprecated disablable optionRichard Levitte2016-02-221-1/+16
| | | | | | | | | Preserved for now for those who have scripts with the option "no-ssl2". We warn that it's deprecated, and ignore it otherwise. In response to RT#4330 Reviewed-by: Rich Salz <rsalz@openssl.org>
* Introduce the "pic" / "no-pic" config optionRichard Levitte2016-02-221-6/+27
| | | | | | | | | | | | | | Building shared libraries or not is not the same as building position independent code or not. It's true that if you don't build PIC, you can't build shared libraries. However, you may very well want to build only static libraries but still want PIC code. Therefore, we introduce a new configuration option "pic", which is enabled by default or explicitely with "enable-pic", or disabled with "no-pic" or "disable-pic". Of course, if "pic" is disabled, "shared" and "dynamic-engine" are automatically disabled as well. Reviewed-by: Rich Salz <rsalz@openssl.org>
* Use $disabled{"dynamic-engine"} internallyRichard Levitte2016-02-221-10/+10
| | | | | | | | We were kinda sorta using a mix of $disabled{"static-engine" and $disabled{"dynamic-engine"} in Configure. Let's avoid confusion, choose one of them and stick to it. Reviewed-by: Rich Salz <rsalz@openssl.org>
* Build dynamic engines even if configured "no-shared"Richard Levitte2016-02-201-17/+30
| | | | | | | | | | | | | | | Until now, the engines in engines/ were only built as dynamicaly loadable ones if shared libraries were built. We not dissociate the two and can build dynamicaly loadable engines even if we only build static libcrypto and libssl. This is controlled with the option (enable|disable|no)-static-engine, defaulting to no-static-engine. Note that the engines in crypto/engine/ (dynamic and cryptodev) will always be built into libcrypto. Reviewed-by: Rich Salz <rsalz@openssl.org>
* Always build library object files with shared library cflagsRichard Levitte2016-02-201-8/+0
| | | | | | | | | | | | | | | | This takes us away from the idea that we know exactly how our static libraries are going to get used. Instead, we make them available to build shareable things with, be it other shared libraries or DSOs. On the other hand, we also have greater control of when the shared library cflags. They will never be used with object files meant got binaries, such as apps/openssl or test/test*. With unified, we take this a bit further and prepare for having to deal with extra cflags specifically to be used with DSOs (dynamic engines), libraries and binaries (applications). Reviewed-by: Rich Salz <rsalz@openssl.org>
* Misc small fixes.Richard Levitte2016-02-191-1/+2
| | | | | | | | | | | Better libclean that removes the exact files that have been built, nothing more and nothing less. Corrected typo A couple of editorial changes. Reviewed-by: Andy Polyakov <appro@openssl.org>
* Let Configure figure out the diverse shared library and DSO extensionsRichard Levitte2016-02-191-1/+12
| | | | | | | | | Then it can pass around the information where it belongs. The Makefile templates pick it up along with other target data, the DSO module gets to pick up the information through crypto/include/internal/dso_conf.h Reviewed-by: Andy Polyakov <appro@openssl.org>
* Rethink the uplink / applink storyRichard Levitte2016-02-191-6/+2
| | | | | | | | | | | | | | | | Adding uplink and applink to some builds was done by "magic", the configuration for "mingw" only had a macro definition, the Configure would react to its presence by adding the uplink source files to cpuid_asm_src, and crypto/build.info inherited dance to get it compiled, and Makefile.shared made sure applink.o would be appropriately linked in. That was a lot under the hood. To replace this, we create a few template configurations in Configurations/00-base-templates.conf, inherit one of them in the "mingw" configuration, the rest is just about refering to the $target{apps_aux_src} / $target{apps_obj} in the right places. Reviewed-by: Andy Polyakov <appro@openssl.org>
* Remove all special make depend flags, as well as OPENSSL_DOING_MAKEDEPENDRichard Levitte2016-02-181-13/+0
| | | | | | | | | | All those flags existed because we had all the dependencies versioned in the repository, and wanted to have it be consistent, no matter what the local configuration was. Now that the dependencies are gone from the versioned Makefile.ins, it makes much more sense to use the exact same flags as when compiling the object files. Reviewed-by: Rich Salz <rsalz@openssl.org>
View Lorry Controller Status