Commit 6c4be50a authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Move Haiku configuration to separate config file to denote 


the fact that it's community-supported target.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent e33826f0

Configurations/10-main.conf

+0 −30
Original line number Diff line number Diff line
@@ -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" => {

Configurations/50-haiku.conf

0 → 100644
+29 −0
Original line number Diff line number Diff line 
%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",

    },

);

e_os.h

+0 −7
Original line number Diff line number Diff line
@@ -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

os-dep/haiku.h

0 → 100644
+2 −0
Original line number Diff line number Diff line 
#include <sys/select.h>

#include <sys/time.h>