mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-08 21:00:05 +02:00
Cleanup leftover directories from the merge.
--HG-- rename : dev-libs/apr-util/patches/apr-util-1.3.10.patch => dev-libs/apr_util/patches/apr_util-1.3.10.patch rename : haiku-apps/caya-gpl-protocols/patches/caya-gpl-protocols-0.HEAD.patch => haiku-apps/caya_gpl_protocols/patches/caya_gpl_protocols-0.HEAD.patch
This commit is contained in:
@@ -1,120 +0,0 @@
|
||||
diff -ur u-boot-2012.10/common/image.c tmp/u-boot-2012.10/common/image.c
|
||||
--- u-boot-2012.10/common/image.c 2012-11-08 10:52:02.774111232 +0100
|
||||
+++ tmp/u-boot-2012.10/common/image.c 2012-10-15 17:14:08.046399488 +0200
|
||||
@@ -71,7 +71,7 @@
|
||||
#include "mkimage.h"
|
||||
#include <u-boot/md5.h>
|
||||
#include <time.h>
|
||||
-#include <uimage.h>
|
||||
+#include <image.h>
|
||||
#endif /* !USE_HOSTCC*/
|
||||
|
||||
static const table_entry_t uimage_arch[] = {
|
||||
diff -ur u-boot-2012.10/tools/aisimage.c tmp/u-boot-2012.10/tools/aisimage.c
|
||||
--- u-boot-2012.10/tools/aisimage.c 2012-11-08 10:48:20.923271168 +0100
|
||||
+++ tmp/u-boot-2012.10/tools/aisimage.c 2012-10-15 17:14:08.063176704 +0200
|
||||
@@ -26,7 +26,7 @@
|
||||
|
||||
#include "mkimage.h"
|
||||
#include "aisimage.h"
|
||||
-#include <uimage.h>
|
||||
+#include <image.h>
|
||||
|
||||
#define IS_FNC_EXEC(c) (cmd_table[c].AIS_cmd == AIS_CMD_FNLOAD)
|
||||
#define WORD_ALIGN0 4
|
||||
diff -ur u-boot-2012.10/tools/default_image.c tmp/u-boot-2012.10/tools/default_image.c
|
||||
--- u-boot-2012.10/tools/default_image.c 2012-11-08 10:48:39.345505792 +0100
|
||||
+++ tmp/u-boot-2012.10/tools/default_image.c 2012-10-15 17:14:08.066060288 +0200
|
||||
@@ -28,7 +28,7 @@
|
||||
*/
|
||||
|
||||
#include "mkimage.h"
|
||||
-#include <uimage.h>
|
||||
+#include <image.h>
|
||||
#include <u-boot/crc.h>
|
||||
|
||||
static image_header_t header;
|
||||
diff -ur u-boot-2012.10/tools/fit_image.c tmp/u-boot-2012.10/tools/fit_image.c
|
||||
--- u-boot-2012.10/tools/fit_image.c 2012-11-08 10:48:56.498860032 +0100
|
||||
+++ tmp/u-boot-2012.10/tools/fit_image.c 2012-10-15 17:14:08.000786432 +0200
|
||||
@@ -28,7 +28,7 @@
|
||||
*/
|
||||
|
||||
#include "mkimage.h"
|
||||
-#include <uimage.h>
|
||||
+#include <image.h>
|
||||
#include <u-boot/crc.h>
|
||||
|
||||
static image_header_t header;
|
||||
diff -ur u-boot-2012.10/tools/imximage.c tmp/u-boot-2012.10/tools/imximage.c
|
||||
--- u-boot-2012.10/tools/imximage.c 2012-11-08 10:52:34.872677376 +0100
|
||||
+++ tmp/u-boot-2012.10/tools/imximage.c 2012-10-15 17:14:08.003145728 +0200
|
||||
@@ -29,7 +29,7 @@
|
||||
#define _GNU_SOURCE
|
||||
|
||||
#include "mkimage.h"
|
||||
-#include <uimage.h>
|
||||
+#include <image.h>
|
||||
#include "imximage.h"
|
||||
|
||||
/*
|
||||
diff -ur u-boot-2012.10/tools/kwbimage.c tmp/u-boot-2012.10/tools/kwbimage.c
|
||||
--- u-boot-2012.10/tools/kwbimage.c 2012-11-08 10:52:53.073662464 +0100
|
||||
+++ tmp/u-boot-2012.10/tools/kwbimage.c 2012-10-15 17:14:08.003407872 +0200
|
||||
@@ -26,7 +26,7 @@
|
||||
#define _GNU_SOURCE
|
||||
|
||||
#include "mkimage.h"
|
||||
-#include <uimage.h>
|
||||
+#include <image.h>
|
||||
#include "kwbimage.h"
|
||||
|
||||
/*
|
||||
diff -ur u-boot-2012.10/tools/mkimage.c tmp/u-boot-2012.10/tools/mkimage.c
|
||||
--- u-boot-2012.10/tools/mkimage.c 2012-11-08 10:55:06.533463040 +0100
|
||||
+++ tmp/u-boot-2012.10/tools/mkimage.c 2012-10-15 17:14:08.005505024 +0200
|
||||
@@ -22,7 +22,7 @@
|
||||
*/
|
||||
|
||||
#include "mkimage.h"
|
||||
-#include <uimage.h>
|
||||
+#include <image.h>
|
||||
#include <version.h>
|
||||
|
||||
static void copy_file(int, const char *, int);
|
||||
diff -ur u-boot-2012.10/tools/omapimage.c tmp/u-boot-2012.10/tools/omapimage.c
|
||||
--- u-boot-2012.10/tools/omapimage.c 2012-11-08 10:55:39.680525824 +0100
|
||||
+++ tmp/u-boot-2012.10/tools/omapimage.c 2012-10-15 17:14:08.006291456 +0200
|
||||
@@ -34,7 +34,7 @@
|
||||
#define _GNU_SOURCE
|
||||
|
||||
#include "mkimage.h"
|
||||
-#include <uimage.h>
|
||||
+#include <image.h>
|
||||
#include "omapimage.h"
|
||||
|
||||
/* Header size is CH header rounded up to 512 bytes plus GP header */
|
||||
diff -ur u-boot-2012.10/tools/pblimage.c tmp/u-boot-2012.10/tools/pblimage.c
|
||||
--- u-boot-2012.10/tools/pblimage.c 2012-11-08 10:53:09.547356672 +0100
|
||||
+++ tmp/u-boot-2012.10/tools/pblimage.c 2012-10-15 17:14:08.008126464 +0200
|
||||
@@ -22,7 +22,7 @@
|
||||
#define _GNU_SOURCE
|
||||
|
||||
#include "mkimage.h"
|
||||
-#include <uimage.h>
|
||||
+#include <image.h>
|
||||
#include "pblimage.h"
|
||||
|
||||
/*
|
||||
diff -ur u-boot-2012.10/tools/ublimage.c tmp/u-boot-2012.10/tools/ublimage.c
|
||||
--- u-boot-2012.10/tools/ublimage.c 2012-11-08 10:55:59.951844864 +0100
|
||||
+++ tmp/u-boot-2012.10/tools/ublimage.c 2012-10-15 17:14:08.009175040 +0200
|
||||
@@ -33,7 +33,7 @@
|
||||
#define _GNU_SOURCE
|
||||
|
||||
#include "mkimage.h"
|
||||
-#include <uimage.h>
|
||||
+#include <image.h>
|
||||
#include "ublimage.h"
|
||||
|
||||
/*
|
||||
@@ -1,5 +0,0 @@
|
||||
The SWI-Prolog Prolog libraries
|
||||
|
||||
Lacking a satisfactory technical solution to handle article 6 of the LGPL, this license cannot be used for the Prolog source code that is part of the SWI-Prolog system (both libraries and kernel code). This situation is comparable to libgcc, the runtime library used with the GNU C-compiler. Therefore, we use the same proven license terms as this library. The libgcc license is the GPL, accompanied with a special exception. Below we rephrased this exception adjusted to our needs:
|
||||
|
||||
As a special exception, if you link this library with other files, compiled with a Free Software compiler, to produce an executable, this library does not by itself cause the resulting executable to be covered by the GNU General Public License. This exception does not however invalidate any other reasons why the executable file might be covered by the GNU General Public License.
|
||||
@@ -1,68 +0,0 @@
|
||||
diff -Naur pl-6.0.2/src/configure.in pl-6.0.2-haiku/src/configure.in
|
||||
--- pl-6.0.2/src/configure.in 2012-03-04 13:12:01.001835008 +0000
|
||||
+++ pl-6.0.2-haiku/src/configure.in 2012-08-20 21:39:21.649330688 +0100
|
||||
@@ -689,6 +689,10 @@
|
||||
AC_DEFINE(_THREAD_SAFE, 1,
|
||||
[Required in FreeBSD for compiling thread-safe code])
|
||||
;;
|
||||
+ *haiku*)
|
||||
+ pthread_ok=true
|
||||
+ CFLAGS="$CFLAGS -lroot"
|
||||
+ ;;
|
||||
*-win32|*-win64)
|
||||
pthread_ok=true
|
||||
AC_CHECK_LIB(pthreadGC2, pthread_create)
|
||||
diff -Naur pl-6.0.2/src/os/pl-files.c pl-6.0.2-haiku/src/os/pl-files.c
|
||||
--- pl-6.0.2/src/os/pl-files.c 2012-03-04 13:12:01.011272192 +0000
|
||||
+++ pl-6.0.2-haiku/src/os/pl-files.c 2012-08-23 14:45:48.981204992 +0100
|
||||
@@ -239,7 +239,7 @@
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
-#ifdef __unix__ /* doesn't work on most not Unix's */
|
||||
+#if defined(__unix__) || defined(__HAIKU__) /* doesn't work on most not Unix's */
|
||||
{ statstruct buf1;
|
||||
statstruct buf2;
|
||||
char tmp[MAXPATHLEN];
|
||||
diff -Naur pl-6.0.2/src/os/pl-os.c pl-6.0.2-haiku/src/os/pl-os.c
|
||||
--- pl-6.0.2/src/os/pl-os.c 2012-03-04 13:12:01.011796480 +0000
|
||||
+++ pl-6.0.2-haiku/src/os/pl-os.c 2012-08-23 16:02:11.794034176 +0100
|
||||
@@ -590,7 +590,7 @@
|
||||
}
|
||||
|
||||
retry:
|
||||
-#ifdef __unix__
|
||||
+#if defined(__unix__) || defined(__HAIKU__)
|
||||
{ static int MTOK_temp_counter = 0;
|
||||
const char *sep = id[0] ? "_" : "";
|
||||
|
||||
@@ -732,7 +732,7 @@
|
||||
}
|
||||
#endif /* O_HPFS */
|
||||
|
||||
-#ifdef __unix__
|
||||
+#if defined(__unix__) || defined(__HAIKU__)
|
||||
char *
|
||||
PrologPath(const char *p, char *buf, size_t len)
|
||||
{ strncpy(buf, p, len);
|
||||
@@ -2436,7 +2436,7 @@
|
||||
return strcpy(buffer, file ? file : buf);
|
||||
}
|
||||
|
||||
-#ifdef __unix__
|
||||
+#if defined(__unix__) || defined(__HAIKU__)
|
||||
static char *
|
||||
okToExec(const char *s)
|
||||
{ statstruct stbuff;
|
||||
diff -Naur pl-6.0.2/src/pl-term.c pl-6.0.2-haiku/src/pl-term.c
|
||||
--- pl-6.0.2/src/pl-term.c 2012-03-04 13:12:01.023592960 +0000
|
||||
+++ pl-6.0.2-haiku/src/pl-term.c 2012-08-08 20:03:23.111673344 +0100
|
||||
@@ -296,7 +296,7 @@
|
||||
term_t r = A1;
|
||||
term_t c = A2;
|
||||
|
||||
-#ifdef __unix__
|
||||
+#if defined(__unix__) || defined(__HAIKU__)
|
||||
int iorval;
|
||||
|
||||
#ifdef TIOCGSIZE
|
||||
@@ -1,67 +0,0 @@
|
||||
diff -Naur pl-6.2.0/src/configure.in pl-6.2.0-haiku/src/configure.in
|
||||
--- pl-6.2.0/src/configure.in 2012-08-21 13:12:53.016777216 +0100
|
||||
+++ pl-6.2.0-haiku/src/configure.in 2012-08-23 17:06:25.987758592 +0100
|
||||
@@ -728,6 +728,9 @@
|
||||
AC_DEFINE(_THREAD_SAFE, 1,
|
||||
[Required in FreeBSD for compiling thread-safe code])
|
||||
;;
|
||||
+ *-haiku*)
|
||||
+ pthread_ok=true
|
||||
+ ;;
|
||||
*-win32|*-win64)
|
||||
pthread_ok=true
|
||||
AC_CHECK_LIB(pthreadGC2, pthread_create)
|
||||
diff -Naur pl-6.2.0/src/os/pl-files.c pl-6.2.0-haiku/src/os/pl-files.c
|
||||
--- pl-6.2.0/src/os/pl-files.c 2012-08-21 13:12:53.026214400 +0100
|
||||
+++ pl-6.2.0-haiku/src/os/pl-files.c 2012-08-23 17:07:04.695992320 +0100
|
||||
@@ -302,7 +302,7 @@
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
-#ifdef __unix__ /* doesn't work on most not Unix's */
|
||||
+#if defined(__unix__) || defined(__HAIKU__) /* doesn't work on most not Unix's */
|
||||
{ statstruct buf1;
|
||||
statstruct buf2;
|
||||
char tmp[MAXPATHLEN];
|
||||
diff -Naur pl-6.2.0/src/os/pl-os.c pl-6.2.0-haiku/src/os/pl-os.c
|
||||
--- pl-6.2.0/src/os/pl-os.c 2012-08-21 13:12:53.027000832 +0100
|
||||
+++ pl-6.2.0-haiku/src/os/pl-os.c 2012-08-23 17:09:14.962330624 +0100
|
||||
@@ -601,7 +601,7 @@
|
||||
}
|
||||
|
||||
retry:
|
||||
-#ifdef __unix__
|
||||
+#if defined(__unix__) || defined(__HAIKU__)
|
||||
{ static int MTOK_temp_counter = 0;
|
||||
const char *sep = id[0] ? "_" : "";
|
||||
|
||||
@@ -743,7 +743,7 @@
|
||||
}
|
||||
#endif /* O_HPFS */
|
||||
|
||||
-#ifdef __unix__
|
||||
+#if defined(__unix__) || defined(__HAIKU__)
|
||||
char *
|
||||
PrologPath(const char *p, char *buf, size_t len)
|
||||
{ strncpy(buf, p, len);
|
||||
@@ -2507,7 +2507,7 @@
|
||||
return strcpy(buffer, file ? file : buf);
|
||||
}
|
||||
|
||||
-#ifdef __unix__
|
||||
+#if defined(__unix__) || defined(__HAIKU__)
|
||||
static char *
|
||||
okToExec(const char *s)
|
||||
{ statstruct stbuff;
|
||||
diff -Naur pl-6.2.0/src/pl-term.c pl-6.2.0-haiku/src/pl-term.c
|
||||
--- pl-6.2.0/src/pl-term.c 2012-08-21 13:12:53.038535168 +0100
|
||||
+++ pl-6.2.0-haiku/src/pl-term.c 2012-08-23 17:09:57.306708480 +0100
|
||||
@@ -296,7 +296,7 @@
|
||||
term_t r = A1;
|
||||
term_t c = A2;
|
||||
|
||||
-#ifdef __unix__
|
||||
+#if defined(__unix__) || defined(__HAIKU__)
|
||||
int iorval;
|
||||
|
||||
#ifdef TIOCGSIZE
|
||||
@@ -1,27 +0,0 @@
|
||||
diff -urN apr-util-1.3.11/config.layout apr-util-1.3.11-haiku/config.layout
|
||||
--- apr-util-1.3.11/config.layout 2005-02-09 12:18:43.049283072 +0000
|
||||
+++ apr-util-1.3.11-haiku/config.layout 2011-03-25 11:04:46.549453824 +0000
|
||||
@@ -60,6 +60,23 @@
|
||||
runtimedir: ${localstatedir}/run
|
||||
</Layout>
|
||||
|
||||
+# Haiku Layout making use of finddir
|
||||
+<Layout haiku>
|
||||
+ prefix: /boot/common
|
||||
+ exec_prefix: /boot/common
|
||||
+ bindir: /boot/common/bin
|
||||
+ sbindir: /boot/common/servers
|
||||
+ libdir: /boot/common/lib
|
||||
+ libexecdir: /boot/common/servers
|
||||
+ mandir: /boot/common/documentation/man
|
||||
+ sysconfdir: /boot/common/settings
|
||||
+ datadir: /boot/common/data
|
||||
+ installbuilddir: /boot/develop/build
|
||||
+ includedir: /boot/common/include
|
||||
+ localstatedir: /boot/common/var
|
||||
+ runtimedir: ${localstatedir}/log
|
||||
+</Layout>
|
||||
+
|
||||
# Mac OS X Server (Rhapsody)
|
||||
<Layout Mac OS X Server>
|
||||
prefix: /Local/Library/WebServer
|
||||
@@ -1,27 +0,0 @@
|
||||
diff -urN apr-util-1.3.12/config.layout apr-util-1.3.12-haiku/config.layout
|
||||
--- apr-util-1.3.12/config.layout 2005-02-09 12:18:43.049283072 +0000
|
||||
+++ apr-util-1.3.12-haiku/config.layout 2011-03-25 11:04:46.549453824 +0000
|
||||
@@ -60,6 +60,23 @@
|
||||
runtimedir: ${localstatedir}/run
|
||||
</Layout>
|
||||
|
||||
+# Haiku Layout making use of finddir
|
||||
+<Layout haiku>
|
||||
+ prefix: /boot/common
|
||||
+ exec_prefix: /boot/common
|
||||
+ bindir: /boot/common/bin
|
||||
+ sbindir: /boot/common/servers
|
||||
+ libdir: /boot/common/lib
|
||||
+ libexecdir: /boot/common/servers
|
||||
+ mandir: /boot/common/documentation/man
|
||||
+ sysconfdir: /boot/common/settings
|
||||
+ datadir: /boot/common/data
|
||||
+ installbuilddir: /boot/develop/build
|
||||
+ includedir: /boot/common/include
|
||||
+ localstatedir: /boot/common/var
|
||||
+ runtimedir: ${localstatedir}/log
|
||||
+</Layout>
|
||||
+
|
||||
# Mac OS X Server (Rhapsody)
|
||||
<Layout Mac OS X Server>
|
||||
prefix: /Local/Library/WebServer
|
||||
@@ -1,27 +0,0 @@
|
||||
diff -urN apr-util-1.4.1/config.layout apr-util-1.4.1-haiku/config.layout
|
||||
--- apr-util-1.4.1/config.layout 2005-02-09 12:18:43.049283072 +0000
|
||||
+++ apr-util-1.4.1-haiku/config.layout 2011-03-25 11:04:46.549453824 +0000
|
||||
@@ -60,6 +60,23 @@
|
||||
runtimedir: ${localstatedir}/run
|
||||
</Layout>
|
||||
|
||||
+# Haiku Layout making use of finddir
|
||||
+<Layout haiku>
|
||||
+ prefix: /boot/common
|
||||
+ exec_prefix: /boot/common
|
||||
+ bindir: /boot/common/bin
|
||||
+ sbindir: /boot/common/servers
|
||||
+ libdir: /boot/common/lib
|
||||
+ libexecdir: /boot/common/servers
|
||||
+ mandir: /boot/common/documentation/man
|
||||
+ sysconfdir: /boot/common/settings
|
||||
+ datadir: /boot/common/data
|
||||
+ installbuilddir: /boot/develop/build
|
||||
+ includedir: /boot/common/include
|
||||
+ localstatedir: /boot/common/var
|
||||
+ runtimedir: ${localstatedir}/log
|
||||
+</Layout>
|
||||
+
|
||||
# Mac OS X Server (Rhapsody)
|
||||
<Layout Mac OS X Server>
|
||||
prefix: /Local/Library/WebServer
|
||||
@@ -1,29 +0,0 @@
|
||||
Copyright (c) 1988, 1989 Hans-J. Boehm, Alan J. Demers
|
||||
Copyright (c) 1991-1996 by Xerox Corporation. All rights reserved.
|
||||
Copyright (c) 1996-1999 by Silicon Graphics. All rights reserved.
|
||||
Copyright (c) 1999-2004 Hewlett-Packard Development Company, L.P.
|
||||
|
||||
The file linux_threads.c is also
|
||||
Copyright (c) 1998 by Fergus Henderson. All rights reserved.
|
||||
|
||||
The files Makefile.am, and configure.in are
|
||||
Copyright (c) 2001 by Red Hat Inc. All rights reserved.
|
||||
|
||||
Several files supporting GNU-style builds are copyrighted by the Free
|
||||
Software Foundation, and carry a different license from that given
|
||||
below.
|
||||
|
||||
THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
|
||||
OR IMPLIED. ANY USE IS AT YOUR OWN RISK.
|
||||
|
||||
Permission is hereby granted to use or copy this program
|
||||
for any purpose, provided the above notices are retained on all copies.
|
||||
Permission to modify the code and to distribute modified code is granted,
|
||||
provided the above notices are retained, and a notice that the code was
|
||||
modified is included with the above copyright notice.
|
||||
|
||||
A few of the files needed to use the GNU-style build procedure come with
|
||||
slightly different licenses, though they are all similar in spirit. A few
|
||||
are GPL'ed, but with an exception that should cover all uses in the
|
||||
collector. (If you are concerned about such things, I recommend you look
|
||||
at the notice in config.guess or ltmain.sh.)
|
||||
@@ -1,247 +0,0 @@
|
||||
diff -ru gc-7.2alpha6-orig/configure.ac gc-7.2alpha6/configure.ac
|
||||
--- gc-7.2alpha6-orig/configure.ac 2011-06-14 12:34:55.000000000 +0000
|
||||
+++ gc-7.2alpha6/configure.ac 2012-03-16 00:46:16.500695040 +0000
|
||||
@@ -83,6 +83,7 @@
|
||||
AH_TEMPLATE([GC_DARWIN_THREADS], [Define to support Darwin pthreads.])
|
||||
AH_TEMPLATE([GC_FREEBSD_THREADS], [Define to support FreeBSD pthreads.])
|
||||
AH_TEMPLATE([GC_GNU_THREADS], [Define to support GNU pthreads.])
|
||||
+AH_TEMPLATE([GC_HAIKU_THREADS], [Define to support Haiku pthreads.])
|
||||
AH_TEMPLATE([GC_HPUX_THREADS], [Define to support HP/UX 11 pthreads.])
|
||||
AH_TEMPLATE([GC_IRIX_THREADS], [Define to support Irix pthreads.])
|
||||
AH_TEMPLATE([GC_LINUX_THREADS], [Define to support pthreads on Linux.])
|
||||
@@ -127,6 +128,10 @@
|
||||
AC_DEFINE(GC_AIX_THREADS)
|
||||
AC_DEFINE(_REENTRANT)
|
||||
;;
|
||||
+ *-*-haiku*)
|
||||
+ AC_DEFINE(GC_HAIKU_THREADS)
|
||||
+ AC_DEFINE(_REENTRANT)
|
||||
+ ;;
|
||||
*-*-hpux11*)
|
||||
AC_MSG_WARN("Only HP/UX 11 POSIX threads are supported.")
|
||||
AC_DEFINE(GC_HPUX_THREADS)
|
||||
diff -ru gc-7.2alpha6-orig/dyn_load.c gc-7.2alpha6/dyn_load.c
|
||||
--- gc-7.2alpha6-orig/dyn_load.c 2011-05-31 15:27:11.000000000 +0000
|
||||
+++ gc-7.2alpha6/dyn_load.c 2012-03-23 22:11:06.758906880 +0000
|
||||
@@ -63,7 +63,7 @@
|
||||
!(defined(FREEBSD) && defined(__ELF__)) && \
|
||||
!(defined(OPENBSD) && (defined(__ELF__) || defined(M68K))) && \
|
||||
!(defined(NETBSD) && defined(__ELF__)) && !defined(HURD) && \
|
||||
- !defined(DARWIN) && !defined(CYGWIN32)
|
||||
+ !defined(DARWIN) && !defined(CYGWIN32) && !defined(HAIKU)
|
||||
--> We only know how to find data segments of dynamic libraries for the
|
||||
--> above. Additional SVR4 variants might not be too
|
||||
--> hard to add.
|
||||
@@ -1419,6 +1419,22 @@
|
||||
|
||||
#endif /* DARWIN */
|
||||
|
||||
+#ifdef HAIKU
|
||||
+#include <kernel/image.h>
|
||||
+
|
||||
+GC_INNER void GC_register_dynamic_libraries()
|
||||
+{
|
||||
+ image_info info;
|
||||
+ int32 cookie = 0;
|
||||
+ while (get_next_image_info(0, &cookie, &info) == B_OK)
|
||||
+ {
|
||||
+ void *data = info.data;
|
||||
+ GC_add_roots_inner(data, data + info.data_size, TRUE);
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+#endif /* HAIKU */
|
||||
+
|
||||
#elif defined(PCR)
|
||||
|
||||
# include "il/PCR_IL.h"
|
||||
diff -ru gc-7.2alpha6-orig/include/gc_config_macros.h gc-7.2alpha6/include/gc_config_macros.h
|
||||
--- gc-7.2alpha6-orig/include/gc_config_macros.h 2011-04-24 13:09:21.000000000 +0000
|
||||
+++ gc-7.2alpha6/include/gc_config_macros.h 2012-03-16 00:44:30.556793856 +0000
|
||||
@@ -65,7 +65,7 @@
|
||||
|| defined(GC_IRIX_THREADS) || defined(GC_LINUX_THREADS) \
|
||||
|| defined(GC_NETBSD_THREADS) || defined(GC_OPENBSD_THREADS) \
|
||||
|| defined(GC_OSF1_THREADS) || defined(GC_SOLARIS_THREADS) \
|
||||
- || defined(GC_WIN32_THREADS)
|
||||
+ || defined(GC_WIN32_THREADS) || defined(GC_HAIKU_THREADS)
|
||||
# ifndef GC_THREADS
|
||||
# define GC_THREADS
|
||||
# endif
|
||||
diff -ru gc-7.2alpha6-orig/include/private/config.h.in gc-7.2alpha6/include/private/config.h.in
|
||||
--- gc-7.2alpha6-orig/include/private/config.h.in 2010-09-11 11:27:06.000000000 +0000
|
||||
+++ gc-7.2alpha6/include/private/config.h.in 2012-03-16 00:49:30.038273024 +0000
|
||||
@@ -45,6 +45,9 @@
|
||||
/* Define to support GNU pthreads. */
|
||||
#undef GC_GNU_THREADS
|
||||
|
||||
+/* Define to support Haiku pthreads. */
|
||||
+#undef GC_HAIKU_THREADS
|
||||
+
|
||||
/* Define if backtrace information is supported. */
|
||||
#undef GC_HAVE_BUILTIN_BACKTRACE
|
||||
|
||||
Only in gc-7.2alpha6/include/private: config.h.in~
|
||||
diff -ru gc-7.2alpha6-orig/include/private/gcconfig.h gc-7.2alpha6/include/private/gcconfig.h
|
||||
--- gc-7.2alpha6-orig/include/private/gcconfig.h 2011-05-31 15:27:12.000000000 +0000
|
||||
+++ gc-7.2alpha6/include/private/gcconfig.h 2012-03-23 22:28:55.210501632 +0000
|
||||
@@ -234,6 +234,11 @@
|
||||
# define BEOS
|
||||
# define mach_type_known
|
||||
# endif
|
||||
+# if defined(__HAIKU__) && defined(_X86_)
|
||||
+# define I386
|
||||
+# define HAIKU
|
||||
+# define mach_type_known
|
||||
+# endif
|
||||
# if defined(OPENBSD) && defined(__amd64__)
|
||||
# define X86_64
|
||||
# define mach_type_known
|
||||
@@ -1110,6 +1115,15 @@
|
||||
extern int etext[];
|
||||
# define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff))
|
||||
# endif
|
||||
+# ifdef HAIKU
|
||||
+# define OS_TYPE "HAIKU"
|
||||
+# include <OS.h>
|
||||
+# define GETPAGESIZE() B_PAGE_SIZE
|
||||
+ extern int etext[];
|
||||
+# define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff))
|
||||
+# define DYNAMIC_LOADING
|
||||
+# define MPROTECT_VDB
|
||||
+# endif
|
||||
# ifdef SOLARIS
|
||||
# define OS_TYPE "SOLARIS"
|
||||
extern int _etext[], _end[];
|
||||
@@ -2345,7 +2359,7 @@
|
||||
#if defined(SVR4) || defined(LINUX) || defined(IRIX5) || defined(HPUX) \
|
||||
|| defined(OPENBSD) || defined(NETBSD) || defined(FREEBSD) \
|
||||
|| defined(DGUX) || defined(BSD) || defined(HURD) \
|
||||
- || defined(AIX) || defined(DARWIN) || defined(OSF1)
|
||||
+ || defined(AIX) || defined(DARWIN) || defined(OSF1) || defined(HAIKU)
|
||||
# define UNIX_LIKE /* Basic Unix-like system calls work. */
|
||||
#endif
|
||||
|
||||
@@ -2423,7 +2437,8 @@
|
||||
|
||||
#if ((defined(UNIX_LIKE) && (defined(DARWIN) || defined(HURD) \
|
||||
|| defined(OPENBSD) || defined(ARM32) \
|
||||
- || defined(MIPS) || defined(AVR32))) \
|
||||
+ || defined(MIPS) || defined(AVR32) \
|
||||
+ || defined(HAIKU))) \
|
||||
|| (defined(LINUX) && (defined(SPARC) || defined(M68K))) \
|
||||
|| (defined(RTEMS) && defined(I386))) && !defined(NO_GETCONTEXT)
|
||||
# define NO_GETCONTEXT
|
||||
@@ -2721,6 +2736,9 @@
|
||||
# elif defined(SN_TARGET_PS3)
|
||||
void *ps3_get_mem(size_t size);
|
||||
# define GET_MEM(bytes) (struct hblk*)ps3_get_mem(bytes)
|
||||
+# elif defined(HAIKU)
|
||||
+ ptr_t GC_haiku_get_mem(GC_word bytes);
|
||||
+# define GET_MEM(bytes) (struct hblk*)GC_haiku_get_mem(bytes)
|
||||
# else
|
||||
ptr_t GC_unix_get_mem(GC_word bytes);
|
||||
# define GET_MEM(bytes) (struct hblk *)GC_unix_get_mem(bytes)
|
||||
diff -ru gc-7.2alpha6-orig/include/private/thread_local_alloc.h gc-7.2alpha6/include/private/thread_local_alloc.h
|
||||
--- gc-7.2alpha6-orig/include/private/thread_local_alloc.h 2011-05-13 14:40:31.000000000 +0000
|
||||
+++ gc-7.2alpha6/include/private/thread_local_alloc.h 2012-03-16 00:55:25.252706816 +0000
|
||||
@@ -47,7 +47,7 @@
|
||||
# define USE_COMPILER_TLS
|
||||
# elif defined(GC_DGUX386_THREADS) || defined(GC_OSF1_THREADS) \
|
||||
|| defined(GC_DARWIN_THREADS) || defined(GC_AIX_THREADS) \
|
||||
- || defined(GC_NETBSD_THREADS)
|
||||
+ || defined(GC_NETBSD_THREADS) || defined(GC_HAIKU_THREADS)
|
||||
# define USE_PTHREAD_SPECIFIC
|
||||
# elif defined(GC_HPUX_THREADS)
|
||||
# ifdef __GNUC__
|
||||
diff -ru gc-7.2alpha6-orig/os_dep.c gc-7.2alpha6/os_dep.c
|
||||
--- gc-7.2alpha6-orig/os_dep.c 2011-05-31 15:27:11.000000000 +0000
|
||||
+++ gc-7.2alpha6/os_dep.c 2012-03-23 22:32:31.656932864 +0000
|
||||
@@ -790,7 +790,7 @@
|
||||
}
|
||||
#endif /* !MSWIN32 */
|
||||
|
||||
-#ifdef BEOS
|
||||
+#if defined(BEOS) || defined(HAIKU)
|
||||
# include <kernel/OS.h>
|
||||
|
||||
GC_API int GC_CALL GC_get_stack_base(struct GC_stack_base *sb)
|
||||
@@ -801,7 +801,7 @@
|
||||
return GC_SUCCESS;
|
||||
}
|
||||
# define HAVE_GET_STACK_BASE
|
||||
-#endif /* BEOS */
|
||||
+#endif /* BEOS || HAIKU */
|
||||
|
||||
#ifdef OS2
|
||||
GC_API int GC_CALL GC_get_stack_base(struct GC_stack_base *sb)
|
||||
@@ -1127,7 +1127,7 @@
|
||||
# define GET_MAIN_STACKBASE_SPECIAL
|
||||
#elif !defined(BEOS) && !defined(AMIGA) && !defined(OS2) \
|
||||
&& !defined(MSWIN32) && !defined(MSWINCE) && !defined(CYGWIN32) \
|
||||
- && !defined(GC_OPENBSD_THREADS) \
|
||||
+ && !defined(GC_OPENBSD_THREADS) && !defined(HAIKU) \
|
||||
&& (!defined(GC_SOLARIS_THREADS) || defined(_STRICT_STDC))
|
||||
|
||||
# if defined(LINUX) && defined(USE_GET_STACKBASE_FOR_MAIN)
|
||||
@@ -1977,7 +1977,7 @@
|
||||
# if !defined(OS2) && !defined(PCR) && !defined(AMIGA) && !defined(MSWIN32) \
|
||||
&& !defined(MSWINCE) && !defined(MACOS) && !defined(DOS4GW) \
|
||||
&& !defined(NONSTOP) && !defined(SN_TARGET_PS3) && !defined(RTEMS) \
|
||||
- && !defined(__CC_ARM)
|
||||
+ && !defined(__CC_ARM) && !defined(HAIKU)
|
||||
|
||||
# define SBRK_ARG_T ptrdiff_t
|
||||
|
||||
@@ -2302,6 +2302,19 @@
|
||||
}
|
||||
#endif
|
||||
|
||||
+#ifdef HAIKU
|
||||
+#include <stdlib.h>
|
||||
+
|
||||
+ptr_t GC_haiku_get_mem(word bytes)
|
||||
+{
|
||||
+ void* mem;
|
||||
+ if (posix_memalign(&mem, GC_page_size, bytes) == 0)
|
||||
+ return mem;
|
||||
+ else
|
||||
+ return NULL;
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
#ifdef USE_MUNMAP
|
||||
|
||||
/* For now, this only works on Win32/WinCE and some Unix-like */
|
||||
@@ -2903,7 +2916,9 @@
|
||||
# elif !defined(MSWIN32) && !defined(MSWINCE)
|
||||
# include <sys/mman.h>
|
||||
# include <signal.h>
|
||||
-# include <sys/syscall.h>
|
||||
+# if !defined(HAIKU)
|
||||
+# include <sys/syscall.h>
|
||||
+# endif
|
||||
|
||||
# define PROTECT(addr, len) \
|
||||
if (mprotect((caddr_t)(addr), (size_t)(len), \
|
||||
@@ -3062,6 +3077,8 @@
|
||||
/* Empirically c.trapno == 14, on IA32, but is that useful? */
|
||||
/* Should probably consider alignment issues on other */
|
||||
/* architectures. */
|
||||
+# elif defined(HAIKU)
|
||||
+# define CODE_OK TRUE
|
||||
# elif defined(HPUX)
|
||||
# define CODE_OK (si -> si_code == SEGV_ACCERR \
|
||||
|| si -> si_code == BUS_ADRERR \
|
||||
diff -ru gc-7.2alpha6-orig/pthread_support.c gc-7.2alpha6/pthread_support.c
|
||||
--- gc-7.2alpha6-orig/pthread_support.c 2011-05-31 15:27:11.000000000 +0000
|
||||
+++ gc-7.2alpha6/pthread_support.c 2012-03-16 00:39:06.171442176 +0000
|
||||
@@ -938,7 +938,8 @@
|
||||
GC_nprocs = pthread_num_processors_np();
|
||||
# elif defined(GC_OSF1_THREADS) || defined(GC_AIX_THREADS) \
|
||||
|| defined(GC_SOLARIS_THREADS) || defined(GC_GNU_THREADS) \
|
||||
- || defined(PLATFORM_ANDROID) || defined(NACL)
|
||||
+ || defined(PLATFORM_ANDROID) || defined(NACL) \
|
||||
+ || defined(GC_HAIKU_THREADS)
|
||||
GC_nprocs = sysconf(_SC_NPROCESSORS_ONLN);
|
||||
if (GC_nprocs <= 0) GC_nprocs = 1;
|
||||
# elif defined(GC_IRIX_THREADS)
|
||||
@@ -1,248 +0,0 @@
|
||||
diff -urN gc-7.2/configure.ac gc-7.2-haiku/configure.ac
|
||||
--- gc-7.2/configure.ac 2012-08-09 13:25:13.047185920 -0700
|
||||
+++ gc-7.2-haiku/configure.ac 2013-03-27 00:43:42.665321472 -0700
|
||||
@@ -89,6 +89,7 @@
|
||||
AH_TEMPLATE([GC_DARWIN_THREADS], [Define to support Darwin pthreads.])
|
||||
AH_TEMPLATE([GC_FREEBSD_THREADS], [Define to support FreeBSD pthreads.])
|
||||
AH_TEMPLATE([GC_GNU_THREADS], [Define to support GNU pthreads.])
|
||||
+AH_TEMPLATE([GC_HAIKU_THREADS], [Define to support Haiku pthreads.])
|
||||
AH_TEMPLATE([GC_HPUX_THREADS], [Define to support HP/UX 11 pthreads.])
|
||||
AH_TEMPLATE([GC_IRIX_THREADS], [Define to support Irix pthreads.])
|
||||
AH_TEMPLATE([GC_LINUX_THREADS], [Define to support pthreads on Linux.])
|
||||
@@ -140,6 +141,10 @@
|
||||
AC_DEFINE(GC_AIX_THREADS)
|
||||
AC_DEFINE(_REENTRANT)
|
||||
;;
|
||||
+ *-*-haiku*)
|
||||
+ AC_DEFINE(GC_HAIKU_THREADS)
|
||||
+ AC_DEFINE(_REENTRANT)
|
||||
+ ;;
|
||||
*-*-hpux11*)
|
||||
AC_MSG_WARN("Only HP/UX 11 POSIX threads are supported.")
|
||||
AC_DEFINE(GC_HPUX_THREADS)
|
||||
diff -urN gc-7.2/dyn_load.c gc-7.2-haiku/dyn_load.c
|
||||
--- gc-7.2/dyn_load.c 2012-08-09 13:25:13.034603008 -0700
|
||||
+++ gc-7.2-haiku/dyn_load.c 2013-03-27 00:43:42.670564352 -0700
|
||||
@@ -63,7 +63,7 @@
|
||||
!(defined(FREEBSD) && defined(__ELF__)) && \
|
||||
!(defined(OPENBSD) && (defined(__ELF__) || defined(M68K))) && \
|
||||
!(defined(NETBSD) && defined(__ELF__)) && !defined(HURD) && \
|
||||
- !defined(DARWIN) && !defined(CYGWIN32)
|
||||
+ !defined(DARWIN) && !defined(CYGWIN32) && !defined(HAIKU)
|
||||
--> We only know how to find data segments of dynamic libraries for the
|
||||
--> above. Additional SVR4 variants might not be too
|
||||
--> hard to add.
|
||||
@@ -1426,6 +1426,22 @@
|
||||
|
||||
#endif /* DARWIN */
|
||||
|
||||
+#ifdef HAIKU
|
||||
+#include <kernel/image.h>
|
||||
+
|
||||
+GC_INNER void GC_register_dynamic_libraries()
|
||||
+{
|
||||
+ image_info info;
|
||||
+ int32 cookie = 0;
|
||||
+ while (get_next_image_info(0, &cookie, &info) == B_OK)
|
||||
+ {
|
||||
+ void *data = info.data;
|
||||
+ GC_add_roots_inner(data, data + info.data_size, TRUE);
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+#endif /* HAIKU */
|
||||
+
|
||||
#elif defined(PCR)
|
||||
|
||||
# include "il/PCR_IL.h"
|
||||
diff -urN gc-7.2/include/gc_config_macros.h gc-7.2-haiku/include/gc_config_macros.h
|
||||
--- gc-7.2/include/gc_config_macros.h 2012-08-09 13:25:13.028835840 -0700
|
||||
+++ gc-7.2-haiku/include/gc_config_macros.h 2013-03-27 00:51:21.900726784 -0700
|
||||
@@ -68,7 +68,8 @@
|
||||
|| defined(GC_IRIX_THREADS) || defined(GC_LINUX_THREADS) \
|
||||
|| defined(GC_NETBSD_THREADS) || defined(GC_OPENBSD_THREADS) \
|
||||
|| defined(GC_OSF1_THREADS) || defined(GC_SOLARIS_THREADS) \
|
||||
- || defined(GC_WIN32_THREADS) || defined(GC_RTEMS_PTHREADS)
|
||||
+ || defined(GC_WIN32_THREADS) || defined(GC_RTEMS_PTHREADS) \
|
||||
+ || defined(GC_HAIKU_THREADS)
|
||||
# ifndef GC_THREADS
|
||||
# define GC_THREADS
|
||||
# endif
|
||||
diff -urN gc-7.2/include/private/config.h.in gc-7.2-haiku/include/private/config.h.in
|
||||
--- gc-7.2/include/private/config.h.in 2012-08-09 13:25:13.029884416 -0700
|
||||
+++ gc-7.2-haiku/include/private/config.h.in 2013-03-27 00:44:56.633602048 -0700
|
||||
@@ -48,6 +48,9 @@
|
||||
/* Define to support GNU pthreads. */
|
||||
#undef GC_GNU_THREADS
|
||||
|
||||
+/* Define to support Haiku pthreads. */
|
||||
+#undef GC_HAIKU_THREADS
|
||||
+
|
||||
/* Define if backtrace information is supported. */
|
||||
#undef GC_HAVE_BUILTIN_BACKTRACE
|
||||
|
||||
diff -urN gc-7.2/include/private/gcconfig.h gc-7.2-haiku/include/private/gcconfig.h
|
||||
--- gc-7.2/include/private/gcconfig.h 2012-08-09 13:25:13.030408704 -0700
|
||||
+++ gc-7.2-haiku/include/private/gcconfig.h 2013-03-27 00:45:52.350748672 -0700
|
||||
@@ -234,6 +234,11 @@
|
||||
# define BEOS
|
||||
# define mach_type_known
|
||||
# endif
|
||||
+# if defined(__HAIKU__) && defined(_X86_)
|
||||
+# define I386
|
||||
+# define HAIKU
|
||||
+# define mach_type_known
|
||||
+# endif
|
||||
# if defined(OPENBSD) && defined(__amd64__)
|
||||
# define X86_64
|
||||
# define mach_type_known
|
||||
@@ -1115,6 +1120,15 @@
|
||||
extern int etext[];
|
||||
# define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff))
|
||||
# endif
|
||||
+# ifdef HAIKU
|
||||
+# define OS_TYPE "HAIKU"
|
||||
+# include <OS.h>
|
||||
+# define GETPAGESIZE() B_PAGE_SIZE
|
||||
+ extern int etext[];
|
||||
+# define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff))
|
||||
+# define DYNAMIC_LOADING
|
||||
+# define MPROTECT_VDB
|
||||
+# endif
|
||||
# ifdef SOLARIS
|
||||
# define OS_TYPE "SOLARIS"
|
||||
extern int _etext[], _end[];
|
||||
@@ -2404,7 +2418,7 @@
|
||||
#if defined(SVR4) || defined(LINUX) || defined(IRIX5) || defined(HPUX) \
|
||||
|| defined(OPENBSD) || defined(NETBSD) || defined(FREEBSD) \
|
||||
|| defined(DGUX) || defined(BSD) || defined(HURD) \
|
||||
- || defined(AIX) || defined(DARWIN) || defined(OSF1)
|
||||
+ || defined(AIX) || defined(DARWIN) || defined(OSF1) || defined(HAIKU)
|
||||
# define UNIX_LIKE /* Basic Unix-like system calls work. */
|
||||
#endif
|
||||
|
||||
@@ -2482,7 +2496,8 @@
|
||||
|
||||
#if ((defined(UNIX_LIKE) && (defined(DARWIN) || defined(HURD) \
|
||||
|| defined(OPENBSD) || defined(ARM32) \
|
||||
- || defined(MIPS) || defined(AVR32))) \
|
||||
+ || defined(MIPS) || defined(AVR32) \
|
||||
+ || defined(HAIKU))) \
|
||||
|| (defined(LINUX) && (defined(SPARC) || defined(M68K))) \
|
||||
|| (defined(RTEMS) && defined(I386))) && !defined(NO_GETCONTEXT)
|
||||
# define NO_GETCONTEXT
|
||||
@@ -2789,6 +2804,9 @@
|
||||
# elif defined(SN_TARGET_PS3)
|
||||
void *ps3_get_mem(size_t size);
|
||||
# define GET_MEM(bytes) (struct hblk*)ps3_get_mem(bytes)
|
||||
+# elif defined(HAIKU)
|
||||
+ ptr_t GC_haiku_get_mem(GC_word bytes);
|
||||
+# define GET_MEM(bytes) (struct hblk*)GC_haiku_get_mem(bytes)
|
||||
# else
|
||||
ptr_t GC_unix_get_mem(GC_word bytes);
|
||||
# define GET_MEM(bytes) (struct hblk *)GC_unix_get_mem(bytes)
|
||||
diff -urN gc-7.2/include/private/thread_local_alloc.h gc-7.2-haiku/include/private/thread_local_alloc.h
|
||||
--- gc-7.2/include/private/thread_local_alloc.h 2012-08-09 13:25:13.029884416 -0700
|
||||
+++ gc-7.2-haiku/include/private/thread_local_alloc.h 2013-03-27 00:49:11.605290496 -0700
|
||||
@@ -47,7 +47,8 @@
|
||||
# define USE_COMPILER_TLS
|
||||
# elif defined(GC_DGUX386_THREADS) || defined(GC_OSF1_THREADS) \
|
||||
|| defined(GC_DARWIN_THREADS) || defined(GC_AIX_THREADS) \
|
||||
- || defined(GC_NETBSD_THREADS) || defined(GC_RTEMS_PTHREADS)
|
||||
+ || defined(GC_NETBSD_THREADS) || defined(GC_RTEMS_PTHREADS) \
|
||||
+ || || defined(GC_HAIKU_THREADS)
|
||||
# define USE_PTHREAD_SPECIFIC
|
||||
# elif defined(GC_HPUX_THREADS)
|
||||
# ifdef __GNUC__
|
||||
diff -urN gc-7.2/os_dep.c gc-7.2-haiku/os_dep.c
|
||||
--- gc-7.2/os_dep.c 2012-08-09 13:25:13.034340864 -0700
|
||||
+++ gc-7.2-haiku/os_dep.c 2013-03-27 00:46:12.884998144 -0700
|
||||
@@ -790,7 +790,7 @@
|
||||
}
|
||||
#endif /* !MSWIN32 */
|
||||
|
||||
-#ifdef BEOS
|
||||
+#if defined(BEOS) || defined(HAIKU)
|
||||
# include <kernel/OS.h>
|
||||
|
||||
GC_API int GC_CALL GC_get_stack_base(struct GC_stack_base *sb)
|
||||
@@ -801,7 +801,7 @@
|
||||
return GC_SUCCESS;
|
||||
}
|
||||
# define HAVE_GET_STACK_BASE
|
||||
-#endif /* BEOS */
|
||||
+#endif /* BEOS || HAIKU */
|
||||
|
||||
#ifdef OS2
|
||||
GC_API int GC_CALL GC_get_stack_base(struct GC_stack_base *sb)
|
||||
@@ -1138,7 +1138,7 @@
|
||||
# define GET_MAIN_STACKBASE_SPECIAL
|
||||
#elif !defined(BEOS) && !defined(AMIGA) && !defined(OS2) \
|
||||
&& !defined(MSWIN32) && !defined(MSWINCE) && !defined(CYGWIN32) \
|
||||
- && !defined(GC_OPENBSD_THREADS) \
|
||||
+ && !defined(GC_OPENBSD_THREADS) && !defined(HAIKU) \
|
||||
&& (!defined(GC_SOLARIS_THREADS) || defined(_STRICT_STDC))
|
||||
|
||||
# if defined(LINUX) && defined(USE_GET_STACKBASE_FOR_MAIN)
|
||||
@@ -2001,7 +2001,7 @@
|
||||
# if !defined(OS2) && !defined(PCR) && !defined(AMIGA) && !defined(MSWIN32) \
|
||||
&& !defined(MSWINCE) && !defined(MACOS) && !defined(DOS4GW) \
|
||||
&& !defined(NONSTOP) && !defined(SN_TARGET_PS3) && !defined(RTEMS) \
|
||||
- && !defined(__CC_ARM)
|
||||
+ && !defined(__CC_ARM) && !defined(HAIKU)
|
||||
|
||||
# define SBRK_ARG_T ptrdiff_t
|
||||
|
||||
@@ -2326,6 +2326,19 @@
|
||||
}
|
||||
#endif
|
||||
|
||||
+#ifdef HAIKU
|
||||
+#include <stdlib.h>
|
||||
+
|
||||
+ptr_t GC_haiku_get_mem(word bytes)
|
||||
+{
|
||||
+ void* mem;
|
||||
+ if (posix_memalign(&mem, GC_page_size, bytes) == 0)
|
||||
+ return mem;
|
||||
+ else
|
||||
+ return NULL;
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
#ifdef USE_MUNMAP
|
||||
|
||||
/* For now, this only works on Win32/WinCE and some Unix-like */
|
||||
@@ -2927,7 +2940,9 @@
|
||||
# elif !defined(MSWIN32) && !defined(MSWINCE)
|
||||
# include <sys/mman.h>
|
||||
# include <signal.h>
|
||||
-# include <sys/syscall.h>
|
||||
+# if !defined(HAIKU)
|
||||
+# include <sys/syscall.h>
|
||||
+# endif
|
||||
|
||||
# define PROTECT(addr, len) \
|
||||
if (mprotect((caddr_t)(addr), (size_t)(len), \
|
||||
@@ -3086,6 +3101,8 @@
|
||||
/* Empirically c.trapno == 14, on IA32, but is that useful? */
|
||||
/* Should probably consider alignment issues on other */
|
||||
/* architectures. */
|
||||
+# elif defined(HAIKU)
|
||||
+# define CODE_OK TRUE
|
||||
# elif defined(HPUX)
|
||||
# define CODE_OK (si -> si_code == SEGV_ACCERR \
|
||||
|| si -> si_code == BUS_ADRERR \
|
||||
diff -urN gc-7.2/pthread_support.c gc-7.2-haiku/pthread_support.c
|
||||
--- gc-7.2/pthread_support.c 2012-08-09 13:25:13.048234496 -0700
|
||||
+++ gc-7.2-haiku/pthread_support.c 2013-03-27 00:46:12.896794624 -0700
|
||||
@@ -999,7 +999,8 @@
|
||||
GC_nprocs = pthread_num_processors_np();
|
||||
# elif defined(GC_OSF1_THREADS) || defined(GC_AIX_THREADS) \
|
||||
|| defined(GC_SOLARIS_THREADS) || defined(GC_GNU_THREADS) \
|
||||
- || defined(PLATFORM_ANDROID) || defined(NACL)
|
||||
+ || defined(PLATFORM_ANDROID) || defined(NACL) \
|
||||
+ || defined(GC_HAIKU_THREADS)
|
||||
GC_nprocs = sysconf(_SC_NPROCESSORS_ONLN);
|
||||
if (GC_nprocs <= 0) GC_nprocs = 1;
|
||||
# elif defined(GC_IRIX_THREADS)
|
||||
@@ -1,11 +0,0 @@
|
||||
--- libgpg-error-1.10/src/mkerrcodes2.awk 2008-08-26 12:45:58.010747904 +0000
|
||||
+++ libgpg-error-1.10-haiku/src/mkerrcodes2.awk 2012-04-09 16:59:18.363855872 +0000
|
||||
@@ -81,7 +81,7 @@
|
||||
/^#/ { next; }
|
||||
|
||||
header {
|
||||
- if ($1 ~ /^[0123456789]+$/)
|
||||
+ if ($1 ~ /^-?[0123456789]+$/)
|
||||
{
|
||||
print "static const int err_code_from_index[] = {";
|
||||
header = 0;
|
||||
@@ -1,29 +0,0 @@
|
||||
This tool can be used to compare the ABIs of different versions of a shared
|
||||
library. As part of the checking process, it invokes gcc in order to generate
|
||||
a compiled header, which is not supported by gcc2.
|
||||
So: only execute this tool if you have gcc4 installed and set as your current
|
||||
compiler!
|
||||
|
||||
Enclosed are a couple of example descriptors (*.desc), which have been used
|
||||
to analyze the ABI compatibility of zlib, libpng and libjpeg.
|
||||
|
||||
If you want to do your own checks, you are expected to unpack the sources of
|
||||
all libraries that you'd like to compare in a folder (such that there is a
|
||||
subfolder for each library, as usually is the case with xxx.tar.gz
|
||||
distributions) and build each versions of library.
|
||||
|
||||
Before you can invoke the checker, you need to give it some info about each
|
||||
library version, by means of a descriptor file. You can ask the checker to
|
||||
generate a generic descriptor template, or you can use one of the enclosed
|
||||
descriptor examples as a starting point.
|
||||
|
||||
abi-compliance-checker.pl -l <libname> -d1 <older>.desc -d2 <newer>.desc
|
||||
|
||||
More info can be found on the tool's homepage:
|
||||
|
||||
http://ispras.linux-foundation.org/index.php/ABI_compliance_checker
|
||||
|
||||
Please send your haiku-specific questions my way:
|
||||
Oliver Tappe <zooey@hirschkaefer.de>
|
||||
|
||||
Have fun.
|
||||
@@ -1,44 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
|
||||
<version>
|
||||
6.2
|
||||
</version>
|
||||
|
||||
<headers>
|
||||
jconfig.h
|
||||
jerror.h
|
||||
jmorecfg.h
|
||||
jpeglib.h
|
||||
</headers>
|
||||
|
||||
<libs>
|
||||
jpeg-6b/.libs/libjpeg.so
|
||||
</libs>
|
||||
|
||||
<include_paths>
|
||||
/* The list of paths to be searched for header files needed for compiling of library headers, one per line */
|
||||
/* This section is not necessary */
|
||||
jpeg-6b
|
||||
</include_paths>
|
||||
|
||||
<gcc_options>
|
||||
/* Addition gcc options, one per line */
|
||||
/* This section is not necessary */
|
||||
</gcc_options>
|
||||
|
||||
<opaque_types>
|
||||
/* The list of types that should be skipped while checking, one per line */
|
||||
/* This section is not necessary */
|
||||
</opaque_types>
|
||||
|
||||
<skip_interfaces>
|
||||
/* The list of interfaces that should be skipped while checking, one mangled name per line */
|
||||
/* This section is not necessary */
|
||||
</skip_interfaces>
|
||||
|
||||
<include_preamble>
|
||||
/* The list of header files that should be included before other headers, one per line */
|
||||
/* For example, it is a tree.h for libxml2 and ft2build.h for freetype2 */
|
||||
/* This section is not necessary */
|
||||
stdio.h
|
||||
</include_preamble>
|
||||
@@ -1,44 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
|
||||
<version>
|
||||
7
|
||||
</version>
|
||||
|
||||
<headers>
|
||||
jconfig.h
|
||||
jerror.h
|
||||
jmorecfg.h
|
||||
jpeglib.h
|
||||
</headers>
|
||||
|
||||
<libs>
|
||||
jpeg-7/.libs/libjpeg.so
|
||||
</libs>
|
||||
|
||||
<include_paths>
|
||||
/* The list of paths to be searched for header files needed for compiling of library headers, one per line */
|
||||
/* This section is not necessary */
|
||||
jpeg-7
|
||||
</include_paths>
|
||||
|
||||
<gcc_options>
|
||||
/* Addition gcc options, one per line */
|
||||
/* This section is not necessary */
|
||||
</gcc_options>
|
||||
|
||||
<opaque_types>
|
||||
/* The list of types that should be skipped while checking, one per line */
|
||||
/* This section is not necessary */
|
||||
</opaque_types>
|
||||
|
||||
<skip_interfaces>
|
||||
/* The list of interfaces that should be skipped while checking, one mangled name per line */
|
||||
/* This section is not necessary */
|
||||
</skip_interfaces>
|
||||
|
||||
<include_preamble>
|
||||
/* The list of header files that should be included before other headers, one per line */
|
||||
/* For example, it is a tree.h for libxml2 and ft2build.h for freetype2 */
|
||||
/* This section is not necessary */
|
||||
stdio.h
|
||||
</include_preamble>
|
||||
@@ -1,44 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
|
||||
<version>
|
||||
8
|
||||
</version>
|
||||
|
||||
<headers>
|
||||
jconfig.h
|
||||
jerror.h
|
||||
jmorecfg.h
|
||||
jpeglib.h
|
||||
</headers>
|
||||
|
||||
<libs>
|
||||
jpeg-8/.libs/libjpeg.so
|
||||
</libs>
|
||||
|
||||
<include_paths>
|
||||
/* The list of paths to be searched for header files needed for compiling of library headers, one per line */
|
||||
/* This section is not necessary */
|
||||
jpeg-8
|
||||
</include_paths>
|
||||
|
||||
<gcc_options>
|
||||
/* Addition gcc options, one per line */
|
||||
/* This section is not necessary */
|
||||
</gcc_options>
|
||||
|
||||
<opaque_types>
|
||||
/* The list of types that should be skipped while checking, one per line */
|
||||
/* This section is not necessary */
|
||||
</opaque_types>
|
||||
|
||||
<skip_interfaces>
|
||||
/* The list of interfaces that should be skipped while checking, one mangled name per line */
|
||||
/* This section is not necessary */
|
||||
</skip_interfaces>
|
||||
|
||||
<include_preamble>
|
||||
/* The list of header files that should be included before other headers, one per line */
|
||||
/* For example, it is a tree.h for libxml2 and ft2build.h for freetype2 */
|
||||
/* This section is not necessary */
|
||||
stdio.h
|
||||
</include_preamble>
|
||||
@@ -1,41 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
|
||||
<version>
|
||||
1.2.42
|
||||
</version>
|
||||
|
||||
<headers>
|
||||
pngconf.h
|
||||
png.h
|
||||
</headers>
|
||||
|
||||
<libs>
|
||||
libpng-1.2.42/.libs/libpng12.so
|
||||
</libs>
|
||||
|
||||
<include_paths>
|
||||
/* The list of paths to be searched for header files needed for compiling of library headers, one per line */
|
||||
/* This section is not necessary */
|
||||
libpng-1.2.42
|
||||
</include_paths>
|
||||
|
||||
<gcc_options>
|
||||
/* Addition gcc options, one per line */
|
||||
/* This section is not necessary */
|
||||
</gcc_options>
|
||||
|
||||
<opaque_types>
|
||||
/* The list of types that should be skipped while checking, one per line */
|
||||
/* This section is not necessary */
|
||||
</opaque_types>
|
||||
|
||||
<skip_interfaces>
|
||||
/* The list of interfaces that should be skipped while checking, one mangled name per line */
|
||||
/* This section is not necessary */
|
||||
</skip_interfaces>
|
||||
|
||||
<include_preamble>
|
||||
/* The list of header files that should be included before other headers, one per line */
|
||||
/* For example, it is a tree.h for libxml2 and ft2build.h for freetype2 */
|
||||
/* This section is not necessary */
|
||||
</include_preamble>
|
||||
@@ -1,41 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
|
||||
<version>
|
||||
1.4.0
|
||||
</version>
|
||||
|
||||
<headers>
|
||||
pngconf.h
|
||||
png.h
|
||||
</headers>
|
||||
|
||||
<libs>
|
||||
libpng-1.4.0/.libs/libpng14.so
|
||||
</libs>
|
||||
|
||||
<include_paths>
|
||||
/* The list of paths to be searched for header files needed for compiling of library headers, one per line */
|
||||
/* This section is not necessary */
|
||||
libpng-1.4.0
|
||||
</include_paths>
|
||||
|
||||
<gcc_options>
|
||||
/* Addition gcc options, one per line */
|
||||
/* This section is not necessary */
|
||||
</gcc_options>
|
||||
|
||||
<opaque_types>
|
||||
/* The list of types that should be skipped while checking, one per line */
|
||||
/* This section is not necessary */
|
||||
</opaque_types>
|
||||
|
||||
<skip_interfaces>
|
||||
/* The list of interfaces that should be skipped while checking, one mangled name per line */
|
||||
/* This section is not necessary */
|
||||
</skip_interfaces>
|
||||
|
||||
<include_preamble>
|
||||
/* The list of header files that should be included before other headers, one per line */
|
||||
/* For example, it is a tree.h for libxml2 and ft2build.h for freetype2 */
|
||||
/* This section is not necessary */
|
||||
</include_preamble>
|
||||
@@ -1,42 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
|
||||
<version>
|
||||
1.1.4
|
||||
</version>
|
||||
|
||||
<headers>
|
||||
zconf.h
|
||||
zlib.h
|
||||
zutil.h
|
||||
</headers>
|
||||
|
||||
<libs>
|
||||
zlib-1.1.4/libz.so
|
||||
</libs>
|
||||
|
||||
<include_paths>
|
||||
/* The list of paths to be searched for header files needed for compiling of library headers, one per line */
|
||||
/* This section is not necessary */
|
||||
zlib-1.1.4
|
||||
</include_paths>
|
||||
|
||||
<gcc_options>
|
||||
/* Addition gcc options, one per line */
|
||||
/* This section is not necessary */
|
||||
</gcc_options>
|
||||
|
||||
<opaque_types>
|
||||
/* The list of types that should be skipped while checking, one per line */
|
||||
/* This section is not necessary */
|
||||
</opaque_types>
|
||||
|
||||
<skip_interfaces>
|
||||
/* The list of interfaces that should be skipped while checking, one mangled name per line */
|
||||
/* This section is not necessary */
|
||||
</skip_interfaces>
|
||||
|
||||
<include_preamble>
|
||||
/* The list of header files that should be included before other headers, one per line */
|
||||
/* For example, it is a tree.h for libxml2 and ft2build.h for freetype2 */
|
||||
/* This section is not necessary */
|
||||
</include_preamble>
|
||||
@@ -1,42 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
|
||||
<version>
|
||||
1.2.2
|
||||
</version>
|
||||
|
||||
<headers>
|
||||
zconf.h
|
||||
zlib.h
|
||||
zutil.h
|
||||
</headers>
|
||||
|
||||
<libs>
|
||||
zlib-1.2.2/libz.so
|
||||
</libs>
|
||||
|
||||
<include_paths>
|
||||
/* The list of paths to be searched for header files needed for compiling of library headers, one per line */
|
||||
/* This section is not necessary */
|
||||
zlib-1.2.2
|
||||
</include_paths>
|
||||
|
||||
<gcc_options>
|
||||
/* Addition gcc options, one per line */
|
||||
/* This section is not necessary */
|
||||
</gcc_options>
|
||||
|
||||
<opaque_types>
|
||||
/* The list of types that should be skipped while checking, one per line */
|
||||
/* This section is not necessary */
|
||||
</opaque_types>
|
||||
|
||||
<skip_interfaces>
|
||||
/* The list of interfaces that should be skipped while checking, one mangled name per line */
|
||||
/* This section is not necessary */
|
||||
</skip_interfaces>
|
||||
|
||||
<include_preamble>
|
||||
/* The list of header files that should be included before other headers, one per line */
|
||||
/* For example, it is a tree.h for libxml2 and ft2build.h for freetype2 */
|
||||
/* This section is not necessary */
|
||||
</include_preamble>
|
||||
@@ -1,42 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
|
||||
<version>
|
||||
1.2.3
|
||||
</version>
|
||||
|
||||
<headers>
|
||||
zconf.h
|
||||
zlib.h
|
||||
zutil.h
|
||||
</headers>
|
||||
|
||||
<libs>
|
||||
zlib-1.2.3/libz.so
|
||||
</libs>
|
||||
|
||||
<include_paths>
|
||||
/* The list of paths to be searched for header files needed for compiling of library headers, one per line */
|
||||
/* This section is not necessary */
|
||||
zlib-1.2.3
|
||||
</include_paths>
|
||||
|
||||
<gcc_options>
|
||||
/* Addition gcc options, one per line */
|
||||
/* This section is not necessary */
|
||||
</gcc_options>
|
||||
|
||||
<opaque_types>
|
||||
/* The list of types that should be skipped while checking, one per line */
|
||||
/* This section is not necessary */
|
||||
</opaque_types>
|
||||
|
||||
<skip_interfaces>
|
||||
/* The list of interfaces that should be skipped while checking, one mangled name per line */
|
||||
/* This section is not necessary */
|
||||
</skip_interfaces>
|
||||
|
||||
<include_preamble>
|
||||
/* The list of header files that should be included before other headers, one per line */
|
||||
/* For example, it is a tree.h for libxml2 and ft2build.h for freetype2 */
|
||||
/* This section is not necessary */
|
||||
</include_preamble>
|
||||
@@ -1,91 +0,0 @@
|
||||
This Font Software is licensed under the SIL Open Font License, Version 1.1.
|
||||
This license is copied below, and is also available with a FAQ at:
|
||||
http://scripts.sil.org/OFL
|
||||
|
||||
|
||||
-----------------------------------------------------------
|
||||
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
|
||||
-----------------------------------------------------------
|
||||
|
||||
PREAMBLE
|
||||
The goals of the Open Font License (OFL) are to stimulate worldwide
|
||||
development of collaborative font projects, to support the font creation
|
||||
efforts of academic and linguistic communities, and to provide a free and
|
||||
open framework in which fonts may be shared and improved in partnership
|
||||
with others.
|
||||
|
||||
The OFL allows the licensed fonts to be used, studied, modified and
|
||||
redistributed freely as long as they are not sold by themselves. The
|
||||
fonts, including any derivative works, can be bundled, embedded,
|
||||
redistributed and/or sold with any software provided that any reserved
|
||||
names are not used by derivative works. The fonts and derivatives,
|
||||
however, cannot be released under any other type of license. The
|
||||
requirement for fonts to remain under this license does not apply
|
||||
to any document created using the fonts or their derivatives.
|
||||
|
||||
DEFINITIONS
|
||||
"Font Software" refers to the set of files released by the Copyright
|
||||
Holder(s) under this license and clearly marked as such. This may
|
||||
include source files, build scripts and documentation.
|
||||
|
||||
"Reserved Font Name" refers to any names specified as such after the
|
||||
copyright statement(s).
|
||||
|
||||
"Original Version" refers to the collection of Font Software components as
|
||||
distributed by the Copyright Holder(s).
|
||||
|
||||
"Modified Version" refers to any derivative made by adding to, deleting,
|
||||
or substituting -- in part or in whole -- any of the components of the
|
||||
Original Version, by changing formats or by porting the Font Software to a
|
||||
new environment.
|
||||
|
||||
"Author" refers to any designer, engineer, programmer, technical
|
||||
writer or other person who contributed to the Font Software.
|
||||
|
||||
PERMISSION & CONDITIONS
|
||||
Permission is hereby granted, free of charge, to any person obtaining
|
||||
a copy of the Font Software, to use, study, copy, merge, embed, modify,
|
||||
redistribute, and sell modified and unmodified copies of the Font
|
||||
Software, subject to the following conditions:
|
||||
|
||||
1) Neither the Font Software nor any of its individual components,
|
||||
in Original or Modified Versions, may be sold by itself.
|
||||
|
||||
2) Original or Modified Versions of the Font Software may be bundled,
|
||||
redistributed and/or sold with any software, provided that each copy
|
||||
contains the above copyright notice and this license. These can be
|
||||
included either as stand-alone text files, human-readable headers or
|
||||
in the appropriate machine-readable metadata fields within text or
|
||||
binary files as long as those fields can be easily viewed by the user.
|
||||
|
||||
3) No Modified Version of the Font Software may use the Reserved Font
|
||||
Name(s) unless explicit written permission is granted by the corresponding
|
||||
Copyright Holder. This restriction only applies to the primary font name as
|
||||
presented to the users.
|
||||
|
||||
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
|
||||
Software shall not be used to promote, endorse or advertise any
|
||||
Modified Version, except to acknowledge the contribution(s) of the
|
||||
Copyright Holder(s) and the Author(s) or with their explicit written
|
||||
permission.
|
||||
|
||||
5) The Font Software, modified or unmodified, in part or in whole,
|
||||
must be distributed entirely under this license, and must not be
|
||||
distributed under any other license. The requirement for fonts to
|
||||
remain under this license does not apply to any document created
|
||||
using the Font Software.
|
||||
|
||||
TERMINATION
|
||||
This license becomes null and void if any of the above conditions are
|
||||
not met.
|
||||
|
||||
DISCLAIMER
|
||||
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
|
||||
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
|
||||
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
|
||||
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
|
||||
OTHER DEALINGS IN THE FONT SOFTWARE.
|
||||
@@ -1,91 +0,0 @@
|
||||
This Font Software is licensed under the SIL Open Font License, Version 1.1.
|
||||
This license is copied below, and is also available with a FAQ at:
|
||||
http://scripts.sil.org/OFL
|
||||
|
||||
|
||||
-----------------------------------------------------------
|
||||
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
|
||||
-----------------------------------------------------------
|
||||
|
||||
PREAMBLE
|
||||
The goals of the Open Font License (OFL) are to stimulate worldwide
|
||||
development of collaborative font projects, to support the font creation
|
||||
efforts of academic and linguistic communities, and to provide a free and
|
||||
open framework in which fonts may be shared and improved in partnership
|
||||
with others.
|
||||
|
||||
The OFL allows the licensed fonts to be used, studied, modified and
|
||||
redistributed freely as long as they are not sold by themselves. The
|
||||
fonts, including any derivative works, can be bundled, embedded,
|
||||
redistributed and/or sold with any software provided that any reserved
|
||||
names are not used by derivative works. The fonts and derivatives,
|
||||
however, cannot be released under any other type of license. The
|
||||
requirement for fonts to remain under this license does not apply
|
||||
to any document created using the fonts or their derivatives.
|
||||
|
||||
DEFINITIONS
|
||||
"Font Software" refers to the set of files released by the Copyright
|
||||
Holder(s) under this license and clearly marked as such. This may
|
||||
include source files, build scripts and documentation.
|
||||
|
||||
"Reserved Font Name" refers to any names specified as such after the
|
||||
copyright statement(s).
|
||||
|
||||
"Original Version" refers to the collection of Font Software components as
|
||||
distributed by the Copyright Holder(s).
|
||||
|
||||
"Modified Version" refers to any derivative made by adding to, deleting,
|
||||
or substituting -- in part or in whole -- any of the components of the
|
||||
Original Version, by changing formats or by porting the Font Software to a
|
||||
new environment.
|
||||
|
||||
"Author" refers to any designer, engineer, programmer, technical
|
||||
writer or other person who contributed to the Font Software.
|
||||
|
||||
PERMISSION & CONDITIONS
|
||||
Permission is hereby granted, free of charge, to any person obtaining
|
||||
a copy of the Font Software, to use, study, copy, merge, embed, modify,
|
||||
redistribute, and sell modified and unmodified copies of the Font
|
||||
Software, subject to the following conditions:
|
||||
|
||||
1) Neither the Font Software nor any of its individual components,
|
||||
in Original or Modified Versions, may be sold by itself.
|
||||
|
||||
2) Original or Modified Versions of the Font Software may be bundled,
|
||||
redistributed and/or sold with any software, provided that each copy
|
||||
contains the above copyright notice and this license. These can be
|
||||
included either as stand-alone text files, human-readable headers or
|
||||
in the appropriate machine-readable metadata fields within text or
|
||||
binary files as long as those fields can be easily viewed by the user.
|
||||
|
||||
3) No Modified Version of the Font Software may use the Reserved Font
|
||||
Name(s) unless explicit written permission is granted by the corresponding
|
||||
Copyright Holder. This restriction only applies to the primary font name as
|
||||
presented to the users.
|
||||
|
||||
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
|
||||
Software shall not be used to promote, endorse or advertise any
|
||||
Modified Version, except to acknowledge the contribution(s) of the
|
||||
Copyright Holder(s) and the Author(s) or with their explicit written
|
||||
permission.
|
||||
|
||||
5) The Font Software, modified or unmodified, in part or in whole,
|
||||
must be distributed entirely under this license, and must not be
|
||||
distributed under any other license. The requirement for fonts to
|
||||
remain under this license does not apply to any document created
|
||||
using the Font Software.
|
||||
|
||||
TERMINATION
|
||||
This license becomes null and void if any of the above conditions are
|
||||
not met.
|
||||
|
||||
DISCLAIMER
|
||||
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
|
||||
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
|
||||
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
|
||||
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
|
||||
OTHER DEALINGS IN THE FONT SOFTWARE.
|
||||
@@ -1,19 +0,0 @@
|
||||
License Agreement
|
||||
|
||||
Copyright (c) 2004 by Center for Research in Urdu Language Processing (CRULP), National University of Computer and Emerging Sciences, Lahore, Pakistan. All Rights Reserved.
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy of the font accompanying this license ("Font") and associated documentation files (the "Font Software"), to reproduce and distribute the Font Software, including without limitation the rights to use, copy, merge, publish, distribute, and/or sell copies of the Font Software, and to permit persons to whom the Font Software is furnished to do so, subject to the following conditions:
|
||||
|
||||
1. The above copyright and trademark notices and this permission notice shall be included in all copies of one or more of the Font Software typefaces.
|
||||
|
||||
2. The Font Software may be modified, altered, or added to, and in particular the designs of glyphs or characters in the Fonts may be modified and additional glyphs or characters may be added to the Fonts, only if the font is renamed to names not containing either the words "Nafees" or the word "CRULP".
|
||||
|
||||
3. This License becomes null and void to the extent applicable to Font or Font Software that has been modified and is distributed under the "Nafees*" names.
|
||||
|
||||
4. The Font Software may be sold as part of a larger software package but no copy of one or more of the Font Software typefaces may be sold by itself.
|
||||
|
||||
5. The font software is provided "as is", without warranty of any kind, express or implied, including but not limited to any warranties of merchantability, fitness for a particular purpose and noninfringement of copyright, patent, trademark, or other right. In no event shall CRULP or NUCES be liable for any claim, damages or other liability, including any general, special, indirect, incidental, or consequential damages, whether in an action of contract, or otherwise, arising from, out of the use or inability to use the font software or from other dealings in the font software.
|
||||
|
||||
6. Except as contained in this notice, the names of "CRULP" or "Nafees" shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Font Software without prior written authorization from CRULP.
|
||||
|
||||
7. As a special exception, if you create a document which uses this font, and embed this font or unaltered portions of this font into the document, this font does not by itself cause the resulting document to be covered by the GNU General Public License. This exception does not however invalidate any other reasons why the document might be covered by the GNU General Public License. If you modify this font, you may extend this exception to your version of the font, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version
|
||||
@@ -1,19 +0,0 @@
|
||||
License Agreement
|
||||
|
||||
Copyright (c) 2004 by Center for Research in Urdu Language Processing (CRULP), National University of Computer and Emerging Sciences, Lahore, Pakistan. All Rights Reserved.
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy of the font accompanying this license ("Font") and associated documentation files (the "Font Software"), to reproduce and distribute the Font Software, including without limitation the rights to use, copy, merge, publish, distribute, and/or sell copies of the Font Software, and to permit persons to whom the Font Software is furnished to do so, subject to the following conditions:
|
||||
|
||||
1. The above copyright and trademark notices and this permission notice shall be included in all copies of one or more of the Font Software typefaces.
|
||||
|
||||
2. The Font Software may be modified, altered, or added to, and in particular the designs of glyphs or characters in the Fonts may be modified and additional glyphs or characters may be added to the Fonts, only if the font is renamed to names not containing either the words "Nafees" or the word "CRULP".
|
||||
|
||||
3. This License becomes null and void to the extent applicable to Font or Font Software that has been modified and is distributed under the "Nafees*" names.
|
||||
|
||||
4. The Font Software may be sold as part of a larger software package but no copy of one or more of the Font Software typefaces may be sold by itself.
|
||||
|
||||
5. The font software is provided "as is", without warranty of any kind, express or implied, including but not limited to any warranties of merchantability, fitness for a particular purpose and noninfringement of copyright, patent, trademark, or other right. In no event shall CRULP or NUCES be liable for any claim, damages or other liability, including any general, special, indirect, incidental, or consequential damages, whether in an action of contract, or otherwise, arising from, out of the use or inability to use the font software or from other dealings in the font software.
|
||||
|
||||
6. Except as contained in this notice, the names of "CRULP" or "Nafees" shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Font Software without prior written authorization from CRULP.
|
||||
|
||||
7. As a special exception, if you create a document which uses this font, and embed this font or unaltered portions of this font into the document, this font does not by itself cause the resulting document to be covered by the GNU General Public License. This exception does not however invalidate any other reasons why the document might be covered by the GNU General Public License. If you modify this font, you may extend this exception to your version of the font, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version
|
||||
@@ -1,91 +0,0 @@
|
||||
This Font Software is licensed under the SIL Open Font License, Version 1.1.
|
||||
This license is copied below, and is also available with a FAQ at:
|
||||
http://scripts.sil.org/OFL
|
||||
|
||||
|
||||
-----------------------------------------------------------
|
||||
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
|
||||
-----------------------------------------------------------
|
||||
|
||||
PREAMBLE
|
||||
The goals of the Open Font License (OFL) are to stimulate worldwide
|
||||
development of collaborative font projects, to support the font creation
|
||||
efforts of academic and linguistic communities, and to provide a free and
|
||||
open framework in which fonts may be shared and improved in partnership
|
||||
with others.
|
||||
|
||||
The OFL allows the licensed fonts to be used, studied, modified and
|
||||
redistributed freely as long as they are not sold by themselves. The
|
||||
fonts, including any derivative works, can be bundled, embedded,
|
||||
redistributed and/or sold with any software provided that any reserved
|
||||
names are not used by derivative works. The fonts and derivatives,
|
||||
however, cannot be released under any other type of license. The
|
||||
requirement for fonts to remain under this license does not apply
|
||||
to any document created using the fonts or their derivatives.
|
||||
|
||||
DEFINITIONS
|
||||
"Font Software" refers to the set of files released by the Copyright
|
||||
Holder(s) under this license and clearly marked as such. This may
|
||||
include source files, build scripts and documentation.
|
||||
|
||||
"Reserved Font Name" refers to any names specified as such after the
|
||||
copyright statement(s).
|
||||
|
||||
"Original Version" refers to the collection of Font Software components as
|
||||
distributed by the Copyright Holder(s).
|
||||
|
||||
"Modified Version" refers to any derivative made by adding to, deleting,
|
||||
or substituting -- in part or in whole -- any of the components of the
|
||||
Original Version, by changing formats or by porting the Font Software to a
|
||||
new environment.
|
||||
|
||||
"Author" refers to any designer, engineer, programmer, technical
|
||||
writer or other person who contributed to the Font Software.
|
||||
|
||||
PERMISSION & CONDITIONS
|
||||
Permission is hereby granted, free of charge, to any person obtaining
|
||||
a copy of the Font Software, to use, study, copy, merge, embed, modify,
|
||||
redistribute, and sell modified and unmodified copies of the Font
|
||||
Software, subject to the following conditions:
|
||||
|
||||
1) Neither the Font Software nor any of its individual components,
|
||||
in Original or Modified Versions, may be sold by itself.
|
||||
|
||||
2) Original or Modified Versions of the Font Software may be bundled,
|
||||
redistributed and/or sold with any software, provided that each copy
|
||||
contains the above copyright notice and this license. These can be
|
||||
included either as stand-alone text files, human-readable headers or
|
||||
in the appropriate machine-readable metadata fields within text or
|
||||
binary files as long as those fields can be easily viewed by the user.
|
||||
|
||||
3) No Modified Version of the Font Software may use the Reserved Font
|
||||
Name(s) unless explicit written permission is granted by the corresponding
|
||||
Copyright Holder. This restriction only applies to the primary font name as
|
||||
presented to the users.
|
||||
|
||||
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
|
||||
Software shall not be used to promote, endorse or advertise any
|
||||
Modified Version, except to acknowledge the contribution(s) of the
|
||||
Copyright Holder(s) and the Author(s) or with their explicit written
|
||||
permission.
|
||||
|
||||
5) The Font Software, modified or unmodified, in part or in whole,
|
||||
must be distributed entirely under this license, and must not be
|
||||
distributed under any other license. The requirement for fonts to
|
||||
remain under this license does not apply to any document created
|
||||
using the Font Software.
|
||||
|
||||
TERMINATION
|
||||
This license becomes null and void if any of the above conditions are
|
||||
not met.
|
||||
|
||||
DISCLAIMER
|
||||
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
|
||||
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
|
||||
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
|
||||
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
|
||||
OTHER DEALINGS IN THE FONT SOFTWARE.
|
||||
@@ -1,50 +0,0 @@
|
||||
diff -Naur ladspa_sdk-1.13/src/makefile ladspa_sdk-1.13-haiku/src/makefile
|
||||
--- ladspa_sdk/src/makefile 2007-11-06 10:42:45.008388608 +0000
|
||||
+++ ladspa_sdk-haiku/src/makefile 2012-12-17 19:04:36.860094464 +0000
|
||||
@@ -4,9 +4,9 @@
|
||||
#
|
||||
# Change these if you want to install somewhere else.
|
||||
|
||||
-INSTALL_PLUGINS_DIR = /usr/lib/ladspa/
|
||||
-INSTALL_INCLUDE_DIR = /usr/include/
|
||||
-INSTALL_BINARY_DIR = /usr/bin/
|
||||
+INSTALL_PLUGINS_DIR = ${DESTDIR}/`finddir B_COMMON_LIB_DIRECTORY`
|
||||
+INSTALL_INCLUDE_DIR = ${DESTDIR}/`finddir B_COMMON_HEADERS_DIRECTORY`
|
||||
+INSTALL_BINARY_DIR = ${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY`
|
||||
|
||||
###############################################################################
|
||||
#
|
||||
@@ -14,7 +14,6 @@
|
||||
#
|
||||
|
||||
INCLUDES = -I.
|
||||
-LIBRARIES = -ldl -lm
|
||||
CFLAGS = $(INCLUDES) -Wall -Werror -O3 -fPIC
|
||||
CXXFLAGS = $(CFLAGS)
|
||||
PLUGINS = ../plugins/amp.so \
|
||||
@@ -46,22 +45,10 @@
|
||||
# TARGETS
|
||||
#
|
||||
|
||||
-test: /tmp/test.wav ../snd/noise.wav always
|
||||
- @echo ---------------------------------------------
|
||||
- @echo First listen to the white noise input signal:
|
||||
- @echo ---------------------------------------------
|
||||
- -sndfile-play ../snd/noise.wav
|
||||
- @echo -------------------------
|
||||
- @echo Compare to plugin output.
|
||||
- @echo -------------------------
|
||||
- @echo Should be a noise band around 6000Hz, repeated quietly after 1s.
|
||||
- -sndfile-play /tmp/test.wav
|
||||
- @echo Test complete.
|
||||
-
|
||||
install: targets
|
||||
- -mkdirhier $(INSTALL_PLUGINS_DIR)
|
||||
- -mkdirhier $(INSTALL_INCLUDE_DIR)
|
||||
- -mkdirhier $(INSTALL_BINARY_DIR)
|
||||
+ mkdir -p $(INSTALL_PLUGINS_DIR)
|
||||
+ mkdir -p $(INSTALL_INCLUDE_DIR)
|
||||
+ mkdir -p $(INSTALL_BINARY_DIR)
|
||||
cp ../plugins/* $(INSTALL_PLUGINS_DIR)
|
||||
cp ladspa.h $(INSTALL_INCLUDE_DIR)
|
||||
cp ../bin/* $(INSTALL_BINARY_DIR)
|
||||
@@ -1,13 +0,0 @@
|
||||
diff -urN SDL_net-1.2.8/chat.cpp SDL_net-1.2.8-haiku/chat.cpp
|
||||
--- SDL_net-1.2.8/chat.cpp 2012-01-15 16:20:10.063963136 +0000
|
||||
+++ SDL_net-1.2.8-haiku/chat.cpp 2012-02-29 23:58:48.552861696 +0000
|
||||
@@ -18,9 +18,6 @@
|
||||
misrepresented as being the original software.
|
||||
3. This notice may not be removed or altered from any source distribution.
|
||||
*/
|
||||
- Pleasanton, CA 94588 (USA)
|
||||
- slouken@devolution.com
|
||||
-*/
|
||||
|
||||
/* Note that this isn't necessarily the way to run a chat system.
|
||||
This is designed to excercise the network code more than be really
|
||||
@@ -1,117 +0,0 @@
|
||||
diff -Naur gogo-no-coda-master/engine/i386/cpu.c gogo-no-coda-master-haiku/engine/i386/cpu.c
|
||||
--- gogo-no-coda-master/engine/i386/cpu.c 2011-05-17 09:51:26.045350912 +0000
|
||||
+++ gogo-no-coda-master-haiku/engine/i386/cpu.c 2012-12-30 16:42:53.811073536 +0000
|
||||
@@ -162,7 +162,7 @@
|
||||
}
|
||||
return nCPU;
|
||||
|
||||
-#elif defined(BeOS)
|
||||
+#elif defined(BeOS) || defined(__HAIKU__)
|
||||
|
||||
system_info udtsystem_info;
|
||||
get_system_info(&udtsystem_info);
|
||||
diff -Naur gogo-no-coda-master/engine/i386/fftsse.nas gogo-no-coda-master-haiku/engine/i386/fftsse.nas
|
||||
--- gogo-no-coda-master/engine/i386/fftsse.nas 2011-05-17 09:51:26.045613056 +0000
|
||||
+++ gogo-no-coda-master-haiku/engine/i386/fftsse.nas 2012-12-30 16:42:53.823656448 +0000
|
||||
@@ -23,14 +23,14 @@
|
||||
Q_SQRT2 dd 1.41421356237, 1.41421356237, 1.41421356237, 1.41421356237
|
||||
|
||||
Q_1 dd 1.0, 1.0, 1.0, 1.0
|
||||
-costab dd 9.238795325112867e-01F, 9.238795325112867e-01F, 9.238795325112867e-01F, 9.238795325112867e-01F
|
||||
- dd 3.826834323650898e-01F, 3.826834323650898e-01F, 3.826834323650898e-01F, 3.826834323650898e-01F
|
||||
- dd 9.951847266721969e-01F, 9.951847266721969e-01F, 9.951847266721969e-01F, 9.951847266721969e-01F
|
||||
- dd 9.801714032956060e-02F, 9.801714032956060e-02F, 9.801714032956060e-02F, 9.801714032956060e-02F
|
||||
- dd 9.996988186962042e-01F, 9.996988186962042e-01F, 9.996988186962042e-01F, 9.996988186962042e-01F
|
||||
- dd 2.454122852291229e-02F, 2.454122852291229e-02F, 2.454122852291229e-02F, 2.454122852291229e-02F
|
||||
- dd 9.999811752826011e-01F, 9.999811752826011e-01F, 9.999811752826011e-01F, 9.999811752826011e-01F
|
||||
- dd 6.135884649154475e-03F, 6.135884649154475e-03F, 6.135884649154475e-03F, 6.135884649154475e-03F
|
||||
+costab dd 9.238795325112867e-01, 9.238795325112867e-01, 9.238795325112867e-01, 9.238795325112867e-01
|
||||
+ dd 3.826834323650898e-01, 3.826834323650898e-01, 3.826834323650898e-01, 3.826834323650898e-01
|
||||
+ dd 9.951847266721969e-01, 9.951847266721969e-01, 9.951847266721969e-01, 9.951847266721969e-01
|
||||
+ dd 9.801714032956060e-02, 9.801714032956060e-02, 9.801714032956060e-02, 9.801714032956060e-02
|
||||
+ dd 9.996988186962042e-01, 9.996988186962042e-01, 9.996988186962042e-01, 9.996988186962042e-01
|
||||
+ dd 2.454122852291229e-02, 2.454122852291229e-02, 2.454122852291229e-02, 2.454122852291229e-02
|
||||
+ dd 9.999811752826011e-01, 9.999811752826011e-01, 9.999811752826011e-01, 9.999811752826011e-01
|
||||
+ dd 6.135884649154475e-03, 6.135884649154475e-03, 6.135884649154475e-03, 6.135884649154475e-03
|
||||
|
||||
align 32
|
||||
revLongInit db 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80
|
||||
diff -Naur gogo-no-coda-master/engine/i386/makecfg.c gogo-no-coda-master-haiku/engine/i386/makecfg.c
|
||||
--- gogo-no-coda-master/engine/i386/makecfg.c 2011-05-17 09:51:26.045875200 +0000
|
||||
+++ gogo-no-coda-master-haiku/engine/i386/makecfg.c 2012-12-30 16:42:53.837812224 +0000
|
||||
@@ -18,7 +18,7 @@
|
||||
RW_t RW;
|
||||
RO_t RO;
|
||||
|
||||
-#if (defined(WIN32) || defined(__linux__) || defined(__os2__)) && !defined(__BORLANDC__) && !defined(__MINGW32_VERSION)
|
||||
+#if (defined(WIN32) || defined(__linux__) || defined(__os2__) || defined(__HAIKU__)) && !defined(__BORLANDC__) && !defined(__MINGW32_VERSION)
|
||||
#define USE_BSS
|
||||
#endif
|
||||
|
||||
diff -Naur gogo-no-coda-master/linux/Makefile gogo-no-coda-master-haiku/linux/Makefile
|
||||
--- gogo-no-coda-master/linux/Makefile 2011-05-17 09:51:26.057147392 +0000
|
||||
+++ gogo-no-coda-master-haiku/linux/Makefile 2012-12-30 16:44:48.008912896 +0000
|
||||
@@ -8,6 +8,8 @@
|
||||
#######################################################
|
||||
|
||||
TARGET = gogo
|
||||
+prefix =
|
||||
+BINDIR = $(prefix)/bin
|
||||
|
||||
#######################################################
|
||||
|
||||
@@ -16,12 +18,11 @@
|
||||
AS = nasm -i../engine/i386/
|
||||
LD = gcc
|
||||
MAKECFG = makecfg
|
||||
-LIBS = -lm
|
||||
VPATH = ../engine:../engine/i386:../file_io
|
||||
|
||||
LDFLAGS = $(PROF)
|
||||
AFLAGS = -f elf -D__unix__ $(E3DN)
|
||||
-CFLAGS = -Wall $(PROF) -DNDEBUG
|
||||
+CFLAGS = -Wall $(PROF) -D__unix__
|
||||
#CFLAGS += -Wpointer-arith -Wshadow -Wwrite-strings -Wconversion -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs
|
||||
|
||||
CFLAGS += -DHAVE_CONFIG_H -DLAMEPARSE -DLAMESNDFILE
|
||||
@@ -97,7 +98,6 @@
|
||||
#COBJS += $(LIBSNDCOBJS)
|
||||
|
||||
# if FreeBSD then change -lc_r
|
||||
-LIBS += -lpthread
|
||||
CFLAGS += -DUSE_PTHREAD
|
||||
COBJS += thread.o
|
||||
|
||||
@@ -105,9 +105,10 @@
|
||||
|
||||
all: $(TARGET)
|
||||
|
||||
-install : $(TARGET)
|
||||
- cp $(TARGET) /usr/local/bin
|
||||
- strip /usr/local/bin/$(TARGET)
|
||||
+install : $(TARGET) $(BINDIR)
|
||||
+ mkdir -p $(DESTDIR)$(BINDIR)
|
||||
+ install -m 0755 $(TARGET) $(DESTDIR)$(BINDIR)
|
||||
+ strip $(DESTDIR)$(BINDIR)/$(TARGET)
|
||||
|
||||
$(TARGET): $(COBJS) $(AOBJS)
|
||||
$(LD) $(COBJS) $(AOBJS) $(LDFLAGS) -o $(TARGET) $(LIBS)
|
||||
diff -Naur gogo-no-coda-master/main.c gogo-no-coda-master-haiku/main.c
|
||||
--- gogo-no-coda-master/main.c 2011-05-17 09:51:26.057409536 +0000
|
||||
+++ gogo-no-coda-master-haiku/main.c 2012-12-30 16:42:53.853803008 +0000
|
||||
@@ -5,13 +5,13 @@
|
||||
* Copyright(C) 2001,2002,2003 gogo-developer
|
||||
*/
|
||||
|
||||
-#if defined(__linux__) || defined(__ppc__) || defined(__FreeBSD__)
|
||||
+#if defined(__linux__) || defined(__ppc__) || defined(__FreeBSD__) || defined(__HAIKU__)
|
||||
#define USE_ITIMER
|
||||
#include <unistd.h>
|
||||
#include <sys/time.h>
|
||||
#include <signal.h>
|
||||
#endif
|
||||
-#if defined(__linux__) || defined(__os2__) || defined(__ppc__) || defined(__CYGWIN32__) || defined(__FreeBSD__)
|
||||
+#if defined(__linux__) || defined(__os2__) || defined(__ppc__) || defined(__CYGWIN32__) || defined(__FreeBSD__) || defined(__HAIKU__)
|
||||
# define min(x,y) (((x)<(y))?(x):(y))
|
||||
# define max(x,y) (((x)>(y))?(x):(y))
|
||||
#endif
|
||||
@@ -1,38 +0,0 @@
|
||||
diff -ur rhapsody-0.28b.org/configure rhapsody-0.28b/configure
|
||||
--- rhapsody-0.28b.org/configure 2006-02-24 07:46:19.017301504 +0100
|
||||
+++ rhapsody-0.28b/configure 2012-11-22 20:29:15.727973888 +0100
|
||||
@@ -168,6 +168,25 @@
|
||||
|
||||
STDDOCSPATH="/usr/share/doc/rhapsody"
|
||||
|
||||
+elif [ "$OS" = "Haiku" ] ; then
|
||||
+ CCPATH="/boot/develop/tools/gnupro/bin /boot/develop/bin"
|
||||
+ CURSESPATH="/boot/develop/headers/3rdparty /boot/develop/headers /boot/develop/headers/gnu"
|
||||
+
|
||||
+ GCCBASELIBS="-lncurses -lnetwork"
|
||||
+ GCCBASELIBPATHS=""
|
||||
+ GCCBASEINCPATHS=""
|
||||
+ GCCBASEFLAGS="-g -Wall -Wno-unused"
|
||||
+
|
||||
+ CCBASELIBS=""
|
||||
+ CCBASELIBPATHS=""
|
||||
+ CCBASEINCPATHS=""
|
||||
+ CCBASEFLAGS=""
|
||||
+
|
||||
+ STDDOCSPATH="`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/rhapsody"
|
||||
+ if [ -z "$INSTALLPATH" ] ; then
|
||||
+ INSTALLPATH="`finddir B_COMMON_BIN_DIRECTORY`"
|
||||
+ fi
|
||||
+
|
||||
elif [ "$OS" = "HP-UX" ] ; then
|
||||
CCPATH="/bin /usr/bin /usr/local/bin"
|
||||
CURSESPATH="/usr/include /usr/local/include /usr/include/ncurses /usr/local/include/ncurses"
|
||||
@@ -235,7 +254,7 @@
|
||||
# Set install, docs, header and lib path if not provided #
|
||||
###########################################################
|
||||
|
||||
-if [ $USER = "root" ] ; then
|
||||
+if [ $USER = "root" -o "$UID" = "0" ] ; then
|
||||
echo "Running as root."
|
||||
|
||||
if [ -z "$INSTALLPATH" ] ; then
|
||||
@@ -1,14 +0,0 @@
|
||||
diff -up b43-fwcutter-012/Makefile.orig b43-fwcutter-012/Makefile
|
||||
--- b43-fwcutter-012/Makefile.orig 2009-06-02 09:52:55.058982400 -0600
|
||||
+++ b43-fwcutter-012/Makefile 2012-06-16 16:13:04.182452224 -0600
|
||||
@@ -24,8 +24,8 @@ $(BIN): $(OBJECTS)
|
||||
install: all
|
||||
-install -d -o 0 -g 0 -m 755 $(PREFIX)/bin/
|
||||
-install -o 0 -g 0 -m 755 $(BIN) $(PREFIX)/bin/
|
||||
- -install -d -o 0 -g 0 -m 755 $(PREFIX)/man/man1/
|
||||
- -install -o 0 -g 0 -m 644 $(BIN).1 $(PREFIX)/man/man1/
|
||||
+ -install -d -o 0 -g 0 -m 755 $(PREFIX)/documentation/man/man1/
|
||||
+ -install -o 0 -g 0 -m 644 $(BIN).1 $(PREFIX)/documentation/man/man1/
|
||||
|
||||
clean:
|
||||
-rm -f *.o $(BIN)
|
||||
Reference in New Issue
Block a user