Browse Source

Move Haiku configuration to separate config file to denote

the fact that it's community-supported target.

Reviewed-by: Rich Salz <rsalz@openssl.org>
master
Andy Polyakov 5 years ago
parent
commit
6c4be50a5d
4 changed files with 31 additions and 37 deletions
  1. +0
    -30
      Configurations/10-main.conf
  2. +29
    -0
      Configurations/50-haiku.conf
  3. +0
    -7
      e_os.h
  4. +2
    -0
      os-dep/haiku.h

+ 0
- 30
Configurations/10-main.conf View File

@ -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" => {


+ 29
- 0
Configurations/50-haiku.conf View File

@ -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",
},
);

+ 0
- 7
e_os.h View File

@ -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


+ 2
- 0
os-dep/haiku.h View File

@ -0,0 +1,2 @@
#include <sys/select.h>
#include <sys/time.h>

Loading…
Cancel
Save