summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2006-11-01 12:38:24 +0000
committerJeroen Roovers <jer@gentoo.org>2006-11-01 12:38:24 +0000
commit50bde8b4c68aa9a6616fc186a3f1fc2122364c08 (patch)
treecfc72af0d54459295a93eac6cee587029ce087e6 /net-misc
parentmask compiz in 2.4er profiles (diff)
downloadgentoo-2-50bde8b4c68aa9a6616fc186a3f1fc2122364c08.tar.gz
gentoo-2-50bde8b4c68aa9a6616fc186a3f1fc2122364c08.tar.bz2
gentoo-2-50bde8b4c68aa9a6616fc186a3f1fc2122364c08.zip
Fix Xvnc build system for HPPA.
(Portage version: 2.1.2_rc1-r1)
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/tightvnc/ChangeLog5
-rw-r--r--net-misc/tightvnc/files/x86.patch23
2 files changed, 20 insertions, 8 deletions
diff --git a/net-misc/tightvnc/ChangeLog b/net-misc/tightvnc/ChangeLog
index 9abb062953e7..b30e55825439 100644
--- a/net-misc/tightvnc/ChangeLog
+++ b/net-misc/tightvnc/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-misc/tightvnc
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.79 2006/10/14 19:36:20 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.80 2006/11/01 12:38:24 jer Exp $
+
+ 01 Nov 2006; Jeroen Roovers <jer@gentoo.org> files/x86.patch:
+ Fix Xvnc build system for HPPA.
14 Oct 2006; Jason Wever <weeve@gentoo.org> tightvnc-1.2.9-r3.ebuild:
Stable on SPARC wrt bug #138779.
diff --git a/net-misc/tightvnc/files/x86.patch b/net-misc/tightvnc/files/x86.patch
index e3f753aa5cb4..64ed196a30ef 100644
--- a/net-misc/tightvnc/files/x86.patch
+++ b/net-misc/tightvnc/files/x86.patch
@@ -11,18 +11,19 @@
#endif /* linux */
#if (defined(__Lynx__) || defined(Lynx)) && (defined(i386) || defined(__i386__) || defined(__x86__) || defined(__powerpc__) || defined(__sparc__) || defined(sparc))
---- vnc_unixsrc/Xvnc/config/cf/linux.cf.x86_64 2003-03-04 15:30:01.000000000 +0100
-+++ vnc_unixsrc/Xvnc/config/cf/linux.cf 2003-03-04 15:37:07.000000000 +0100
-@@ -43,7 +43,7 @@
+--- vnc_unixsrc/Xvnc/config/cf/linux.cf 2002-03-20 11:49:23.000000000 +0100
++++ vnc_unixsrc/Xvnc/config/cf/linux.cf 2006-11-01 00:46:39.000000000 +0100
+@@ -43,7 +43,8 @@
#if defined(AlphaArchitecture) || defined(PowerPCArchitecture) || \
defined(SparcArchitecture) || defined(ArmArchitecure) || \
defined(i386Architecture) || defined(s390Architecture) || \
- defined(s390xArchitecture)
-+ defined(s390xArchitecture) || defined(x86_64Architecture)
++ defined(s390xArchitecture) || defined(x86_64Architecture) || \
++ defined(HPArchitecture)
#define DefaultLinuxCLibMajorVersion 6
#else
#define DefaultLinuxCLibMajorVersion 5
-@@ -290,6 +290,14 @@
+@@ -290,6 +291,22 @@
#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
#endif /* PowerPCArchitecture */
@@ -34,6 +35,14 @@
+#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
+#endif /* x86_64PCArchitecture */
+
++#ifdef HPArchitecture
++#define DefaultCCOptions
++#define OptimizedCDebugFlags -O2
++#define LinuxMachineDefines -D__hppa__
++#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
++#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
++#endif /* HPArchitecture */
++
#ifdef ArmArchitecture
- #define DefaultCCOptions -fsigned-char
- #define OptimizedCDebugFlags -O2
+ #define DefaultCCOptions -fsigned-char
+ #define OptimizedCDebugFlags -O2