From 04b08fbc3d0db3f7c540df4f5f00d30fae27ef90 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Fri, 29 Jan 2016 19:28:05 +0100 Subject: [PATCH] Complete the lflags -> lflags/ex_libs transition Some last lflags to convert to ex_libs or a combo of lflags and ex_libs Reviewed-by: Rich Salz --- Configurations/90-team.conf | 14 +++++++------- Configurations/99-personal-bodo.conf | 2 +- Configurations/99-personal-geoff.conf | 4 ++-- Configurations/99-personal-levitte.conf | 8 ++++---- Configurations/99-personal-steve.conf | 7 ++++--- 5 files changed, 18 insertions(+), 17 deletions(-) diff --git a/Configurations/90-team.conf b/Configurations/90-team.conf index a0f2ce3103..3dee0f11ae 100644 --- a/Configurations/90-team.conf +++ b/Configurations/90-team.conf @@ -10,20 +10,20 @@ cc => "purify gcc", cflags => "-g -Wall", thread_cflag => "(unknown)", - lflags => "-lsocket -lnsl", + ex_libs => "-lsocket -lnsl", }, "debug" => { cc => "gcc", cflags => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DOPENSSL_NO_ASM -ggdb -g2 -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror", thread_cflag => "(unknown)", - lflags => "-lefence", + ex_libs => "-lefence", }, "debug-erbridge" => { inherit_from => [ "x86_64_asm" ], cc => "gcc", cflags => "$gcc_devteam_warn -DBN_DEBUG -DCONF_DEBUG -m64 -DL_ENDIAN -DTERMIO -g", thread_cflag => "-D_REENTRANT", - lflags => "-ldl", + ex_libs => "-ldl", bn_ops => "SIXTY_FOUR_BIT_LONG", perlasm_scheme => "elf", dso_scheme => "dlfcn", @@ -38,7 +38,7 @@ cc => "gcc", cflags => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DL_ENDIAN -g -mcpu=pentium -Wall", thread_cflag => "-D_REENTRANT", - lflags => "-ldl", + ex_libs => "-ldl", bn_ops => "BN_LLONG", dso_scheme => "dlfcn", }, @@ -47,7 +47,7 @@ cc => "gcc", cflags => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DL_ENDIAN -g -mcpu=pentiumpro -Wall", thread_cflag => "-D_REENTRANT", - lflags => "-ldl", + ex_libs => "-ldl", bn_ops => "BN_LLONG", dso_scheme => "dlfcn", }, @@ -56,7 +56,7 @@ cc => "gcc", cflags => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DL_ENDIAN -g -march=i486 -Wall", thread_cflag => "-D_REENTRANT", - lflags => "-ldl", + ex_libs => "-ldl", bn_ops => "BN_LLONG", dso_scheme => "dlfcn", shared_target => "linux-shared", @@ -67,7 +67,7 @@ cc => "gcc", cflags => "-DAES_EXPERIMENTAL -DL_ENDIAN -O3 -fomit-frame-pointer -Wall", thread_cflag => "-D_REENTRANT", - lflags => "-ldl", + ex_libs => "-ldl", bn_ops => "BN_LLONG", cpuid_obj => "x86cpuid.o", bn_obj => "bn-586.o co-586.o x86-mont.o", diff --git a/Configurations/99-personal-bodo.conf b/Configurations/99-personal-bodo.conf index 603fc2b4a5..d5e3210c9c 100644 --- a/Configurations/99-personal-bodo.conf +++ b/Configurations/99-personal-bodo.conf @@ -11,7 +11,7 @@ cc => "gcc", cflags => "$gcc_devteam_warn -Wno-error=overlength-strings -DBN_DEBUG -DBN_DEBUG_RAND -DCONF_DEBUG -DBIO_PAIR_DEBUG -m64 -DL_ENDIAN -DTERMIO -g -DMD32_REG_T=int", thread_cflag => "-D_REENTRANT", - lflags => "-ldl", + ex_libs => "-ldl", bn_ops => "SIXTY_FOUR_BIT_LONG", perlasm_scheme => "elf", dso_scheme => "dlfcn", diff --git a/Configurations/99-personal-geoff.conf b/Configurations/99-personal-geoff.conf index 133a366309..bd3f54526b 100644 --- a/Configurations/99-personal-geoff.conf +++ b/Configurations/99-personal-geoff.conf @@ -10,7 +10,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", - lflags => "-ldl", + ex_libs => "-ldl", bn_ops => "BN_LLONG", dso_scheme => "dlfcn", shared_target => "linux-shared", @@ -21,7 +21,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", - lflags => "-ldl", + ex_libs => "-ldl", bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR", dso_scheme => "dlfcn", shared_target => "linux-shared", diff --git a/Configurations/99-personal-levitte.conf b/Configurations/99-personal-levitte.conf index 4bfcbbecea..75a0750aeb 100644 --- a/Configurations/99-personal-levitte.conf +++ b/Configurations/99-personal-levitte.conf @@ -12,7 +12,7 @@ cflags => "-DL_ENDIAN -Wall", debug_cflags => "-DLEVITTE_DEBUG -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -ggdb -g3", thread_cflag => "-D_REENTRANT", - lflags => "-ldl", + ex_libs => "-ldl", bn_ops => "BN_LLONG", dso_scheme => "dlfcn", shared_target => "linux-shared", @@ -23,7 +23,7 @@ cc => "gcc", cflags => "-DLEVITTE_DEBUG -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -ggdb -g3 -Wall", thread_cflag => "-D_REENTRANT", - lflags => "-ldl", + ex_libs => "-ldl", bn_ops => "BN_LLONG", dso_scheme => "dlfcn", shared_target => "linux-shared", @@ -35,7 +35,7 @@ cc => "gcc", cflags => "-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DENGINE_CONF_DEBUG -DL_ENDIAN -DPEDANTIC -ggdb -g3 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe", thread_cflag => "-D_REENTRANT", - lflags => "-ldl", + ex_libs => "-ldl", bn_ops => "BN_LLONG", perlasm_scheme => "elf", dso_scheme => "dlfcn", @@ -47,7 +47,7 @@ cc => "gcc", cflags => "-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DENGINE_CONF_DEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DPEDANTIC -ggdb -g3 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe", thread_cflag => "-D_REENTRANT", - lflags => "-ldl", + ex_libs => "-ldl", bn_ops => "BN_LLONG", perlasm_scheme => "void", dso_scheme => "dlfcn", diff --git a/Configurations/99-personal-steve.conf b/Configurations/99-personal-steve.conf index 0d53b06ecf..4ddf5ec79e 100644 --- a/Configurations/99-personal-steve.conf +++ b/Configurations/99-personal-steve.conf @@ -11,7 +11,7 @@ cc => "gcc", cflags => "$gcc_devteam_warn -pthread -m64 -DL_ENDIAN -DTERMIO -DCONF_DEBUG -g", thread_cflag => "-D_REENTRANT", - lflags => "-ldl", + ex_libs => "-ldl", bn_ops => "SIXTY_FOUR_BIT_LONG", perlasm_scheme => "elf", dso_scheme => "dlfcn", @@ -25,7 +25,8 @@ cc => "gcc", cflags => "$gcc_devteam_warn -pthread -m32 -DL_ENDIAN -DCONF_DEBUG -g", thread_cflag => "-D_REENTRANT", - lflags => "-rdynamic -ldl", + lflags => "-rdynamic", + ex_libs => "-ldl", bn_ops => "BN_LLONG", dso_scheme => "dlfcn", shared_target => "linux-shared", @@ -38,7 +39,7 @@ cc => "gcc", cflags => "$gcc_devteam_warn -pthread -m64 -O3 -DL_ENDIAN -DTERMIO -DCONF_DEBUG -g", thread_cflag => "-D_REENTRANT", - lflags => "-ldl", + ex_libs => "-ldl", bn_ops => "SIXTY_FOUR_BIT_LONG", perlasm_scheme => "elf", dso_scheme => "dlfcn", -- 2.40.0