haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 04:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated patch for openssl to allow for building on x86_64, from Alex

Browse Source 
Smith.
This commit is contained in:
Scott McCreary
2012-12-18 18:44:08 +00:00
parent ff33ba73a0
commit 3f84b5ddb0
1 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
dev-libs/openssl/patches/openssl-1.0.0j.patch
View File

@@ -1,19 +1,20 @@
diff -urN openssl-1.0.0j/Configure openssl-1.0.0j-haiku/Configure
--- openssl-1.0.0j/Configure 2010-11-30 22:19:26.013631488 +0000
+++ openssl-1.0.0j-haiku/Configure 2010-12-10 09:33:29.000000000 +0000
@@ -582,6 +582,9 @@
diff -urN openssl-1.0.0j.orig/Configure openssl-1.0.0j/Configure
--- openssl-1.0.0j.orig/Configure 2012-12-18 13:32:35.000000000 +0000
+++ openssl-1.0.0j/Configure 2012-12-18 13:41:28.000000000 +0000
@@ -582,6 +582,10 @@
"uClinux-dist","$ENV{'CC'}:\$(CFLAGS)::-D_REENTRANT::\$(LDFLAGS) \$(LDLIBS):BN_LLONG:::::::::::::::$ENV{'LIBSSL_dlfcn'}:linux-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):$ENV{'RANLIB'}::",
"uClinux-dist64","$ENV{'CC'}:\$(CFLAGS)::-D_REENTRANT::\$(LDFLAGS) \$(LDLIBS):SIXTY_FOUR_BIT_LONG:::::::::::::::$ENV{'LIBSSL_dlfcn'}:linux-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):$ENV{'RANLIB'}::",
+##### 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)",
+"haiku-x86_64", "gcc:-m64 -DL_ENDIAN -O2 -Wall -DMD32_REG_T=int::-D_REENTRANT::-lnetwork:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:haiku-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
+
);
my @MK1MF_Builds=qw(VC-WIN64I VC-WIN64A
diff -urN openssl-1.0.0j/Makefile.shared openssl-1.0.0j-haiku/Makefile.shared
--- openssl-1.0.0j/Makefile.shared 2010-08-21 11:36:49.004456448 +0000
+++ openssl-1.0.0j-haiku/Makefile.shared 2010-12-10 09:33:29.000000000 +0000
diff -urN openssl-1.0.0j.orig/Makefile.shared openssl-1.0.0j/Makefile.shared
--- openssl-1.0.0j.orig/Makefile.shared 2012-12-18 13:32:35.000000000 +0000
+++ openssl-1.0.0j/Makefile.shared 2012-12-18 13:33:02.000000000 +0000
@@ -594,10 +594,10 @@
symlink.cygwin symlink.alpha-osf1 symlink.tru64 symlink.tru64-rpath symlink.beos:
@@ -29,25 +30,30 @@ diff -urN openssl-1.0.0j/Makefile.shared openssl-1.0.0j-haiku/Makefile.shared
link_o.bsd-shared: link_o.bsd
link_a.bsd-shared: link_a.bsd
link_app.bsd-shared: link_app.bsd
diff -urN openssl-1.0.0j/config openssl-1.0.0j-haiku/config
--- openssl-1.0.0j/config 2010-03-09 17:08:39.013369344 +0000
+++ openssl-1.0.0j-haiku/config 2010-12-10 09:33:29.000000000 +0000
@@ -134,6 +134,10 @@
diff -urN openssl-1.0.0j.orig/config openssl-1.0.0j/config
--- openssl-1.0.0j.orig/config 2012-12-18 13:32:35.000000000 +0000
+++ openssl-1.0.0j/config 2012-12-18 13:36:39.000000000 +0000
@@ -134,6 +134,14 @@
echo "${MACHINE}-dg-dgux"; exit 0
;;
+ Haiku:*:BePC)
+ echo "i586-pc-haiku"; exit 0
+ ;;
+ echo "i586-pc-haiku"; exit 0
+ ;;
+
+ Haiku:*:*)
+ echo "${MACHINE}-unknown-haiku"; exit 0
+ ;;
+
HI-UX:*)
echo "${MACHINE}-hi-hiux"; exit 0
;;
@@ -799,6 +803,8 @@
@@ -799,6 +807,9 @@
options="$options no-asm"
fi
;;
+ i586-*-haiku) OUT="haiku-x86" ;;
+ x86_64-*-haiku) OUT="haiku-x86_64" ;;
+
# these are all covered by the catchall below
# *-dgux) OUT="dgux" ;;