diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-02-27 11:37:33 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-03-02 19:15:42 +0100 |
| commit | 98fdbce09144a8addc6682a0ffd8ac92b2ce70b1 (patch) | |
| tree | 35c5da21605d51543ea872ea5a7237e375f17fdf /Configurations/99-personal-geoff.conf | |
| parent | d2b2221a04053578911d34a45026543e4c39ce0c (diff) | |
Configure - move the addition of the zlib / libz lib to configs
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>
Diffstat (limited to 'Configurations/99-personal-geoff.conf')
| -rw-r--r-- | Configurations/99-personal-geoff.conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Configurations/99-personal-geoff.conf b/Configurations/99-personal-geoff.conf index 89ba499c18..0e393f9656 100644 --- a/Configurations/99-personal-geoff.conf +++ b/Configurations/99-personal-geoff.conf @@ -6,7 +6,7 @@ cc => "gcc", cflags => "-DBN_DEBUG -DBN_DEBUG_RAND -DBN_STRICT -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -O1 -ggdb2 -Wall -Werror -Wundef -pedantic -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wsign-compare -Wmissing-prototypes -Wmissing-declarations -Wno-long-long", thread_cflag => "-D_REENTRANT", - ex_libs => "-ldl", + ex_libs => add(" ","-ldl"), bn_ops => "BN_LLONG", dso_scheme => "dlfcn", shared_target => "linux-shared", @@ -17,7 +17,7 @@ cc => "gcc", cflags => "-DBN_DEBUG -DBN_DEBUG_RAND -DBN_STRICT -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -O1 -ggdb2 -Wall -Werror -Wundef -pedantic -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wsign-compare -Wmissing-prototypes -Wmissing-declarations -Wno-long-long", thread_cflag => "-D_REENTRANT", - ex_libs => "-ldl", + ex_libs => add(" ","-ldl"), bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR", dso_scheme => "dlfcn", shared_target => "linux-shared", |