[csw-devel] SF.net SVN: gar:[20913] csw/mgar/pkg/synergy/trunk
janholzh at users.sourceforge.net
janholzh at users.sourceforge.net
Tue Apr 30 15:28:05 CEST 2013
Revision: 20913
http://gar.svn.sourceforge.net/gar/?rev=20913&view=rev
Author: janholzh
Date: 2013-04-30 13:28:04 +0000 (Tue, 30 Apr 2013)
Log Message:
-----------
synergy/trunk: fix sparc build
Modified Paths:
--------------
csw/mgar/pkg/synergy/trunk/Makefile
csw/mgar/pkg/synergy/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/synergy/trunk/files/0001-remove-march.patch
csw/mgar/pkg/synergy/trunk/files/0003-mess-with-cpp.patch
Modified: csw/mgar/pkg/synergy/trunk/Makefile
===================================================================
--- csw/mgar/pkg/synergy/trunk/Makefile 2013-04-30 13:24:01 UTC (rev 20912)
+++ csw/mgar/pkg/synergy/trunk/Makefile 2013-04-30 13:28:04 UTC (rev 20913)
@@ -1,7 +1,7 @@
# TODO (release-critical prefixed with !, non release-critical with *)
#
NAME = synergy
-VERSION = 1.4.10
+VERSION = 1.4.11
GARTYPE = v2
DESCRIPTION = Software-based TCP/IP "KVM" switch
@@ -20,9 +20,10 @@
GARCOMPILER = GNU
-PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
-
PATCHFILES += 0001-change-endiness-detection.patch
+PATCHFILES_sparc += 0001-remove-march.patch
+PATCHFILES_sparc += 0003-mess-with-cpp.patch
+PATCHFILES += $(PATCHFILES_$(GARCH))
RUNTIME_DEP_PKGS_CSWsynergy += CSWlibgcc-s1
RUNTIME_DEP_PKGS_CSWsynergy += CSWlibstdc++6
@@ -33,8 +34,8 @@
# http://forge.mysql.com/wiki/Autotools_to_CMake_Transition_Guide
CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=$(prefix)
-CMAKE_ARGS += -DCMAKE_C_FLAGS="$(CFLAGS)"
-CMAKE_ARGS += -DCMAKE_CXX_FLAGS="$(CXXFLAGS)"
+CMAKE_ARGS += -DCMAKE_C_FLAGS="$(CFLAGS) -lresolv -lsocket -lnsl -lrt"
+CMAKE_ARGS += -DCMAKE_CXX_FLAGS="$(CXXFLAGS) -lresolv -lsocket -lnsl -lrt"
CMAKE_ARGS += -DCMAKE_INCLUDE_PATH="$(includedir)"
CMAKE_ARGS += "-DCMAKE_C_FLAGS=$(CFLAGS)"
CMAKE_ARGS += "-DCMAKE_CXX_FLAGS=$(CXXFLAGS)"
@@ -48,14 +49,18 @@
include gar/category.mk
+pre-configure-modulated:
+ (cd $(WORKSRC) && mkdir tools/cryptopp562 && cd tools/cryptopp562 && unzip -q ../cryptopp562.zip)
+ @$(MAKECOOKIE)
+
configure-custom:
# --debug-output \
# --debug-trycompile \
(cd $(WORKSRC) && \
/usr/bin/env -i \
$(CONFIGURE_ENV) \
- cmake \
+ cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release \
. \
$(CMAKE_ARGS))
@$(MAKECOOKIE)
@@ -75,6 +80,9 @@
ginstall \
$(WORKSRC)/bin/synergys \
$(DESTDIR)$(bindir)
+ ginstall \
+ $(WORKSRC)/bin/synergyd \
+ $(DESTDIR)$(bindir)
ginstall -m 644 \
$(WORKSRC)/doc/synergyc.man \
$(DESTDIR)$(mandir)/man3/synergyc.3
Modified: csw/mgar/pkg/synergy/trunk/checksums
===================================================================
--- csw/mgar/pkg/synergy/trunk/checksums 2013-04-30 13:24:01 UTC (rev 20912)
+++ csw/mgar/pkg/synergy/trunk/checksums 2013-04-30 13:28:04 UTC (rev 20913)
@@ -1 +1 @@
-18aee04a7e232e4d821f46ff24da3364 synergy-1.4.10-Source.tar.gz
+243881f2dc12f0c724d60381f8872024 synergy-1.4.11-Source.tar.gz
Added: csw/mgar/pkg/synergy/trunk/files/0001-remove-march.patch
===================================================================
--- csw/mgar/pkg/synergy/trunk/files/0001-remove-march.patch (rev 0)
+++ csw/mgar/pkg/synergy/trunk/files/0001-remove-march.patch 2013-04-30 13:28:04 UTC (rev 20913)
@@ -0,0 +1,25 @@
+From 93f0ba93784daf7ef05afd7eea4e2630ac637a38 Mon Sep 17 00:00:00 2001
+From: Jan Holzhueter <jh at opencsw.org>
+Date: Tue, 30 Apr 2013 09:59:19 +0200
+Subject: [PATCH] remove-march
+
+---
+ tools/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
+index 668f99e..484f843 100644
+--- a/tools/CMakeLists.txt
++++ b/tools/CMakeLists.txt
+@@ -57,7 +57,7 @@ if (UNIX)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-tautological-compare")
+ endif()
+ else()
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+ endif()
+ endif()
+
+--
+1.8.1.4
+
Added: csw/mgar/pkg/synergy/trunk/files/0003-mess-with-cpp.patch
===================================================================
--- csw/mgar/pkg/synergy/trunk/files/0003-mess-with-cpp.patch (rev 0)
+++ csw/mgar/pkg/synergy/trunk/files/0003-mess-with-cpp.patch 2013-04-30 13:28:04 UTC (rev 20913)
@@ -0,0 +1,53 @@
+From 0485633a6b75808856f9ee497564486e8631d525 Mon Sep 17 00:00:00 2001
+From: Jan Holzhueter <jh at opencsw.org>
+Date: Tue, 30 Apr 2013 10:48:05 +0200
+Subject: [PATCH] mess-with-cpp
+
+---
+ src/lib/ipc/CIpcClientProxy.cpp | 2 +-
+ src/lib/ipc/CIpcServerProxy.cpp | 2 +-
+ src/lib/server/CClientProxy1_4.cpp | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/lib/ipc/CIpcClientProxy.cpp b/src/lib/ipc/CIpcClientProxy.cpp
+index 5fd6782..f715114 100644
+--- a/src/lib/ipc/CIpcClientProxy.cpp
++++ b/src/lib/ipc/CIpcClientProxy.cpp
+@@ -144,7 +144,7 @@ CIpcClientProxy::send(const CIpcMessage& message)
+ case kIpcLogLine: {
+ const CIpcLogLineMessage& llm = static_cast<const CIpcLogLineMessage&>(message);
+ CString logLine = llm.logLine();
+- CProtocolUtil::writef(&m_stream, kIpcMsgLogLine, &logLine);
++ CProtocolUtil::writef(static_cast<synergy::IStream*>(&m_stream), static_cast<const char*>(kIpcMsgLogLine), &logLine, "");
+ break;
+ }
+
+diff --git a/src/lib/ipc/CIpcServerProxy.cpp b/src/lib/ipc/CIpcServerProxy.cpp
+index 047c488..0d2a122 100644
+--- a/src/lib/ipc/CIpcServerProxy.cpp
++++ b/src/lib/ipc/CIpcServerProxy.cpp
+@@ -91,7 +91,7 @@ CIpcServerProxy::send(const CIpcMessage& message)
+ case kIpcCommand: {
+ const CIpcCommandMessage& cm = static_cast<const CIpcCommandMessage&>(message);
+ CString command = cm.command();
+- CProtocolUtil::writef(&m_stream, kIpcMsgCommand, &command);
++ CProtocolUtil::writef(static_cast<synergy::IStream*>(&m_stream), static_cast<const char*>(kIpcMsgCommand), &command, "");
+ break;
+ }
+
+diff --git a/src/lib/server/CClientProxy1_4.cpp b/src/lib/server/CClientProxy1_4.cpp
+index 7347335..4fcb5a4 100644
+--- a/src/lib/server/CClientProxy1_4.cpp
++++ b/src/lib/server/CClientProxy1_4.cpp
+@@ -102,7 +102,7 @@ CClientProxy1_4::cryptoIv()
+ CString data(reinterpret_cast<const char*>(iv), CRYPTO_IV_SIZE);
+
+ LOG((CLOG_DEBUG2 "send crypto iv change to \"%s\"", getName().c_str()));
+- CProtocolUtil::writef(getStream(), kMsgDCryptoIv, &data);
++ CProtocolUtil::writef(getStream(), static_cast<const char*>(kMsgDCryptoIv), &data, "");
+
+ // change IV only after we've sent the current IV, otherwise
+ // the client won't be able to decrypt the new IV.
+--
+1.8.1.4
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list