Summary: | kstars fails to build on linux/sparc in kdeedu-3.3.0 | ||
---|---|---|---|
Product: | [Applications] kstars | Reporter: | Jason Wever <weeve> |
Component: | general | Assignee: | kstars |
Status: | RESOLVED FIXED | ||
Severity: | normal | ||
Priority: | NOR | ||
Version: | unspecified | ||
Target Milestone: | --- | ||
Platform: | Gentoo Packages | ||
OS: | Linux | ||
Latest Commit: | Version Fixed In: | ||
Attachments: | a WORKSFORME patch to make kstars compile |
Description
Jason Wever
2004-08-26 06:55:23 UTC
Created attachment 7292 [details]
a WORKSFORME patch to make kstars compile
This patch will make kstars compile successfully. Kstars seems to run OK after
the compilation runs, but from what I gather, this code relates to telescopes
that can be used with kstars, and I don't have the ability to test any of them.
So while the patch WORKSFORME it may not be the right way to fix this problem.
CVS commit by harris: Fix compilation on PPC and Sun/Sparc (latter is bug #88100). Thanks to George Wright for pointing out the PPC error, and testing the fix. Backporting to 3_3_BRANCH. CCMAIL: 88100-done@bugs.kde.org CCMAIL: kstars-devel@kde.org CCMAIL: gwright@kde.org M +3 -3 port.cpp 1.4 M +3 -3 port.h 1.4 --- kdeedu/kstars/kstars/indi/webcam/port.cpp #1.3:1.4 @@ -39,5 +39,5 @@ #ifdef __linux__ - #if defined(arm) || defined(__hppa__) + #if defined(arm) || defined(__hppa__) || defined(__sparc__) || defined(__ppc__) || defined(__powerpc__) #include <fcntl.h> #else @@ -75,5 +75,5 @@ port_t::port_t(int iport) { #ifdef LINUX -#if defined(arm) || defined(__hppa__) +#if defined(arm) || defined(__hppa__) || defined(__sparc__) || defined(__ppc__) || defined(__powerpc__) if ((devport = open("/dev/port", O_RDWR)) < 0) { perror("open /dev/port"); @@ -119,5 +119,5 @@ port_t::~port_t(void) { #endif /* LOCKING */ #ifdef LINUX -#if defined(arm) || defined(__hppa__) +#if defined(arm) || defined(__hppa__) || defined(__sparc__) || defined(__ppc__) || defined(__powerpc__) if (devport >= 0) close(devport); --- kdeedu/kstars/kstars/indi/webcam/port.h #1.3:1.4 @@ -36,5 +36,5 @@ #ifdef __linux__ - #if !defined(arm) && !defined(__hppa__) + #if !defined(arm) && !defined(__hppa__) && !defined(__sparc__) && !defined(__ppc__) && !defined(__powerpc__) #include <sys/io.h> #endif /* !arm */ @@ -56,5 +56,5 @@ #endif -#if defined(arm) || defined(__hppa__) +#if defined(arm) || defined(__hppa__) || defined(__sparc__) || defined(__ppc__) || defined(__powerpc__) static char ports_temp; @@ -115,5 +115,5 @@ private: FILE *devio; #endif -#if defined(__linux__) && (defined(arm) || defined(__hppa__)) +#if defined(__linux__) && (defined(arm) || defined(__hppa__) || defined(__sparc__) || defined(__ppc__) || defined(__powerpc__)) int devport; #endif The same problem exists for the __s390__ and __s390x__ architectures. Here is a diff to put on top of those two diffs: --- port.cpp.orig 2004-07-17 13:52:59.000000000 -0400 +++ port.cpp 2004-09-14 22:16:10.000000000 -0400 @@ -38,7 +38,7 @@ #endif /* LOCKING */ #ifdef __linux__ - #if defined(arm) || defined(__hppa__) + #if defined(arm) || defined(__hppa__) || defined(__sparc__) || defined(__ppc__) || defined(__powerpc__) || defined(__s390__) || defined(__s390x__) #include <fcntl.h> #else #include <sys/io.h> @@ -74,7 +74,7 @@ #endif /* LOCKING */ #ifdef LINUX -#if defined(arm) || defined(__hppa__) +#if defined(arm) || defined(__hppa__) || defined(__sparc__) || defined(__ppc__) || defined(__powerpc__) || defined(__s390__) || defined(__s390x__) if ((devport = open("/dev/port", O_RDWR)) < 0) { perror("open /dev/port"); return; @@ -118,7 +118,7 @@ unlock(port); #endif /* LOCKING */ #ifdef LINUX -#if defined(arm) || defined(__hppa__) +#if defined(arm) || defined(__hppa__) || defined(__sparc__) || defined(__ppc__) || defined(__powerpc__) || defined(__s390__) || defined(__s390x__) if (devport >= 0) close(devport); #else --- port.h.orig 2004-07-17 13:52:59.000000000 -0400 +++ port.h 2004-09-14 22:19:03.000000000 -0400 @@ -35,7 +35,7 @@ #include <unistd.h> #ifdef __linux__ - #if !defined(arm) && !defined(__hppa__) + #if !defined(arm) && !defined(__hppa__) && !defined(__sparc__) && !defined(__ppc__) && !defined(__powerpc__) && !defined(__s390__) && !defined(__s390x__) #include <sys/io.h> #endif /* !arm */ #elif defined(QNX) @@ -55,7 +55,7 @@ #error Please define a platform in the Makefile #endif -#if defined(arm) || defined(__hppa__) +#if defined(arm) || defined(__hppa__) || defined(__sparc__) || defined(__ppc__) || defined(__powerpc__) || defined(__s390__) || defined(__s390x__) static char ports_temp; #ifdef inb @@ -114,7 +114,7 @@ #ifdef FREEBSD FILE *devio; #endif -#if defined(__linux__) && (defined(arm) || defined(__hppa__)) +#if defined(__linux__) && (defined(arm) || defined(__hppa__) || defined(__sparc__) || defined(__ppc__) || defined(__powerpc__) || defined(__s390__) || defined(__s390x__)) int devport; #endif }; |