From bc5bbe5d0a9a052107e4200a7681d26c4f4ec91c Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 30 Mar 2008 20:14:30 +0000 Subject: [PATCH] * Patch against OpenSSL 0.9.8.g adding Haiku (x86) support. Surprisingly all tests of the test suite just passed. * Also added a file with a few notes. git-svn-id: file:///srv/svn/repos/haiku/buildtools/trunk@24692 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- patches/openssl/Notes | 17 +++++++++++++++++ patches/openssl/openssl-0.9.8g.diff | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+) diff --git a/patches/openssl/Notes b/patches/openssl/Notes new file mode 100644 index 0000000..a71e5fe 100644 --- /dev/null +++ b/patches/openssl/Notes @@ -1,0 +1,17 @@ +Notes for OpenSSL 0.9.8g (Haiku r24681) +======================================= + +configure +--------- + + ./config --prefix=/boot/home/config zlib shared no-sse2 + +* zlib instead of zlib-dynamic: dlopen() in Haiku needs fixing. +* no-sse2: Haiku SSE2 support is broken/non-existent. + +make/install +------------ + + make + make install + diff --git a/patches/openssl/openssl-0.9.8g.diff b/patches/openssl/openssl-0.9.8g.diff new file mode 100644 index 0000000..f61dc84 100644 --- /dev/null +++ b/patches/openssl/openssl-0.9.8g.diff @@ -1,0 +1,54 @@ +diff -ur openssl-0.9.8g-orig/Configure openssl-0.9.8g/Configure +--- openssl-0.9.8g-orig/Configure 2007-09-16 12:24:17.000000000 +0000 ++++ openssl-0.9.8g/Configure 2008-03-29 00:02:46.000000000 +0000 +@@ -527,6 +527,9 @@ + ##### Compaq Non-Stop Kernel (Tandem) + "tandem-c89","c89:-Ww -D__TANDEM -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D_TANDEM_SOURCE -DB_ENDIAN::(unknown):::THIRTY_TWO_BIT:::", + ++##### Haiku ++"haiku-x86", "gcc:-DL_ENDIAN -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::-lnetwork:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:haiku-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++ + ); + + my @MK1MF_Builds=qw(VC-WIN64I VC-WIN64A +diff -ur openssl-0.9.8g-orig/Makefile.shared openssl-0.9.8g/Makefile.shared +--- openssl-0.9.8g-orig/Makefile.shared 2007-09-16 14:11:51.000000000 +0000 ++++ openssl-0.9.8g/Makefile.shared 2008-03-28 19:24:17.000000000 +0000 +@@ -552,10 +552,10 @@ + symlink.cygwin symlink.alpha-osf1 symlink.tru64 symlink.tru64-rpath: + + # Compatibility targets +-link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared: link_o.gnu +-link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared: link_a.gnu +-link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared: link_app.gnu +-symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared: symlink.gnu ++link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared link_o.haiku-shared: link_o.gnu ++link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared link_a.haiku-shared: link_a.gnu ++link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared link_app.haiku-shared: link_app.gnu ++symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared symlink.haiku-shared: symlink.gnu + link_o.bsd-shared: link_o.bsd + link_a.bsd-shared: link_a.bsd + link_app.bsd-shared: link_app.bsd +diff -ur openssl-0.9.8g-orig/config openssl-0.9.8g/config +--- openssl-0.9.8g-orig/config 2007-08-01 11:21:35.000000000 +0000 ++++ openssl-0.9.8g/config 2008-03-28 19:17:06.000000000 +0000 +@@ -126,6 +126,10 @@ + echo "${MACHINE}-dg-dgux"; exit 0 + ;; + ++ Haiku:*:BePC) ++ echo "i586-pc-haiku"; exit 0 ++ ;; ++ + HI-UX:*) + echo "${MACHINE}-hi-hiux"; exit 0 + ;; +@@ -755,6 +759,8 @@ + options="$options no-asm" + fi + ;; ++ i586-*-haiku) OUT="haiku-x86" ;; ++ + # these are all covered by the catchall below + # *-dgux) OUT="dgux" ;; + mips-sony-newsos4) OUT="newsos4-gcc" ;; -- gitore 0.2.2