diff options
| author | Alin Gabriel Serdean <aserdean@ovn.org> | 2020-09-24 09:22:38 +0300 |
|---|---|---|
| committer | Alin Gabriel Serdean <aserdean@cloudbasesolutions.com> | 2020-10-04 22:09:44 +0300 |
| commit | 8596b131c34b41bfe30c74047087b68ae5c071a1 (patch) | |
| tree | 163eecc5fe483e2e82f73f7f8eacfdedc9d07c9c /m4 | |
| parent | fd8e707f38d06014f7e17319a4a10179e6dc66e1 (diff) | |
| download | openvswitch-8596b131c34b41bfe30c74047087b68ae5c071a1.tar.gz | |
windows: Update build with latest pthread project
pthreads-win32 has moved too PThreads4W.
This patch updates the build steps, CI (appveyor) and documentation.
Signed-off-by: Alin Gabriel Serdean <aserdean@ovn.org>
Acked-by: Ilya Maximets <i.maximets@ovn.org>
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/openvswitch.m4 | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/m4/openvswitch.m4 b/m4/openvswitch.m4 index 907e6b060..244ea0fba 100644 --- a/m4/openvswitch.m4 +++ b/m4/openvswitch.m4 @@ -95,23 +95,12 @@ AC_DEFUN([OVS_CHECK_WIN32], AC_MSG_ERROR([Invalid --with-pthread value]) ;; *) - if (cl) 2>&1 | grep 'x64' >/dev/null 2>&1; then - cl_cv_x64=yes - else - cl_cv_x64=no - fi - if test "$cl_cv_x64" = yes; then - PTHREAD_WIN32_DIR=$withval/lib/x64 - PTHREAD_WIN32_DIR_DLL=/$(echo ${withval} | ${SED} -e 's/://')/dll/x64 - PTHREAD_WIN32_DIR_DLL_WIN_FORM=$withval/dll/x64 - else - PTHREAD_WIN32_DIR=$withval/lib/x86 - PTHREAD_WIN32_DIR_DLL=/$(echo ${withval} | ${SED} -e 's/://')/dll/x86 - PTHREAD_WIN32_DIR_DLL_WIN_FORM=$withval/dll/x86 - fi + PTHREAD_WIN32_DIR=$withval/lib + PTHREAD_WIN32_DIR_DLL=/$(echo ${withval} | ${SED} -e 's/://')/bin + PTHREAD_WIN32_DIR_DLL_WIN_FORM=$withval/bin PTHREAD_INCLUDES=-I$withval/include PTHREAD_LDFLAGS=-L$PTHREAD_WIN32_DIR - PTHREAD_LIBS="-lpthreadVC2" + PTHREAD_LIBS="-lpthreadVC3" AC_SUBST([PTHREAD_WIN32_DIR_DLL_WIN_FORM]) AC_SUBST([PTHREAD_WIN32_DIR_DLL]) AC_SUBST([PTHREAD_INCLUDES]) |