Commit aeeaa374 authored by Chuck Atkins's avatar Chuck Atkins
Browse files

socat: Replace portfwd with socat

socat is a much more flexible solutionand alloows for a wider
range of connection forwarding options
parent 4f7bafc6
Pipeline #34874 passed with stage
......@@ -79,7 +79,7 @@ function (superbuild_find_projects var)
mesa
osmesa
paraviewsdk
portfwd)
socat)
endif ()
endif ()
......
......@@ -10,10 +10,8 @@ set(ENABLE_freetype ON CACHE BOOL "")
set(ENABLE_genericio ON CACHE BOOL "")
set(ENABLE_hdf5 ON CACHE BOOL "")
set(ENABLE_libxml2 ON CACHE BOOL "")
set(ENABLE_matplotlib ON CACHE BOOL "")
set(ENABLE_mpi ON CACHE BOOL "")
set(ENABLE_numpy ON CACHE BOOL "")
set(ENABLE_egl ON CACHE BOOL "")
set(ENABLE_ospray ON CACHE BOOL "")
set(ENABLE_paraview ON CACHE BOOL "")
set(ENABLE_png ON CACHE BOOL "")
......@@ -22,8 +20,15 @@ set(ENABLE_silo ON CACHE BOOL "")
set(ENABLE_visitbridge ON CACHE BOOL "")
set(ENABLE_zlib ON CACHE BOOL "")
# Use for connection forwarding
find_program(SOCAT socat)
if(NOT SOCAT)
set(ENABLE_socat ON CACHE BOOL "")
endif()
# These will get pulled from the compute node's userland
set(USE_SYSTEM_egl ON CACHE BOOL "")
set(ENABLE_egl ON CACHE BOOL "")
set(USE_SYSTEM_egl ON CACHE BOOL "")
set(EGL_LIBRARY /usr/lib64/nvidia/libEGL.so CACHE FILEPATH "")
set(EGL_gldispatch_LIBRARY /usr/lib64/nvidia/libGLdispatch.so.0 CACHE FILEPATH "")
set(EGL_opengl_LIBRARY /usr/lib64/nvidia/libOpenGL.so CACHE FILEPATH "")
......
......@@ -10,7 +10,6 @@ set(ENABLE_freetype ON CACHE BOOL "")
set(ENABLE_genericio ON CACHE BOOL "")
set(ENABLE_hdf5 ON CACHE BOOL "")
set(ENABLE_libxml2 ON CACHE BOOL "")
set(ENABLE_matplotlib ON CACHE BOOL "")
set(ENABLE_mpi ON CACHE BOOL "")
set(ENABLE_numpy ON CACHE BOOL "")
set(ENABLE_osmesa ON CACHE BOOL "")
......@@ -22,6 +21,12 @@ set(ENABLE_silo ON CACHE BOOL "")
set(ENABLE_visitbridge ON CACHE BOOL "")
set(ENABLE_zlib ON CACHE BOOL "")
# Use for connection forwarding
find_program(SOCAT socat)
if(NOT SOCAT)
set(ENABLE_socat ON CACHE BOOL "")
endif()
# These will get pulled from the compute node's userland
set(USE_SYSTEM_freetype ON CACHE BOOL "")
set(USE_SYSTEM_libxml2 ON CACHE BOOL "")
......
......@@ -188,3 +188,7 @@ if (qt4_enabled)
else ()
set(qt4_plugin_paths)
endif ()
if (socat_built_by_superbuild)
include(socat.bundle)
endif ()
--- socat-1.7.3.1/sysincludes.h.orig 2016-11-11 09:14:08.891107787 -0500
+++ socat-1.7.3.1/sysincludes.h 2016-11-11 09:15:25.705448506 -0500
@@ -17,6 +17,7 @@
#include <math.h> /* HUGE_VAL */
#include <assert.h>
#include <stdarg.h> /* for msg() */
+#include <stddef.h> /* for ptrdiff_t */
#include <string.h> /* strerror(), strchr() */
#if HAVE_STRINGS_H
#include <strings.h> /* strcasecmp(), bzero() for FD_ZERO */
superbuild_unix_install_program(portfwd "")
# portfwd needs automake1.4. So ensure that it's present.
superbuild_add_project(portfwd
CONFIGURE_COMMAND
<SOURCE_DIR>/configure
--prefix=<INSTALL_DIR>
# Since portfwd puts the executable in "sbin", we change it to put it in
# bin.
--sbindir=<INSTALL_DIR>/bin
BUILD_IN_SOURCE 1)
superbuild_unix_install_program(
"${superbuild_install_location}/bin/socat" "bin")
superbuild_add_project(socat
CONFIGURE_COMMAND
<SOURCE_DIR>/configure
--prefix=<INSTALL_DIR>
--disable-libwrap
--disable-openssl
BUILD_COMMAND
$(MAKE)
INSTALL_COMMAND
$(MAKE) install
BUILD_IN_SOURCE 1)
superbuild_apply_patch(socat add-missing-stddef
"Add a missing include for stddef.h")
......@@ -100,9 +100,9 @@ superbuild_set_revision(vortexfinder2
# or disabled.
#------------------------------------------------------------------------------
superbuild_set_revision(portfwd
URL "http://www.paraview.org/files/dependencies/portfwd-0.29.tar.gz"
URL_MD5 93161c91e12b0d67ca52dc13708a2f2f)
superbuild_set_revision(socat
URL "http://www.paraview.org/files/dependencies/socat-1.7.3.1.tar.bz2"
URL_MD5 334e46924f2b386299c9db2ac22bcd36)
set(ispc_version "1.9.1")
if (WIN32)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment