Changeset 2546 in kBuild
- Timestamp:
- Oct 1, 2011 7:49:54 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 25 edited
- 2 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/Config.kmk
r2538 r2546 100 100 # Various platform specific hacks. 101 101 # 102 ifn1of ($(KBUILD_TARGET), openbsd)102 ifn1of ($(KBUILD_TARGET), haiku openbsd) 103 103 GCC_Wextra = -Wextra 104 104 endif -
trunk/kBuild/env.sh
r2413 r2546 265 265 ;; 266 266 267 Haiku) 268 KBUILD_HOST=haiku 269 ;; 270 267 271 linux|Linux|GNU/Linux|LINUX) 268 272 KBUILD_HOST=linux … … 323 327 KBUILD_HOST_ARCH='amd64' 324 328 ;; 325 x86|i86pc|ia32|i[3456789]86 )329 x86|i86pc|ia32|i[3456789]86|BePC) 326 330 KBUILD_HOST_ARCH='x86' 327 331 ;; -
trunk/kBuild/header.kmk
r2537 r2546 189 189 # build types. (PORTME) 190 190 # 191 KBUILD_OSES := darwin dos dragonfly freebsd l4 linux netbsd nt openbsd os2 solaris win os-agnostic191 KBUILD_OSES := darwin dos dragonfly freebsd haiku l4 linux netbsd nt openbsd os2 solaris win os-agnostic 192 192 KBUILD_ARCHES := x86 amd64 sparc32 sparc64 s390 s390x ppc32 ppc64 mips32 mips64 ia64 hppa32 hppa64 arm alpha 193 193 -
trunk/src/kObjCache/kObjCache.c
r2463 r2546 73 73 # include <Windows.h> 74 74 # include "quoted_spawn.h" 75 #endif 76 #if defined(__HAIKU__) 77 # include <posix/sys/file.h> 75 78 #endif 76 79 -
trunk/src/kash/Makefile.kmk
r2498 r2546 37 37 kash_DEFS += SH_FORKED_MODE 38 38 kash_DEFS.debug = DEBUG=2 39 kash_DEFS.haiku = BSD 39 40 kash_DEFS.linux = BSD 40 41 kash_DEFS.solaris = BSD … … 97 98 shthread.c \ 98 99 shfile.c 100 kash_SOURCES.haiku = \ 101 sys_signame.c \ 102 strlcpy.c 99 103 kash_SOURCES.linux = \ 100 104 sys_signame.c \ 101 105 strlcpy.c 106 kash_SOURCES.solaris = \ 107 sys_signame.c \ 108 strlcpy.c 102 109 kash_SOURCES.win = \ 103 110 sys_signame.c \ … … 105 112 shfork-win.c \ 106 113 shforkA-win.asm 107 kash_SOURCES.solaris = \108 sys_signame.c \109 strlcpy.c110 114 111 115 kash_INTERMEDIATES = \ -
trunk/src/kash/error.h
r2298 r2546 60 60 */ 61 61 62 #include <setjmp.h> 62 #ifndef __HAIKU__ 63 # include <setjmp.h> 64 #else 65 # include <posix/setjmp.h> /** @todo silly */ 66 #endif 63 67 64 68 struct jmploc { … … 121 125 */ 122 126 123 #if defined(BSD) && !defined(__SVR4) && !defined(__GLIBC__) && !defined(__KLIBC__) && !defined(_MSC_VER) 127 #if defined(BSD) && !defined(__SVR4) && !defined(__GLIBC__) \ 128 && !defined(__KLIBC__) && !defined(_MSC_VER) && !defined(__HAIKU__) 124 129 #define setjmp(jmploc) _setjmp(jmploc) 125 130 #define longjmp(jmploc, val) _longjmp(jmploc, val) -
trunk/src/kash/shfile.h
r2498 r2546 1 1 /* $Id$ */ 2 2 /** @file 3 *4 3 * File management. 5 * 4 */ 5 6 /* 6 7 * Copyright (c) 2007-2010 knut st. osmundsen <[email protected]> 7 8 * … … 47 48 #endif 48 49 #ifndef _MSC_VER 49 # include < sys/fcntl.h>50 # include <fcntl.h> 50 51 # include <unistd.h> 51 52 # ifndef O_BINARY -
trunk/src/kash/shinstance.c
r2423 r2546 890 890 return 0; 891 891 } 892 #include <setjmp.h>893 892 894 893 pid_t sh_fork(shinstance *psh) -
trunk/src/kash/shinstance.h
r2498 r2546 445 445 #else 446 446 # include <sys/wait.h> 447 # ifdef __HAIKU__ 448 # define WCOREDUMP(x) (0) /** @todo check the haiku headers and see if this information is available or not... */ 449 # endif 447 450 #endif 448 451 pid_t sh_fork(shinstance *); -
trunk/src/kash/shtypes.h
r2413 r2546 1 1 /* $Id$ */ 2 2 /** @file 3 *4 3 * Wrapper for missing types and such. 5 * 4 */ 5 6 /* 6 7 * Copyright (c) 2007-2010 knut st. osmundsen <[email protected]> 7 8 * … … 32 33 #include <sys/types.h> 33 34 #include <stdlib.h> 34 #ifndef _MSC_VER 35 #ifdef __HAIKU__ 36 # include <posix/signal.h> /* silly */ 37 #elif !defined(_MSC_VER) 35 38 # include <sys/signal.h> 36 39 #endif -
trunk/src/kmk/Makefile.kmk
r2532 r2546 58 58 TEMPLATE_BIN-KMK_INCS.dragonfly = glob 59 59 TEMPLATE_BIN-KMK_INCS.freebsd = glob 60 TEMPLATE_BIN-KMK_INCS.haiku = glob 60 61 TEMPLATE_BIN-KMK_INCS.openbsd = glob 61 62 TEMPLATE_BIN-KMK_INCS.solaris = glob … … 99 100 100 101 kmkmissing_SOURCES.freebsd = \ 102 glob/glob.c \ 103 glob/fnmatch.c 104 105 kmkmissing_SOURCES.haiku = \ 106 kmkbuiltin/haikufakes.c \ 101 107 glob/glob.c \ 102 108 glob/fnmatch.c -
trunk/src/kmk/arscan.c
r1993 r2546 232 232 233 233 #ifndef WINDOWS32 234 # if ndef __BEOS__234 # if !defined(__BEOS__) && !defined(__HAIKU__) 235 235 # include <ar.h> 236 236 # else -
trunk/src/kmk/incdep.c
r2413 r2546 636 636 #elif defined(__APPLE__) \ 637 637 || defined(__sun__) || defined(__SunOS__) || defined(__sun) || defined(__SunOS) \ 638 || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) 638 || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) \ 639 || defined(__HAIKU__) 639 640 /* No broken preload libraries known to be in common use on these platforms... */ 640 641 -
trunk/src/kmk/job.c
r2467 r2546 2061 2061 load_too_high (void) 2062 2062 { 2063 #if defined(__MSDOS__) || defined(VMS) || defined(_AMIGA) || defined(__riscos__) 2063 #if defined(__MSDOS__) || defined(VMS) || defined(_AMIGA) || defined(__riscos__) || defined(__HAIKU__) 2064 2064 return 1; 2065 2065 #else -
trunk/src/kmk/kmkbuiltin/chmod.c
r2466 r2546 53 53 #include <stdlib.h> 54 54 #include <string.h> 55 #if def _MSC_VER55 #ifndef _MSC_VER 56 56 # include <unistd.h> 57 57 #else … … 60 60 #ifdef __sun__ 61 61 # include "solfakes.h" 62 #endif 63 #ifdef __HAIKU__ 64 # include "haikufakes.h" 62 65 #endif 63 66 #include "getopt.h" -
trunk/src/kmk/kmkbuiltin/cp_utils.c
r2466 r2546 36 36 #endif /* not lint */ 37 37 38 #define MSC_DO_64_BIT_IO 38 39 #include "config.h" 39 40 #ifndef _MSC_VER … … 53 54 #include <stdlib.h> 54 55 #include <signal.h> 55 #include <sysexits.h> 56 #ifndef __HAIKU__ 57 # include <sysexits.h> 58 #endif 56 59 #include <unistd.h> 57 60 #ifdef __sun__ 58 61 # include "solfakes.h" 59 62 #endif 63 #ifdef __HAIKU__ 64 # include "haikufakes.h" 65 #endif 60 66 #ifdef _MSC_VER 61 # define MSC_DO_64_BIT_IO62 67 # include "mscfakes.h" 63 68 #else -
trunk/src/kmk/kmkbuiltin/fts.c
r2203 r2546 76 76 77 77 #if ! HAVE_NBTOOL_CONFIG_H 78 # if !defined(__sun__) && !defined(__gnu_linux__) 78 # if !defined(__sun__) && !defined(__gnu_linux__) && !defined(__HAIKU__) 79 79 # define HAVE_STRUCT_DIRENT_D_NAMLEN 1 80 80 # endif -
trunk/src/kmk/kmkbuiltin/haikufakes.c
r2545 r2546 1 1 /* $Id$ */ 2 2 /** @file 3 * Fake Unix stuff for Solaris.3 * Fake Unix/BSD stuff for Haiku. 4 4 */ 5 5 … … 33 33 #include <stdlib.h> 34 34 #include <sys/stat.h> 35 #include " solfakes.h"35 #include "haikufakes.h" 36 36 37 37 38 int asprintf(char **strp, const char *fmt, ...) 39 { 40 int rc; 41 va_list va; 42 va_start(va, fmt); 43 rc = vasprintf(strp, fmt, va); 44 va_end(va); 45 return rc; 46 } 47 48 49 int vasprintf(char **strp, const char *fmt, va_list va) 50 { 51 int rc; 52 char *psz; 53 size_t cb = 1024; 54 55 *strp = NULL; 56 for (;;) 57 { 58 va_list va2; 59 60 psz = malloc(cb); 61 if (!psz) 62 return -1; 63 64 #ifdef va_copy 65 va_copy(va2, va); 66 rc = snprintf(psz, cb, fmt, va2); 67 va_end(va2); 68 #else 69 va2 = va; 70 rc = snprintf(psz, cb, fmt, va2); 71 #endif 72 if (rc < 0 || (size_t)rc < cb) 73 break; 74 cb *= 2; 75 free(psz); 76 } 77 78 *strp = psz; 79 return rc; 80 } 81 82 83 84 int sol_lchmod(const char *pszPath, mode_t mode) 38 int haiku_lchmod(const char *pszPath, mode_t mode) 85 39 { 86 40 /* -
trunk/src/kmk/kmkbuiltin/haikufakes.h
r2545 r2546 1 1 /* $Id$ */ 2 2 /** @file 3 * Unix fakes for MSC.3 * Unix/BSD fakes for Haiku. 4 4 */ 5 5 … … 24 24 */ 25 25 26 #ifndef ___mscfakes_h 27 #define ___mscfakes_h 28 #ifdef _MSC_VER 29 30 #include <io.h> 31 #include <direct.h> 32 #include <time.h> 33 #include <stdarg.h> 34 #include <malloc.h> 35 #include "getopt.h" 36 37 #if defined(MSC_DO_64_BIT_IO) && _MSC_VER >= 1400 /* We want 64-bit file lengths here when possible. */ 38 # define off_t __int64 39 # define stat _stat64 40 # define fstat _fstat64 41 # define lseek _lseeki64 42 #else 43 # undef stat 44 # define stat(_path, _st) my_other_stat(_path, _st) 45 extern int my_other_stat(const char *, struct stat *); 46 #endif 47 48 49 50 #ifndef S_ISDIR 51 # define S_ISDIR(m) (((m) & _S_IFMT) == _S_IFDIR) 52 #endif 53 #ifndef S_ISREG 54 # define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG) 55 #endif 56 #define S_ISLNK(m) 0 57 #define S_IRWXU (_S_IREAD | _S_IWRITE | _S_IEXEC) 58 #define S_IXUSR _S_IEXEC 59 #define S_IWUSR _S_IWRITE 60 #define S_IRUSR _S_IREAD 61 #define S_IRWXG 0000070 62 #define S_IRGRP 0000040 63 #define S_IWGRP 0000020 64 #define S_IXGRP 0000010 65 #define S_IRWXO 0000007 66 #define S_IROTH 0000004 67 #define S_IWOTH 0000002 68 #define S_IXOTH 0000001 69 #define S_ISUID 0004000 70 #define S_ISGID 0002000 71 #define ALLPERMS 0000777 72 73 #undef PATH_MAX 74 #define PATH_MAX _MAX_PATH 75 #undef MAXPATHLEN 76 #define MAXPATHLEN _MAX_PATH 26 #ifndef ___haikufakes_h 27 #define ___haikufakes_h 77 28 78 29 #define EX_OK 0 … … 80 31 #define EX_NOUSER 1 81 32 #define EX_USAGE 1 33 #define EX_TEMPFAIL 1 34 #define EX_SOFTWARE 1 82 35 83 #define STDIN_FILENO 0 84 #define STDOUT_FILENO 1 85 #define STDERR_FILENO 2 36 #define lutimes(path, tvs) utimes(path, tvs) 37 #define lchmod haiku_lchmod 86 38 87 #define F_OK 088 #define X_OK 189 #define W_OK 290 #define R_OK 491 92 #define EFTYPE EINVAL93 94 #define _PATH_DEVNULL "/dev/null"95 96 #ifndef MAX97 # define MAX(a,b) ((a) >= (b) ? (a) : (b))98 39 #endif 99 40 100 typedef int mode_t;101 typedef unsigned short nlink_t;102 #if 0 /* found in config.h */103 typedef unsigned short uid_t;104 typedef unsigned short gid_t;105 #endif106 typedef long ssize_t;107 typedef unsigned long u_long;108 typedef unsigned int u_int;109 typedef unsigned short u_short;110 111 #ifndef timerisset112 struct timeval113 {114 long tv_sec;115 long tv_usec;116 };117 #endif118 119 struct iovec120 {121 char *iov_base;122 size_t iov_len;123 };124 125 typedef __int64 intmax_t;126 #if 0 /* found in config.h */127 typedef unsigned __int64 uintmax_t;128 #endif129 130 #define chown(path, uid, gid) 0 /** @todo implement fchmod! */131 char *dirname(char *path);132 #define fsync(fd) 0133 #define fchown(fd,uid,gid) 0134 #define fchmod(fd, mode) 0 /** @todo implement fchmod! */135 #define geteuid() 0136 #define getegid() 0137 #define lstat(path, s) stat(path, s)138 int lchmod(const char *path, mode_t mode);139 int msc_chmod(const char *path, mode_t mode);140 #define chmod msc_chmod141 #define lchown(path, uid, gid) chown(path, uid, gid)142 #define lutimes(path, tvs) utimes(path, tvs)143 int link(const char *pszDst, const char *pszLink);144 int mkdir_msc(const char *path, mode_t mode);145 #define mkdir(path, mode) mkdir_msc(path, mode)146 #define mkfifo(path, mode) -1147 #define mknod(path, mode, devno) -1148 int mkstemp(char *temp);149 #define readlink(link, buf, size) -1150 #define reallocf(old, size) realloc(old, size)151 int rmdir_msc(const char *path);152 #define rmdir(path) rmdir_msc(path)153 intmax_t strtoimax(const char *nptr, char **endptr, int base);154 uintmax_t strtoumax(const char *nptr, char **endptr, int base);155 #define strtoll(a,b,c) strtoimax(a,b,c)156 #define strtoull(a,b,c) strtoumax(a,b,c)157 int asprintf(char **strp, const char *fmt, ...);158 int vasprintf(char **strp, const char *fmt, va_list ap);159 #if _MSC_VER < 1400160 int snprintf(char *buf, size_t size, const char *fmt, ...);161 #else162 #define snprintf _snprintf163 #endif164 int symlink(const char *pszDst, const char *pszLink);165 int utimes(const char *pszPath, const struct timeval *paTimes);166 int writev(int fd, const struct iovec *vector, int count);167 168 #endif /* _MSC_VER */169 #endif170 -
trunk/src/kmk/kmkbuiltin/install.c
r2543 r2546 53 53 # include <sys/mman.h> 54 54 # endif 55 # include <sys/mount.h> 55 # ifndef __HAIKU__ 56 # include <sys/mount.h> 57 # endif 56 58 # include <sys/wait.h> 57 59 # include <sys/time.h> … … 69 71 #include <stdlib.h> 70 72 #include <string.h> 71 #include <sysexits.h> 73 #ifndef __HAIKU__ 74 # include <sysexits.h> 75 #endif 72 76 #include <unistd.h> 73 77 #if defined(__EMX__) || defined(_MSC_VER) … … 80 84 #ifdef _MSC_VER 81 85 # include "mscfakes.h" 86 #endif 87 #ifdef __HAIKU__ 88 # include "haikufakes.h" 82 89 #endif 83 90 #include "kmkbuiltin.h" -
trunk/src/kmk/kmkbuiltin/mkdir.c
r2466 r2546 54 54 #include <stdlib.h> 55 55 #include <string.h> 56 #include <sysexits.h> 56 #ifndef __HAIKU__ 57 # include <sysexits.h> 58 #endif 57 59 #include <unistd.h> 58 60 #ifdef HAVE_ALLOCA_H … … 60 62 #endif 61 63 #include "getopt.h" 64 #ifdef __HAIKU__ 65 # include "haikufakes.h" 66 #endif 62 67 #ifdef _MSC_VER 63 68 # include <malloc.h> -
trunk/src/kmk/kmkbuiltin/mv.c
r2421 r2546 56 56 # include <sys/time.h> 57 57 # include <sys/wait.h> 58 # include <sys/mount.h> 58 # ifndef __HAIKU__ 59 # include <sys/mount.h> 60 # endif 59 61 #endif 60 62 #include <sys/stat.h> … … 70 72 #include <stdlib.h> 71 73 #include <string.h> 72 #include <sysexits.h> 74 #ifndef __HAIKU__ 75 # include <sysexits.h> 76 #endif 73 77 #include <unistd.h> 74 78 #include "getopt.h" 75 79 #ifdef __sun__ 76 80 # include "solfakes.h" 81 #endif 82 #ifdef __HAIKU__ 83 # include "haikufakes.h" 77 84 #endif 78 85 #ifdef _MSC_VER -
trunk/src/kmk/kmkbuiltin/rm.c
r2466 r2546 44 44 #include "config.h" 45 45 #include <sys/stat.h> 46 #if ndef _MSC_VER46 #if !defined(_MSC_VER) && !defined(__HAIKU__) 47 47 # include <sys/param.h> 48 48 # include <sys/mount.h> … … 58 58 #include <stdlib.h> 59 59 #include <string.h> 60 #include <sysexits.h> 60 #ifndef __HAIKU__ 61 # include <sysexits.h> 62 #endif 61 63 #include <unistd.h> 62 64 #include <ctype.h> 63 65 #include "getopt.h" 66 #ifdef __HAIKU__ 67 # include "haikufakes.h" 68 #endif 64 69 #ifdef _MSC_VER 65 70 # include "mscfakes.h" -
trunk/src/kmk/main.c
r2243 r2546 55 55 # define INCL_BASE 56 56 # include <os2.h> 57 # endif 58 # ifdef __HAIKU__ 59 # include <OS.h> 57 60 # endif 58 61 #endif /* KMK*/ … … 840 843 if (!SetProcessAffinityMask (GetCurrentProcess (), process_affinity)) 841 844 fprintf (stderr, "warning: SetPriorityClass (,%#x) failed with last error %d\n", 842 process_affinity, GetLastError ());845 process_affinity, GetLastError ()); 843 846 844 847 switch (process_priority) … … 850 853 case 4: dwPriority = HIGH_PRIORITY_CLASS; break; 851 854 case 5: dwPriority = REALTIME_PRIORITY_CLASS; break; 852 default: fatal (NILF, _("invalid priority %d\n"), process_priority);855 default: fatal (NILF, _("invalid priority %d\n"), process_priority); 853 856 } 854 857 if (!SetPriorityClass (GetCurrentProcess (), dwPriority)) 855 858 fprintf (stderr, "warning: SetPriorityClass (,%#x) failed with last error %d\n", 856 859 dwPriority, GetLastError ()); 860 861 #elif defined(__HAIKU__) 862 int32 iNewPriority; 863 status_t error; 864 865 switch (process_priority) 866 { 867 case 0: return; 868 case 1: iNewPriority = B_LOWEST_ACTIVE_PRIORITY; break; 869 case 2: iNewPriority = B_LOW_PRIORITY; break; 870 case 3: iNewPriority = B_NORMAL_PRIORITY; break; 871 case 4: iNewPriority = B_URGENT_DISPLAY_PRIORITY; break; 872 case 5: iNewPriority = B_REAL_TIME_DISPLAY_PRIORITY; break; 873 default: fatal (NILF, _("invalid priority %d\n"), process_priority); 874 } 875 error = set_thread_priority (find_thread (NULL), iNewPriority); 876 if (error != B_OK) 877 fprintf (stderr, "warning: set_thread_priority (,%d) failed: %s\n", 878 newPriority, strerror (error)); 857 879 858 880 # else /*#elif HAVE_NICE */ … … 866 888 case 4: nice_level = -10; break; 867 889 case 5: nice_level = -19; break; 868 default: fatal (NILF, _("invalid priority %d\n"), process_priority);890 default: fatal (NILF, _("invalid priority %d\n"), process_priority); 869 891 } 870 892 errno = 0; -
trunk/src/lib/k/kDefs.h
r2413 r2546 43 43 /** FreeBSD. */ 44 44 #define K_OS_FREEBSD 3 45 /** Haiku. */ 46 #define K_OS_HAIKU 4 45 47 /** Linux. */ 46 #define K_OS_LINUX 448 #define K_OS_LINUX 5 47 49 /** NetBSD. */ 48 #define K_OS_NETBSD 550 #define K_OS_NETBSD 6 49 51 /** NT (native). */ 50 #define K_OS_NT 652 #define K_OS_NT 7 51 53 /** OpenBSD*/ 52 #define K_OS_OPENBSD 754 #define K_OS_OPENBSD 8 53 55 /** OS/2 */ 54 #define K_OS_OS2 856 #define K_OS_OS2 9 55 57 /** Solaris */ 56 #define K_OS_SOLARIS 958 #define K_OS_SOLARIS 10 57 59 /** Windows. */ 58 #define K_OS_WINDOWS 1 060 #define K_OS_WINDOWS 11 59 61 /** The max K_OS_* value (exclusive). */ 60 #define K_OS_MAX 1 162 #define K_OS_MAX 12 61 63 /** @} */ 62 64 … … 79 81 # elif defined(__FreeBSD__) /*??*/ 80 82 # define K_OS K_OS_FREEBSD 83 # elif defined(__HAIKU__) 84 # define K_OS K_OS_HAIKU 81 85 # elif defined(__gnu_linux__) 82 86 # define K_OS K_OS_LINUX -
trunk/src/misc/kmk_time.c
r2413 r2546 364 364 rc = WEXITSTATUS(rc); 365 365 } 366 # ifndef __HAIKU__ /**@todo figure how haiku signals that a core was dumped. */ 366 367 else if (WIFSIGNALED(rc) && WCOREDUMP(rc)) 367 368 { … … 369 370 rc = 10; 370 371 } 372 # endif 371 373 else if (WIFSIGNALED(rc)) 372 374 { -
trunk/src/sed/Makefile.kmk
r2506 r2546 70 70 lib/obstack.c \ 71 71 lib/getline.c 72 kmk_sed_SOURCES.haiku = \ 73 lib/strverscmp.c \ 74 lib/obstack.c 72 75 kmk_sed_SOURCES.openbsd = \ 73 76 lib/strverscmp.c \ … … 76 79 kmk_sed_SOURCES.solaris = \ 77 80 lib/strverscmp.c \ 78 lib/obstack.c 81 lib/obstack.c 79 82 ifdef KBUILD_SOLARIS_10 80 83 kmk_sed_SOURCES.solaris += \
Note:
See TracChangeset
for help on using the changeset viewer.