From 4b527c220bc3afc441cb14920d589d2d36d0d366 Mon Sep 17 00:00:00 2001 From: kikadf Date: Fri, 31 May 2019 16:04:29 +0200 Subject: crypto++: add Haiku patchset diff --git a/GNUmakefile b/GNUmakefile index 6f63071..dac3861 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -79,6 +79,7 @@ IS_DARWIN := $(shell echo "$(SYSTEMX)" | $(GREP) -i -c "Darwin") IS_NETBSD := $(shell echo "$(SYSTEMX)" | $(GREP) -i -c "NetBSD") IS_AIX := $(shell echo "$(SYSTEMX)" | $(GREP) -i -c "aix") IS_SUN := $(shell echo "$(SYSTEMX)" | $(GREP) -i -c -E "SunOS|Solaris") +IS_HAIKU := $(shell echo "$(SYSTEMX)" | $(GREP) -i -c "haiku") SUN_COMPILER := $(shell $(CXX) -V 2>&1 | $(GREP) -i -c -E 'CC: (Sun|Studio)') GCC_COMPILER := $(shell $(CXX) --version 2>/dev/null | $(GREP) -v -E '(llvm|clang)' | $(GREP) -i -c -E '(gcc|g\+\+)') @@ -88,7 +89,7 @@ INTEL_COMPILER := $(shell $(CXX) --version 2>/dev/null | $(GREP) -i -c '\(icc\)' # Enable shared object versioning for Linux and Solaris HAS_SOLIB_VERSION ?= 0 -ifneq ($(IS_LINUX)$(IS_HURD)$(IS_SUN),000) +ifneq ($(IS_LINUX)$(IS_HURD)$(IS_SUN)$(IS_HAIKU),0000) HAS_SOLIB_VERSION := 1 endif @@ -1125,7 +1126,7 @@ ifeq ($(HAS_SOLIB_VERSION),1) # Different patchlevels and minors are compatible since 6.1 SOLIB_COMPAT_SUFFIX=.$(LIB_MAJOR) # Linux uses -Wl,-soname -ifneq ($(IS_LINUX)$(IS_HURD),00) +ifneq ($(IS_LINUX)$(IS_HURD)$(IS_HAIKU),000) # Linux uses full version suffix for shared library SOLIB_VERSION_SUFFIX=.$(LIB_MAJOR).$(LIB_MINOR).$(LIB_PATCH) SOLIB_FLAGS=-Wl,-soname,libcryptopp.so$(SOLIB_COMPAT_SUFFIX) -- 2.30.2 From de813189dc0ff734523d9c8c19701ec79ceb88c8 Mon Sep 17 00:00:00 2001 From: kikadf Date: Sat, 1 Jun 2019 09:38:34 +0200 Subject: crypto++: Fix linking of lib diff --git a/GNUmakefile b/GNUmakefile index dac3861..ab96c61 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -1413,6 +1413,7 @@ ifneq ($(wildcard libcryptopp.so$(SOLIB_VERSION_SUFFIX)),) $(CHMOD) u=rwx,go=rx $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX) ifeq ($(HAS_SOLIB_VERSION),1) -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so + -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_COMPAT_SUFFIX) $(LDCONF) $(DESTDIR)$(LIBDIR) endif endif -- 2.30.2 From 225e0880448624bf1c500b29d4027ea350ceaa0c Mon Sep 17 00:00:00 2001 From: kikadf Date: Fri, 7 Jun 2019 15:00:26 +0200 Subject: Haiku fix 2 config.h diff --git a/config_os.h b/config_os.h index 107e445..c54d4c9 100644 --- a/config_os.h +++ b/config_os.h @@ -40,7 +40,7 @@ #endif // Unix and Linux platforms -#if defined(__unix__) || defined(__MACH__) || defined(__NetBSD__) || defined(__sun) +#if defined(__unix__) || defined(__MACH__) || defined(__NetBSD__) || defined(__sun) || defined(__HAIKU__) #define CRYPTOPP_UNIX_AVAILABLE #endif -- 2.30.2