From: Michael Wallner <mike@php.net>
Date: Wed, 4 Nov 2020 06:41:38 +0000 (+0100)
Subject: cmake: clean up nohsieh.cc
X-Git-Tag: 1.1.0-beta1~128
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=7ce22eee1517dfde4c19a1970aa53bc63557e3a3;p=m6w6%2Flibmemcached

cmake: clean up nohsieh.cc
---

diff --git a/CMake/_Include.cmake b/CMake/_Include.cmake
index 579d8532..9f983784 100644
--- a/CMake/_Include.cmake
+++ b/CMake/_Include.cmake
@@ -6,7 +6,7 @@ endif()
 include(GNUInstallDirs)
 include(CMakePackageConfigHelpers)
 
-if(CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD")
+if(CMAKE_HOST_SYSTEM_NAME MATCHES "BSD")
     find_program(PKGCONF pkgconf)
     if(PKGCONF)
         set(PKG_CONFIG_EXECUTABLE ${PKGCONF})
diff --git a/src/libhashkit/CMakeLists.txt b/src/libhashkit/CMakeLists.txt
index 20377d8b..3b4551db 100644
--- a/src/libhashkit/CMakeLists.txt
+++ b/src/libhashkit/CMakeLists.txt
@@ -1,9 +1,3 @@
-if(HAVE_HSIEH_HASH)
-    set(HSIEH_CC hsieh.cc)
-else()
-    set(HSIEH_CC nohsieh.cc)
-endif()
-
 add_library(libhashkit SHARED
         aes.cc
         algorithm.cc
@@ -16,7 +10,7 @@ add_library(libhashkit SHARED
         function.cc
         has.cc
         hashkit.cc
-        ${HSIEH_CC}
+        hsieh.cc
         jenkins.cc
         md5.cc
         murmur.cc
diff --git a/src/libhashkit/nohsieh.cc b/src/libhashkit/nohsieh.cc
deleted file mode 100644
index fdf07fe0..00000000
--- a/src/libhashkit/nohsieh.cc
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-    +--------------------------------------------------------------------+
-    | libmemcached - C/C++ Client Library for memcached                  |
-    +--------------------------------------------------------------------+
-    | Redistribution and use in source and binary forms, with or without |
-    | modification, are permitted under the terms of the BSD license.    |
-    | You should have received a copy of the license in a bundled file   |
-    | named LICENSE; in case you did not receive a copy you can review   |
-    | the terms online at: https://opensource.org/licenses/BSD-3-Clause  |
-    +--------------------------------------------------------------------+
-    | Copyright (c) 2006-2014 Brian Aker   https://datadifferential.com/ |
-    | Copyright (c) 2020 Michael Wallner   <mike@php.net>                |
-    +--------------------------------------------------------------------+
-*/
-
-#include "libhashkit/common.h"
-
-#ifdef HAVE_HSIEH_HASH
-#  error "not supported"
-#else
-uint32_t hashkit_hsieh(const char *, size_t, void *) {
-  return 0;
-}
-#endif