diff options
| author | Sergey A. Osokin <osa@FreeBSD.org> | 2003-11-18 11:46:10 +0000 |
|---|---|---|
| committer | Sergey A. Osokin <osa@FreeBSD.org> | 2003-11-18 11:46:10 +0000 |
| commit | 8e945423aff8e5add50c035fa389ee123ed374ad (patch) | |
| tree | b247e8bea9d1b1d2b55e160864b5ffc6323557b1 /comms | |
| parent | Update the COMMENT and pkg-description to reflect JAVA as being in here (diff) | |
Fix build process on sparc64 and alpha systems.
Submitted by: Tijl Coosemans <tijl@ulyssis.org> (maintainer)
PR: 59378
Notes
Notes:
svn path=/head/; revision=94252
Diffstat (limited to 'comms')
| -rw-r--r-- | comms/libticables/files/patch-configure | 9 | ||||
| -rw-r--r-- | comms/libticables/files/patch-src-ioports.c | 29 |
2 files changed, 34 insertions, 4 deletions
diff --git a/comms/libticables/files/patch-configure b/comms/libticables/files/patch-configure index 9a4a4981d659..44b3ad136fe6 100644 --- a/comms/libticables/files/patch-configure +++ b/comms/libticables/files/patch-configure @@ -1,15 +1,16 @@ --- configure.orig Wed Aug 27 12:17:39 2003 -+++ configure Mon Oct 13 10:21:17 2003 -@@ -6257,7 +6257,7 @@ ++++ configure Mon Nov 17 19:41:58 2003 +@@ -6257,7 +6257,8 @@ # detect system type case "$host" in -# alpha-*-*bsd*) ARCH="-D__FBSD__" ;; ++ i386-*-*bsd*) ARCH="-D__BSD__ -D__I386__" ;; + *-*-*bsd*) ARCH="-D__BSD__" ;; alpha*-*-linux-*) ARCH="-D__ALPHA__ -D__LINUX__" ;; alpha*-*-*-*) ARCH="-D__ALPHA__ -D__LINUX__" ;; arm*-*-linux-*) ARCH="-D__ARM__ -D__LINUX__" ;; -@@ -6266,7 +6266,6 @@ +@@ -6266,7 +6267,6 @@ i[3456]86-*-hurd-*) ARCH="-D__LINUX__" ;; i[3456]86-*-mingw*) ARCH="-D__WIN32__ -D__MINGW32__ -Os -s" ;; i[3456]86-*-cygwin) ARCH="-D__WIN32__ -D__CYGWIN__ -mno-cygwin" ;; @@ -17,7 +18,7 @@ ia64-*-linux-*) ARCH="-D__LINUX__" ;; m68k-*-linux-*) ARCH="-D__M68K__ -D__LINUX__" ;; mips-*-linux-*) ARCH="-D__MIPS__ -D__LINUX__" ;; -@@ -24767,6 +24766,7 @@ +@@ -24767,6 +24767,7 @@ diff --git a/comms/libticables/files/patch-src-ioports.c b/comms/libticables/files/patch-src-ioports.c new file mode 100644 index 000000000000..a25fa162ec6f --- /dev/null +++ b/comms/libticables/files/patch-src-ioports.c @@ -0,0 +1,29 @@ +--- src/ioports.c.orig Mon Nov 17 19:15:57 2003 ++++ src/ioports.c Mon Nov 17 19:39:35 2003 +@@ -107,7 +107,7 @@ + } + #endif /* 0 */ /* __MACOSX__ */ + +-#if defined(__I386__) && defined(HAVE_ASM_IO_H) && defined(HAVE_SYS_PERM_H) || defined(__ALPHA__) || defined(__BSD__) ++#if defined(__I386__) && defined(HAVE_ASM_IO_H) && defined(HAVE_SYS_PERM_H) || defined(__ALPHA__) || (defined(__BSD__) && defined(__I386__)) + static int linux_asm_read_io(unsigned int addr) + { + return inb(addr); +@@ -208,7 +208,7 @@ + { + #if defined(__I386__) && defined(HAVE_ASM_IO_H) && defined(HAVE_SYS_PERM_H) || defined(__ALPHA__) || defined(__BSD__) || defined(__MACOSX__) + +-#ifndef __MACOSX__ ++#if !(defined(__MACOSX__) || (defined(__BSD__) && !defined(__I386__))) + if (method & IOM_ASM) { + io_rd = linux_asm_read_io; + io_wr = linux_asm_write_io; +@@ -417,7 +417,7 @@ + int io_close(unsigned long from, unsigned long num) + { + #if defined(__I386__) && defined(HAVE_ASM_IO_H) && defined(HAVE_SYS_PERM_H) || defined(__ALPHA__) || defined(__BSD__) || defined(__MACOSX__) +-#ifndef __MACOSX__ ++#if !(defined(__MACOSX__) || (defined(__BSD__) && !defined(__I386__))) + if (method & IOM_ASM) + #ifndef __BSD__ + return (ioperm(from, num, 0) ? ERR_ROOT : 0); |