From 87c10e2f58cf7b26e0532e0c1cffe3fe4eb9a033 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sun, 6 Aug 2017 22:27:54 +0200 Subject: [PATCH] Enable building zstd on Haiku. --- Makefile | 2 +- lib/Makefile | 2 +- programs/Makefile | 2 +- programs/platform.h | 5 +++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index a1790045..0ad44a67 100644 --- a/Makefile +++ b/Makefile @@ -113,7 +113,7 @@ clean: #------------------------------------------------------------------------------ # make install is validated only for Linux, macOS, Hurd and some BSD targets #------------------------------------------------------------------------------ -ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD DragonFly NetBSD MSYS_NT)) +ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD DragonFly NetBSD MSYS_NT Haiku)) HOST_OS = POSIX CMAKE_PARAMS = -DZSTD_BUILD_CONTRIB:BOOL=ON -DZSTD_BUILD_STATIC:BOOL=ON -DZSTD_BUILD_TESTS:BOOL=ON -DZSTD_ZLIB_SUPPORT:BOOL=ON -DZSTD_LZMA_SUPPORT:BOOL=ON -DCMAKE_BUILD_TYPE=Release diff --git a/lib/Makefile b/lib/Makefile index cf8e45b0..f3948f2d 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -157,7 +157,7 @@ clean: #----------------------------------------------------------------------------- # make install is validated only for Linux, macOS, BSD, Hurd and Solaris targets #----------------------------------------------------------------------------- -ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS)) +ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku)) DESTDIR ?= # directory variables : GNU conventions prefer lowercase diff --git a/programs/Makefile b/programs/Makefile index f1a96325..5bbc8275 100644 --- a/programs/Makefile +++ b/programs/Makefile @@ -258,7 +258,7 @@ preview-man: clean-man man #----------------------------------------------------------------------------- # make install is validated only for Linux, macOS, BSD, Hurd and Solaris targets #----------------------------------------------------------------------------- -ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS)) +ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku)) .PHONY: list list: diff --git a/programs/platform.h b/programs/platform.h index 89eba37e..aa19ee12 100644 --- a/programs/platform.h +++ b/programs/platform.h @@ -70,9 +70,10 @@ extern "C" { * PLATFORM_POSIX_VERSION >= 1 is equal to found _POSIX_VERSION ***************************************************************/ #if !defined(_WIN32) && (defined(__unix__) || defined(__unix) || (defined(__APPLE__) && defined(__MACH__)) /* UNIX-like OS */ \ - || defined(__midipix__) || defined(__VMS)) + || defined(__midipix__) || defined(__VMS) || defined(__HAIKU__)) # if (defined(__APPLE__) && defined(__MACH__)) || defined(__SVR4) || defined(_AIX) || defined(__hpux) /* POSIX.1-2001 (SUSv3) conformant */ \ - || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) /* BSD distros */ + || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) /* BSD distros */ \ + || defined(__HAIKU__) # define PLATFORM_POSIX_VERSION 200112L # else # if defined(__linux__) || defined(__linux)