mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-16 16:50:06 +02:00
96 lines
3.7 KiB
Plaintext
96 lines
3.7 KiB
Plaintext
From d53368fb68399a8185df3a64632b0383a88d4ae4 Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
Date: Thu, 5 Jun 2014 15:47:46 +0000
|
|
Subject: import patch from 1.0.0l
|
|
|
|
|
|
diff --git a/Configure b/Configure
|
|
index cd849e3..0ff7727 100755
|
|
--- a/Configure
|
|
+++ b/Configure
|
|
@@ -583,6 +583,10 @@ my %table=(
|
|
"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 --git a/Makefile.shared b/Makefile.shared
|
|
index e753f44..cce510f 100644
|
|
--- a/Makefile.shared
|
|
+++ b/Makefile.shared
|
|
@@ -594,10 +594,10 @@ symlink.hpux:
|
|
symlink.cygwin symlink.alpha-osf1 symlink.tru64 symlink.tru64-rpath symlink.beos:
|
|
|
|
# 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 --git a/config b/config
|
|
index 30e9a37..c2894cc 100755
|
|
--- a/config
|
|
+++ b/config
|
|
@@ -134,6 +134,14 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
|
|
echo "${MACHINE}-dg-dgux"; exit 0
|
|
;;
|
|
|
|
+ Haiku:*:BePC)
|
|
+ echo "i586-pc-haiku"; exit 0
|
|
+ ;;
|
|
+
|
|
+ Haiku:*:*)
|
|
+ echo "${MACHINE}-unknown-haiku"; exit 0
|
|
+ ;;
|
|
+
|
|
HI-UX:*)
|
|
echo "${MACHINE}-hi-hiux"; exit 0
|
|
;;
|
|
@@ -799,6 +807,9 @@ case "$GUESSOS" in
|
|
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" ;;
|
|
mips-sony-newsos4) OUT="newsos4-gcc" ;;
|
|
--
|
|
1.8.3.4
|
|
|
|
|
|
From 5fc0496e6d6b6d5a6e08bd3948e3a3b77f1e99e7 Mon Sep 17 00:00:00 2001
|
|
From: Alexander von Gluck IV <kallisti5@unixzen.com>
|
|
Date: Sat, 21 Jun 2014 21:45:05 +0000
|
|
Subject: openssl: Adjust default CA cert path
|
|
|
|
|
|
diff --git a/crypto/cryptlib.h b/crypto/cryptlib.h
|
|
index c7ddc02..4875a63 100644
|
|
--- a/crypto/cryptlib.h
|
|
+++ b/crypto/cryptlib.h
|
|
@@ -82,7 +82,7 @@ extern "C" {
|
|
# ifndef OPENSSL_SYS_VMS
|
|
# define X509_CERT_AREA OPENSSLDIR
|
|
# define X509_CERT_DIR OPENSSLDIR "/certs"
|
|
-# define X509_CERT_FILE OPENSSLDIR "/cert.pem"
|
|
+# define X509_CERT_FILE OPENSSLDIR "/CARootCertificates.pem"
|
|
# define X509_PRIVATE_DIR OPENSSLDIR "/private"
|
|
# else
|
|
# define X509_CERT_AREA "SSLROOT:[000000]"
|
|
--
|
|
1.8.3.4
|
|
|