[openssl-commits] [openssl] master update
Andy Polyakov
appro at openssl.org
Thu May 19 20:43:07 UTC 2016
The branch master has been updated
via 6c4be50a5d775866e79b2f58fafb23a862bd38b2 (commit)
from e33826f01bd78af76e0135c8dfab3387927a82bb (commit)
- Log -----------------------------------------------------------------
commit 6c4be50a5d775866e79b2f58fafb23a862bd38b2
Author: Andy Polyakov <appro at openssl.org>
Date: Sun May 1 14:33:19 2016 +0200
Move Haiku configuration to separate config file to denote
the fact that it's community-supported target.
Reviewed-by: Rich Salz <rsalz at openssl.org>
-----------------------------------------------------------------------
Summary of changes:
Configurations/10-main.conf | 30 ------------------------------
Configurations/50-haiku.conf | 29 +++++++++++++++++++++++++++++
e_os.h | 7 -------
os-dep/haiku.h | 2 ++
4 files changed, 31 insertions(+), 37 deletions(-)
create mode 100644 Configurations/50-haiku.conf
create mode 100644 os-dep/haiku.h
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 84d3323..e0dad4f 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1715,36 +1715,6 @@ sub vms_info {
shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
ranlib => "$ENV{'RANLIB'}",
},
- "haiku-common" => {
- template => 1,
- cc => "cc",
- cflags => add_before(picker(default => "-DL_ENDIAN -Wall",
- debug => "-g -O0",
- release => "-O2"),
- threads("-D_REENTRANT")),
- sys_id => "HAIKU",
- lflags => "-lnetwork",
- perlasm_scheme => "elf",
- thread_scheme => "pthreads",
- dso_scheme => "dlfcn",
- shared_target => "haiku-shared",
- shared_cflag => "-fPIC",
- shared_ldflag => "-shared",
- shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- },
- "haiku-x86" => {
- inherit_from => [ "haiku-common", asm("x86_elf_asm") ],
- cflags => add(picker(default => "",
- release => "-fomit-frame-pointer")),
- bn_ops => "BN_LLONG",
- },
- # Haiku builds with no-asm
- "haiku-x86_64" => {
- inherit_from => [ "haiku-common", asm("x86_64_asm") ],
- cflags => add("-m64"),
- bn_ops => "SIXTY_FOUR_BIT_LONG",
- },
-
##### VMS
"vms-generic" => {
diff --git a/Configurations/50-haiku.conf b/Configurations/50-haiku.conf
new file mode 100644
index 0000000..f114666
--- /dev/null
+++ b/Configurations/50-haiku.conf
@@ -0,0 +1,29 @@
+%targets = (
+ "haiku-common" => {
+ template => 1,
+ cc => "cc",
+ cflags => add_before(picker(default => "-DL_ENDIAN -Wall -include \$(SRCDIR)/os-dep/haiku.h",
+ debug => "-g -O0",
+ release => "-O2"),
+ threads("-D_REENTRANT")),
+ sys_id => "HAIKU",
+ ex_libs => "-lnetwork",
+ perlasm_scheme => "elf",
+ thread_scheme => "pthreads",
+ dso_scheme => "dlfcn",
+ shared_target => "gnu-shared",
+ shared_cflag => "-fPIC",
+ shared_ldflag => "-shared",
+ shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ },
+ "haiku-x86" => {
+ inherit_from => [ "haiku-common", asm("x86_elf_asm") ],
+ cflags => add(picker(release => "-fomit-frame-pointer")),
+ bn_ops => "BN_LLONG",
+ },
+ "haiku-x86_64" => {
+ inherit_from => [ "haiku-common" ],
+ cflags => add("-m64"),
+ bn_ops => "SIXTY_FOUR_BIT_LONG",
+ },
+);
diff --git a/e_os.h b/e_os.h
index 83b024a..1c4c204 100644
--- a/e_os.h
+++ b/e_os.h
@@ -504,13 +504,6 @@ struct servent *getservbyname(const char *name, const char *proto);
# endif
/* end vxworks */
-/* haiku */
-# if defined(OPENSSL_SYS_HAIKU)
-# include <sys/select.h>
-# include <sys/time.h>
-# endif
-/* end haiku */
-
#define OSSL_NELEM(x) (sizeof(x)/sizeof(x[0]))
#ifdef __cplusplus
diff --git a/os-dep/haiku.h b/os-dep/haiku.h
new file mode 100644
index 0000000..7e908ef
--- /dev/null
+++ b/os-dep/haiku.h
@@ -0,0 +1,2 @@
+#include <sys/select.h>
+#include <sys/time.h>
More information about the openssl-commits
mailing list