aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt3
-rw-r--r--config/CMakeLists.txt1
-rw-r--r--configdefinitions/CMakeLists.txt1
-rw-r--r--configutil/CMakeLists.txt1
-rw-r--r--document/CMakeLists.txt1
-rw-r--r--documentapi/CMakeLists.txt1
-rw-r--r--fastos/.gitignore11
-rw-r--r--fastos/CMakeLists.txt7
-rw-r--r--fastos/OWNERS2
-rw-r--r--fastos/README4
-rw-r--r--fastos/src/.gitignore3
-rw-r--r--fastos/src/vespa/fastos/.gitignore28
-rw-r--r--fastos/src/vespa/fastos/CMakeLists.txt15
-rw-r--r--fbench/CMakeLists.txt1
-rw-r--r--fbench/src/httpclient/CMakeLists.txt1
-rw-r--r--fbench/src/test/CMakeLists.txt1
-rw-r--r--fileacquirer/CMakeLists.txt1
-rw-r--r--jrt_test/CMakeLists.txt1
-rw-r--r--logd/CMakeLists.txt1
-rw-r--r--lowercasing_test/CMakeLists.txt1
-rw-r--r--metrics/CMakeLists.txt1
-rw-r--r--persistence/CMakeLists.txt1
-rw-r--r--searchcore/CMakeLists.txt1
-rw-r--r--searchlib/CMakeLists.txt1
-rw-r--r--storage/CMakeLists.txt1
-rw-r--r--storageserver/CMakeLists.txt1
-rw-r--r--streamingvisitors/CMakeLists.txt1
-rw-r--r--vbench/CMakeLists.txt1
-rw-r--r--vdslib/CMakeLists.txt1
-rw-r--r--vdstestlib/CMakeLists.txt1
-rw-r--r--vespaclient/CMakeLists.txt1
-rw-r--r--vespalib/CMakeLists.txt1
-rw-r--r--vespalog/src/test/threads/CMakeLists.txt1
-rw-r--r--vespalog/src/vespa/log/CMakeLists.txt1
-rw-r--r--vespamalloc/src/tests/test1/CMakeLists.txt3
35 files changed, 6 insertions, 96 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5463c4215a0..ce11196725f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,6 +28,8 @@ vespa_use_default_cmake_prefix_path()
SET(CMAKE_FIND_PACKAGE_SORT_ORDER NATURAL)
SET(CMAKE_FIND_PACKAGE_SORT_DIRECTION DEC)
+find_package(Threads REQUIRED)
+
find_package(LLVM REQUIRED CONFIG)
message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
@@ -99,7 +101,6 @@ add_subdirectory(docprocs)
add_subdirectory(document)
add_subdirectory(documentapi)
add_subdirectory(eval)
-add_subdirectory(fastos)
add_subdirectory(fbench)
add_subdirectory(fileacquirer)
add_subdirectory(filedistribution)
diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
index 1c04aa3eaa8..561ddbc078c 100644
--- a/config/CMakeLists.txt
+++ b/config/CMakeLists.txt
@@ -1,7 +1,6 @@
# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
vespa_define_module(
DEPENDS
- fastos
vespalib
vespalog
fnet
diff --git a/configdefinitions/CMakeLists.txt b/configdefinitions/CMakeLists.txt
index c374e93904e..80b53d1dc0a 100644
--- a/configdefinitions/CMakeLists.txt
+++ b/configdefinitions/CMakeLists.txt
@@ -1,7 +1,6 @@
# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
vespa_define_module(
DEPENDS
- fastos
vespalib
config_cloudconfig
diff --git a/configutil/CMakeLists.txt b/configutil/CMakeLists.txt
index 4ec9ad13648..a1d699ae009 100644
--- a/configutil/CMakeLists.txt
+++ b/configutil/CMakeLists.txt
@@ -2,7 +2,6 @@
vespa_define_module(
DEPENDS
vespadefaults
- fastos
config_cloudconfig
vbench
vespalib
diff --git a/document/CMakeLists.txt b/document/CMakeLists.txt
index 88dbe2816d9..e1e4d8ff5cc 100644
--- a/document/CMakeLists.txt
+++ b/document/CMakeLists.txt
@@ -1,7 +1,6 @@
# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
vespa_define_module(
DEPENDS
- fastos
vespalog
vespalib
config_cloudconfig
diff --git a/documentapi/CMakeLists.txt b/documentapi/CMakeLists.txt
index 9261bcf9114..beeda4afeb4 100644
--- a/documentapi/CMakeLists.txt
+++ b/documentapi/CMakeLists.txt
@@ -1,7 +1,6 @@
# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
vespa_define_module(
DEPENDS
- fastos
vespalog
config_cloudconfig
vespalib
diff --git a/fastos/.gitignore b/fastos/.gitignore
deleted file mode 100644
index 54e2680a6d8..00000000000
--- a/fastos/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-*.ilk
-*.pdb
-.Build_completed
-.Dist_completed
-.Install_completed
-.PreBuild_completed
-bin
-include
-lib
-update.log
-Makefile
diff --git a/fastos/CMakeLists.txt b/fastos/CMakeLists.txt
deleted file mode 100644
index 60813c569e4..00000000000
--- a/fastos/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_define_module(
- LIBS
- src/vespa/fastos
-
- TESTS
-)
diff --git a/fastos/OWNERS b/fastos/OWNERS
deleted file mode 100644
index 912f61c59b8..00000000000
--- a/fastos/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-baldersheim
-arnej27959
diff --git a/fastos/README b/fastos/README
deleted file mode 100644
index ed9afabffb8..00000000000
--- a/fastos/README
+++ /dev/null
@@ -1,4 +0,0 @@
-Old OS abstraction layer
-
-obsolete, to be replaced with implementations using
-standard C++14 threads and newer unix networking APIs
diff --git a/fastos/src/.gitignore b/fastos/src/.gitignore
deleted file mode 100644
index 2e8e6fd906a..00000000000
--- a/fastos/src/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/Makefile.ini
-/config_command.sh
-/project.dsw
diff --git a/fastos/src/vespa/fastos/.gitignore b/fastos/src/vespa/fastos/.gitignore
deleted file mode 100644
index 004799df5b4..00000000000
--- a/fastos/src/vespa/fastos/.gitignore
+++ /dev/null
@@ -1,28 +0,0 @@
-*.So
-*.core
-*.exe
-*.ilk
-*.pdb
-.depend
-.depend.NEW
-Debug
-Makefile
-Makefile.factory
-Makefile.overrides
-Makefile.pre
-Release
-autoconf.h
-config_command.bat
-config_command.sh
-fastconfig
-fastconfig.exe
-fastos.lib
-fastosconfig.h
-libfastos.a
-makefeatures
-makemake
-processtest.log
-test.txt
-vc60.idb
-vc60.pdb
-/libfastos.so.5.1
diff --git a/fastos/src/vespa/fastos/CMakeLists.txt b/fastos/src/vespa/fastos/CMakeLists.txt
deleted file mode 100644
index 29810a4f296..00000000000
--- a/fastos/src/vespa/fastos/CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_library(fastos_objects OBJECT
- SOURCES
-)
-
-vespa_add_library(fastos
- SOURCES
- $<TARGET_OBJECTS:fastos_objects>
- INSTALL lib64
- DEPENDS
- ${CMAKE_DL_LIBS}
-)
-
-find_package(Threads REQUIRED)
-target_link_libraries(fastos PUBLIC ${CMAKE_THREAD_LIBS_INIT})
diff --git a/fbench/CMakeLists.txt b/fbench/CMakeLists.txt
index ff287d221ec..3f1d78a66a0 100644
--- a/fbench/CMakeLists.txt
+++ b/fbench/CMakeLists.txt
@@ -1,7 +1,6 @@
# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
vespa_define_module(
DEPENDS
- fastos
vespalib
APPS
diff --git a/fbench/src/httpclient/CMakeLists.txt b/fbench/src/httpclient/CMakeLists.txt
index 163a68f9c98..2d5e3b32437 100644
--- a/fbench/src/httpclient/CMakeLists.txt
+++ b/fbench/src/httpclient/CMakeLists.txt
@@ -4,5 +4,4 @@ vespa_add_library(fbench_httpclient STATIC
httpclient.cpp
DEPENDS
fbench_util
- fastos
)
diff --git a/fbench/src/test/CMakeLists.txt b/fbench/src/test/CMakeLists.txt
index d13b6b82a81..c81d818ed06 100644
--- a/fbench/src/test/CMakeLists.txt
+++ b/fbench/src/test/CMakeLists.txt
@@ -26,6 +26,5 @@ vespa_add_executable(fbench_clientstatus_app TEST
clientstatus.cpp
DEPENDS
fbench_util
- fastos
)
vespa_add_test(NAME fbench_clientstatus_app COMMAND fbench_clientstatus_app)
diff --git a/fileacquirer/CMakeLists.txt b/fileacquirer/CMakeLists.txt
index 13150f58ba3..cc18dc2bd84 100644
--- a/fileacquirer/CMakeLists.txt
+++ b/fileacquirer/CMakeLists.txt
@@ -1,7 +1,6 @@
# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
vespa_define_module(
DEPENDS
- fastos
vespalog
vespalib
config_cloudconfig
diff --git a/jrt_test/CMakeLists.txt b/jrt_test/CMakeLists.txt
index ea8c8b94faa..a678cbf112a 100644
--- a/jrt_test/CMakeLists.txt
+++ b/jrt_test/CMakeLists.txt
@@ -1,7 +1,6 @@
# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
vespa_define_module(
DEPENDS
- fastos
vespalog
vespalib
fnet
diff --git a/logd/CMakeLists.txt b/logd/CMakeLists.txt
index d02b99a393a..5823ebf54a7 100644
--- a/logd/CMakeLists.txt
+++ b/logd/CMakeLists.txt
@@ -1,7 +1,6 @@
# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
vespa_define_module(
DEPENDS
- fastos
vespalog
vespalib
config_cloudconfig
diff --git a/lowercasing_test/CMakeLists.txt b/lowercasing_test/CMakeLists.txt
index b08a6ef350d..119209d4227 100644
--- a/lowercasing_test/CMakeLists.txt
+++ b/lowercasing_test/CMakeLists.txt
@@ -1,7 +1,6 @@
# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
vespa_define_module(
DEPENDS
- fastos
vespalog
vespalib
searchlib
diff --git a/metrics/CMakeLists.txt b/metrics/CMakeLists.txt
index d75c17d4a00..5b95d8635d4 100644
--- a/metrics/CMakeLists.txt
+++ b/metrics/CMakeLists.txt
@@ -1,7 +1,6 @@
# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
vespa_define_module(
DEPENDS
- fastos
vespalog
vespalib
config_cloudconfig
diff --git a/persistence/CMakeLists.txt b/persistence/CMakeLists.txt
index d87f172bfb5..072e273338b 100644
--- a/persistence/CMakeLists.txt
+++ b/persistence/CMakeLists.txt
@@ -1,7 +1,6 @@
# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
vespa_define_module(
DEPENDS
- fastos
vespalog
vespalib
document
diff --git a/searchcore/CMakeLists.txt b/searchcore/CMakeLists.txt
index d6c353e46c9..131460b0384 100644
--- a/searchcore/CMakeLists.txt
+++ b/searchcore/CMakeLists.txt
@@ -1,7 +1,6 @@
# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
vespa_define_module(
DEPENDS
- fastos
fnet
vespalog
vespalib
diff --git a/searchlib/CMakeLists.txt b/searchlib/CMakeLists.txt
index 4ccab1a9380..44051a96578 100644
--- a/searchlib/CMakeLists.txt
+++ b/searchlib/CMakeLists.txt
@@ -1,7 +1,6 @@
# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
vespa_define_module(
DEPENDS
- fastos
vespalog
vespalib
vespaeval
diff --git a/storage/CMakeLists.txt b/storage/CMakeLists.txt
index 4b7c12b0f31..1062a89f055 100644
--- a/storage/CMakeLists.txt
+++ b/storage/CMakeLists.txt
@@ -2,7 +2,6 @@
vespa_define_module(
DEPENDS
vespadefaults
- fastos
metrics
config_cloudconfig
configdefinitions
diff --git a/storageserver/CMakeLists.txt b/storageserver/CMakeLists.txt
index ee3335c4921..a2f9d0b776e 100644
--- a/storageserver/CMakeLists.txt
+++ b/storageserver/CMakeLists.txt
@@ -1,7 +1,6 @@
# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
vespa_define_module(
DEPENDS
- fastos
storage
streamingvisitors
diff --git a/streamingvisitors/CMakeLists.txt b/streamingvisitors/CMakeLists.txt
index 2c7f01ddf37..fede7087d8d 100644
--- a/streamingvisitors/CMakeLists.txt
+++ b/streamingvisitors/CMakeLists.txt
@@ -1,7 +1,6 @@
# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
vespa_define_module(
DEPENDS
- fastos
vespalog
storage
config_cloudconfig
diff --git a/vbench/CMakeLists.txt b/vbench/CMakeLists.txt
index 3fb5df8cd20..e78913262be 100644
--- a/vbench/CMakeLists.txt
+++ b/vbench/CMakeLists.txt
@@ -1,7 +1,6 @@
# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
vespa_define_module(
DEPENDS
- fastos
vespalib
LIBS
diff --git a/vdslib/CMakeLists.txt b/vdslib/CMakeLists.txt
index 0f8144b99e9..1276323f83b 100644
--- a/vdslib/CMakeLists.txt
+++ b/vdslib/CMakeLists.txt
@@ -1,7 +1,6 @@
# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
vespa_define_module(
DEPENDS
- fastos
vespalog
vespalib
config_cloudconfig
diff --git a/vdstestlib/CMakeLists.txt b/vdstestlib/CMakeLists.txt
index d0a921672c2..7f478989332 100644
--- a/vdstestlib/CMakeLists.txt
+++ b/vdstestlib/CMakeLists.txt
@@ -1,7 +1,6 @@
# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
vespa_define_module(
DEPENDS
- fastos
vespalib
TESTS
diff --git a/vespaclient/CMakeLists.txt b/vespaclient/CMakeLists.txt
index 912b35fa763..6e82b83517e 100644
--- a/vespaclient/CMakeLists.txt
+++ b/vespaclient/CMakeLists.txt
@@ -2,7 +2,6 @@
vespa_define_module(
DEPENDS
vespadefaults
- fastos
configdefinitions
config_cloudconfig
vespalog
diff --git a/vespalib/CMakeLists.txt b/vespalib/CMakeLists.txt
index 8f1b687449a..8175e75875a 100644
--- a/vespalib/CMakeLists.txt
+++ b/vespalib/CMakeLists.txt
@@ -6,7 +6,6 @@ endif()
vespa_define_module(
DEPENDS
- fastos
vespalog
EXTERNAL_DEPENDS
diff --git a/vespalog/src/test/threads/CMakeLists.txt b/vespalog/src/test/threads/CMakeLists.txt
index 00de16ff005..19fe2511025 100644
--- a/vespalog/src/test/threads/CMakeLists.txt
+++ b/vespalog/src/test/threads/CMakeLists.txt
@@ -4,6 +4,5 @@ vespa_add_executable(vespalog_threads_test_app TEST
testthreads.cpp
DEPENDS
vespalog
- fastos
)
vespa_add_test(NAME vespalog_threads_test_app COMMAND vespalog_threads_test_app vespa.log ENVIRONMENT "VESPA_LOG_TARGET=file:vespa.log")
diff --git a/vespalog/src/vespa/log/CMakeLists.txt b/vespalog/src/vespa/log/CMakeLists.txt
index dbeba17334b..82536b1f4e9 100644
--- a/vespalog/src/vespa/log/CMakeLists.txt
+++ b/vespalog/src/vespa/log/CMakeLists.txt
@@ -18,3 +18,4 @@ vespa_add_library(vespalog
reject-filter.cpp
INSTALL lib64
)
+target_link_libraries(vespalog PUBLIC ${CMAKE_THREAD_LIBS_INIT})
diff --git a/vespamalloc/src/tests/test1/CMakeLists.txt b/vespamalloc/src/tests/test1/CMakeLists.txt
index dd7c92a4dac..f3ce9f70f45 100644
--- a/vespamalloc/src/tests/test1/CMakeLists.txt
+++ b/vespamalloc/src/tests/test1/CMakeLists.txt
@@ -8,12 +8,15 @@ vespa_add_executable(vespamalloc_testatomic_app TEST
vespamalloc_util
EXTERNAL_DEPENDS
${VESPA_ATOMIC_LIB}
+ dl
)
vespa_add_test(NAME vespamalloc_testatomic_app NO_VALGRIND COMMAND vespamalloc_testatomic_app)
vespa_add_executable(vespamalloc_new_test_app TEST
SOURCES
new_test.cpp
+ EXTERNAL_DEPENDS
+ dl
)
vespa_add_test(NAME vespamalloc_new_test_app NO_VALGRIND COMMAND vespamalloc_new_test_app)