[dev-libs/Ice] put back db 5.1 support since that is stable, no idea if 5.3 gets stable anytime soon, add libressl support, apply patch from PLD which maybe can fix bug 552702
parent
11c2ac4835
commit
98a6dfa42a
@ -0,0 +1,23 @@
|
||||
From 5974de7290be5097960a117321fc87fa8fb607d4 Mon Sep 17 00:00:00 2001
|
||||
From: hasufell <hasufell@hasufell.de>
|
||||
Date: Sat, 3 Oct 2015 15:40:56 +0200
|
||||
Subject: [PATCH] Fix compilation with LibreSSL
|
||||
|
||||
Signed-off-by: Joe George <joe@zeroc.com>
|
||||
---
|
||||
cpp/src/IceSSL/OpenSSLEngine.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/cpp/src/IceSSL/OpenSSLEngine.cpp b/cpp/src/IceSSL/OpenSSLEngine.cpp
|
||||
index 5ec9186..a5e857c 100644
|
||||
--- a/cpp/src/IceSSL/OpenSSLEngine.cpp
|
||||
+++ b/cpp/src/IceSSL/OpenSSLEngine.cpp
|
||||
@@ -259,7 +259,7 @@ OpenSSLEngine::OpenSSLEngine(const CommunicatorPtr& communicator) :
|
||||
}
|
||||
}
|
||||
}
|
||||
-# ifndef _WIN32
|
||||
+# if !defined (_WIN32) && !defined (OPENSSL_NO_EGD)
|
||||
//
|
||||
// The Entropy Gathering Daemon (EGD) is not available on Windows.
|
||||
// The file should be a Unix domain socket for the daemon.
|
@ -0,0 +1,31 @@
|
||||
--- ice-3.6.0/cpp/config/Make.rules.Linux~ 2015-06-27 16:56:56.000000000 +0200
|
||||
+++ ice-3.6.0/cpp/config/Make.rules.Linux 2015-06-27 17:23:45.810591931 +0200
|
||||
@@ -71,14 +71,6 @@
|
||||
CXXARCHFLAGS += -mtune=v8 -pipe -Wno-deprecated -DICE_USE_MUTEX_SHARED
|
||||
endif
|
||||
|
||||
- ifeq ($(MACHINE),x86_64)
|
||||
- ifeq ($(LP64),yes)
|
||||
- CXXARCHFLAGS += -m64
|
||||
- else
|
||||
- CXXARCHFLAGS += -m32
|
||||
- endif
|
||||
- endif
|
||||
-
|
||||
CXXFLAGS += $(CXXARCHFLAGS) -fvisibility=hidden -Wall -Werror -pthread
|
||||
|
||||
# If MAXWARN is set then enable extra warnings
|
||||
--- ice-3.6.0/config/Make.common.rules~ 2015-06-23 17:30:20.000000000 +0200
|
||||
+++ ice-3.6.0/config/Make.common.rules 2015-06-28 01:53:57.149666595 +0200
|
||||
@@ -104,11 +104,6 @@
|
||||
LP64 = yes
|
||||
endif
|
||||
endif
|
||||
- ifneq ($(STATICLIBS),yes)
|
||||
- ifneq ($(LP64),yes)
|
||||
- binsuffix = 32
|
||||
- endif
|
||||
- endif
|
||||
endif
|
||||
|
||||
ifeq ($(shell test -d $(usr_dir)/lib/i386-linux-gnu && echo 0),0)
|
Loading…
Reference in New Issue