| |
| |
| @@ -83,7 +83,7 @@ |
| #endif |
| |
| #if defined(linux) || defined(__linux) || defined(__linux__) || \ |
| - defined(__gnu_linux__) |
| + defined(__gnu_linux__) || defined(__midipix__) |
| #include <sys/sendfile.h> |
| #define gsendfile ::sendfile |
| #endif |
| |
| |
| @@ -18,7 +18,7 @@ |
| #ifndef PCUTIL_H |
| #define PCUTIL_H |
| |
| -#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__gnu_linux__) |
| +#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__gnu_linux__) || defined(__midipix__) |
| #include <sched.h> |
| # define SET_AFFINITY(pid, size, mask) sched_setaffinity(0, size, mask) |
| # define GET_AFFINITY(pid, size, mask) sched_getaffinity(0, size, mask) |
| |
| |
| @@ -45,7 +45,9 @@ |
| #include <util/stringlist.h> |
| #include <util/signalutil.h> |
| #include <util/vmembuf.h> |
| +#ifndef __midipix__ |
| #include <sys/sysctl.h> |
| +#endif |
| |
| #include <extensions/cgi/cgidworker.h> |
| #include <extensions/registry/extappregistry.h> |
| @@ -1428,7 +1430,7 @@ |
| #ifdef LSWS_NO_SET_AFFINITY |
| return 2; |
| #else |
| -#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__gnu_linux__) |
| +#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__gnu_linux__) || defined(__midipix__) |
| return sysconf(_SC_NPROCESSORS_ONLN); |
| #else |
| int nm[2]; |
| |
| |
| @@ -11292,7 +11292,7 @@ |
| ;; |
| |
| # This must be glibc/ELF. |
| -linux* | k*bsd*-gnu | kopensolaris*-gnu) |
| +linux* | k*bsd*-gnu | kopensolaris*-gnu | midipix) |
| version_type=linux # correct to gnu/linux during the next big refactor |
| need_lib_prefix=no |
| need_version=no |
| @@ -15863,16 +15863,8 @@ |
| |
| |
| if test "$OPENLSWS_BSSL" = no ; then |
| - if test "$OSNAME" = Darwin ; then |
| - usedynossl=yes |
| - CPPFLAGS="$CPPFLAGS -I../../src -I../../include -I/usr/local/include -I/usr/local -I/usr -I/usr/pkg " |
| - else |
| - usedynossl=no |
| - CPPFLAGS="$CPPFLAGS -I../../ssl/include -I../../src -I../../include -I/usr/local/include -I/usr/local -I/usr -I/usr/pkg " |
| - echo "Will build latest stable openssl libraries for you, this may take several minutes ..." |
| - OSSL=`. $srcdir/dlossl.sh` |
| - echo "Finsihed building openssl." |
| - fi |
| + usedynossl=yes |
| + CPPFLAGS="$CPPFLAGS -I../../src -I../../include " |
| echo "Openssl: use_dyn_ossl = $usedynossl" |
| else |
| #### Not provide location, use default location, will not copy files |
| @@ -15982,12 +15974,6 @@ |
| fi |
| |
| |
| -ZLIB_HOME=/usr/local |
| -if test ! -f "${ZLIB_HOME}/include/zlib.h" |
| -then |
| - ZLIB_HOME=/usr |
| -fi |
| - |
| # |
| # Locate zlib, if wanted |
| # |
| @@ -16131,7 +16117,6 @@ |
| |
| |
| |
| -if test "$OSNAME" = Darwin ; then |
| |
| |
| # Check whether --with-openssl was given. |
| @@ -16259,8 +16244,6 @@ |
| |
| |
| |
| -fi |
| - |
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking lib pcre" >&5 |
| $as_echo_n "checking lib pcre... " >&6; } |
| PCRE_LDFLAGS= |
| |
| |
| @@ -21,6 +21,8 @@ |
| #include <ctype.h> |
| #include <stdlib.h> |
| #include <unistd.h> |
| +#include <string.h> |
| +#include <pthread.h> |
| |
| #ifdef __linux |
| #include <sched.h> |
| @@ -72,7 +74,7 @@ |
| |
| if (s_nCpu > 0) |
| return s_nCpu; |
| -#if defined(linux) || defined(__linux) || defined(__linux__) |
| +#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__midipix__) |
| s_nCpu = sysconf(_SC_NPROCESSORS_ONLN); |
| #else |
| int mib[2]; |
| @@ -116,7 +118,7 @@ |
| #ifdef __FreeBSD__ |
| return cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, -1, |
| sizeof(cpu_set_t), mask); |
| -#elif defined(linux) || defined(__linux) || defined(__linux__) |
| +#elif defined(linux) || defined(__linux) || defined(__linux__) || defined(__midipix__) |
| return pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), mask); |
| //return sched_setaffinity(0, sizeof(cpu_set_t), mask); |
| #endif |
| |
| |
| @@ -17,6 +17,9 @@ |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |