diff --git a/docker/Dockerfiles/Dockerfile-base b/docker/Dockerfiles/Dockerfile-base index 59b380d..c338dc0 100644 --- a/docker/Dockerfiles/Dockerfile-base +++ b/docker/Dockerfiles/Dockerfile-base @@ -4,6 +4,7 @@ COPY docker/files/js8call/js8call-hamlib.patch \ docker/files/wsjtx/wsjtx.patch \ docker/files/wsjtx/wsjtx-hamlib.patch \ docker/files/dream/dream.patch \ + docker/files/direwolf/direwolf-hamlib.patch \ docker/scripts/install-dependencies.sh / RUN /install-dependencies.sh && \ rm /install-dependencies.sh && \ diff --git a/docker/files/direwolf/direwolf-hamlib.patch b/docker/files/direwolf/direwolf-hamlib.patch new file mode 100644 index 0000000..2347c24 --- /dev/null +++ b/docker/files/direwolf/direwolf-hamlib.patch @@ -0,0 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9e710f5..da90b43 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -257,13 +257,8 @@ else() + set(GPSD_LIBRARIES "") + endif() + +-find_package(hamlib) +-if(HAMLIB_FOUND) +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUSE_HAMLIB") +-else() +- set(HAMLIB_INCLUDE_DIRS "") +- set(HAMLIB_LIBRARIES "") +-endif() ++set(HAMLIB_INCLUDE_DIRS "") ++set(HAMLIB_LIBRARIES "") + + if(LINUX) + find_package(ALSA REQUIRED) diff --git a/docker/scripts/install-dependencies.sh b/docker/scripts/install-dependencies.sh index f047769..338201c 100755 --- a/docker/scripts/install-dependencies.sh +++ b/docker/scripts/install-dependencies.sh @@ -72,10 +72,14 @@ rm ${WSJT_TGZ} git clone --depth 1 -b 1.6 https://github.com/wb2osz/direwolf.git cd direwolf # hamlib is present (necessary for the wsjt-x and js8call builds) and would be used, but there's no real need. -# by setting enable_hamlib we prevent direwolf from linking to it, and it can be stripped at the end of the script. -make enable_hamlib= +# this patch prevents direwolf from linking to it, and it can be stripped at the end of the script. +patch -Np1 < /direwolf-hamlib.patch +mkdir build +cd build +cmake .. +make make install -cd .. +cd ../.. rm -rf direwolf # strip lots of generic documentation that will never be read inside a docker container rm /usr/local/share/doc/direwolf/*.pdf