Move asio to third_party/.

Change-Id: I952f2b5d2e2a6ced2ddd46c601b04c6b2b21dfc6
Checkmk · Jan 9, 2023 · f52d53a · f52d53a
1 parent 5e4d938
commit f52d53a
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/Makefile b/Makefile
@@ -188,7 +188,7 @@ $(LIVESTATUS_INTERMEDIATE_ARCHIVE):
 	rm -rf mk-livestatus-$(VERSION)
 	mkdir -p mk-livestatus-$(VERSION)
 	tar chf - $(TAROPTS) -C livestatus $$(cd livestatus ; echo $(LIVESTATUS_SOURCES) ) | tar xf - -C mk-livestatus-$(VERSION)
-	tar chf - $(TAROPTS) --exclude=build packages/livestatus third_party/re2 omd/packages/asio third_party/googletest | tar xf - -C mk-livestatus-$(VERSION)
+	tar chf - $(TAROPTS) --exclude=build packages/livestatus third_party/re2 third_party/asio third_party/googletest | tar xf - -C mk-livestatus-$(VERSION)
 	cp -a configure.ac defines.make m4 mk-livestatus-$(VERSION)
 	cd mk-livestatus-$(VERSION) && \
 	    autoreconf --install --include=m4 && \

diff --git a/agents/wnx/Makefile b/agents/wnx/Makefile
@@ -19,7 +19,7 @@ MSI_PATCH_FILE 	= $(TOP_SRC_DIR)\cmk\utils\msi_patch.py
 
 EXTLIBS         := extlibs
 
-PACKAGE_ASIO 	:= $(TOP_SRC_DIR)\omd\packages\asio
+PACKAGE_ASIO 	:= $(TOP_SRC_DIR)\third_party\asio
 # ATTENTION: this value is hardcoded in the vcxproj files - fix it, please, too
 ASIO_VERSION 	:= asio-1.24.0-patched
 

diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am
@@ -12,7 +12,7 @@ VALGRIND ?= $(shell valgrind --version > /dev/null 2>&1 && echo "valgrind --quie
 INCLUDES_DIR := includes
 LIBS_DIR := libs
 
-PACKAGE_ASIO := $(abs_top_srcdir)/omd/packages/asio
+PACKAGE_ASIO := $(abs_top_srcdir)/third_party/asio
 ASIO_VERSION := asio-1.24.0-patched
 ASIO_INCLUDE := $(INCLUDES_DIR)/asio
 

diff --git a/omd/Licenses.csv b/omd/Licenses.csv
@@ -1,5 +1,5 @@
 Name,Version,License,Link License Text,Repository path,Comment,,,
-asio,1.18.2,BSL-1.0,https://opensource.org/licenses/BSL-1.0,omd/packages/asio/asio-asio-1.24.0-patched.tar.gz,,,,
+asio,1.18.2,BSL-1.0,https://opensource.org/licenses/BSL-1.0,third_party/asio/asio-asio-1.24.0-patched.tar.gz,,,,
 cpp-httplib,0.11.3,MIT,https://opensource.org/licenses/MIT,omd/packages/httplib/cpp-httplib-0.11.3.tar.gz
 fmt-master,7.0.3,MIT,https://opensource.org/licenses/MIT,omd/packages/fmt/fmt-master-7.0.3.tar.gz,,,,
 FreeTDS,0.95.95,GPL-2.0,https://opensource.org/licenses/GPL-2.0,omd/packages/freetds/freetds-0.95.95.tar.gz,,,,

diff --git a/packages/livestatus/src/CMakeLists.txt b/packages/livestatus/src/CMakeLists.txt
@@ -107,7 +107,7 @@ endif()
 
 FetchContent_Declare(
   asio-omd
-  URL ${root_repo_dir}/omd/packages/asio/asio-1.24.0-patched.tar.gz
+  URL ${root_repo_dir}/third_party/asio/asio-1.24.0-patched.tar.gz
   URL_HASH
     SHA256=09b9fe5c670c7bd47c7ee957cd9c184b4c8f0620d5b08b38ce837a24df971bca
   DOWNLOAD_EXTRACT_TIMESTAMP no)

diff --git a/omd/packages/asio/asio-1.24.0-patched.tar.gz → third_party/asio/asio-1.24.0-patched.tar.gz b/omd/packages/asio/asio-1.24.0-patched.tar.gz → third_party/asio/asio-1.24.0-patched.tar.gz
diff --git a/omd/packages/asio/asio.diff → third_party/asio/asio.diff b/omd/packages/asio/asio.diff → third_party/asio/asio.diff
diff --git a/omd/packages/asio/create-archive → third_party/asio/create-archive b/omd/packages/asio/create-archive → third_party/asio/create-archive
@@ -5,13 +5,13 @@ VERSION=1.24.0
 
 rm -rf asio-${VERSION}.tar.gz asio-${VERSION} asio-${VERSION}-patched
 curl --silent \
-     --show-error \
-     --fail \
-     --location \
-     -o asio-${VERSION}.tar.gz \
-     "https://downloads.sourceforge.net/project/asio/asio/${VERSION}%20%28Stable%29/asio-${VERSION}.tar.gz"
+    --show-error \
+    --fail \
+    --location \
+    -o asio-${VERSION}.tar.gz \
+    "https://downloads.sourceforge.net/project/asio/asio/${VERSION}%20%28Stable%29/asio-${VERSION}.tar.gz"
 tar xzf asio-${VERSION}.tar.gz
-patch -p0 < asio.diff
+patch -p0 <asio.diff
 mv asio-${VERSION} asio-${VERSION}-patched
 GZIP=-9 tar czf asio-${VERSION}-patched.tar.gz asio-${VERSION}-patched
 rm -rf asio-${VERSION}.tar.gz asio-${VERSION} asio-${VERSION}-patched