Merge pull request #518 from bratpiorka/rrudnick_ubuntu_20

test and fix UMF simplest build

Author: ldorau

.github/workflows/pr_push.yml

@@ -21,23 +21,33 @@ jobs:
           - os: windows-latest
             disjoint: 'OFF'
             build_tests: 'ON'
+            simple_cmake: 'OFF'
           # pure C build (Windows)
           - os: windows-latest
             disjoint: 'OFF'
             # Tests' building is off for a pure C build
             build_tests: 'OFF'
+            simple_cmake: 'OFF'
           - os: ubuntu-latest
             disjoint: 'ON'
             build_tests: 'ON'
             # Windows doesn't recognize 'CMAKE_BUILD_TYPE', it uses '--config' param in build command
             extra_build_options: '-DCMAKE_BUILD_TYPE=Release -DUMF_BUILD_BENCHMARKS=ON -DUMF_BUILD_BENCHMARKS_MT=ON'
+            simple_cmake: 'OFF'
           # pure C build (Linux)
           - os: ubuntu-latest
             disjoint: 'OFF'
             # Windows doesn't recognize 'CMAKE_BUILD_TYPE', it uses '--config' param in build command
             # Tests' building is off for a pure C build
             build_tests: 'OFF'
             extra_build_options: '-DCMAKE_BUILD_TYPE=Release -DUMF_BUILD_BENCHMARKS=ON'
+            simple_cmake: 'OFF'
+          # simplest CMake
+          - os: ubuntu-latest
+            disjoint: 'OFF'
+            build_tests: 'ON'
+            extra_build_options: '-DCMAKE_BUILD_TYPE=Release'
+            simple_cmake: 'ON'
     runs-on: ${{matrix.os}}
 
     steps:
@@ -68,6 +78,7 @@ jobs:
       run: sudo bash -c "echo 0 > /proc/sys/kernel/yama/ptrace_scope"
 
     - name: Configure CMake
+      if: matrix.simple_cmake == 'OFF'
       run: >
         cmake
         -B ${{github.workspace}}/build
@@ -83,6 +94,16 @@ jobs:
         -DUMF_TESTS_FAIL_ON_SKIP=ON
         ${{matrix.extra_build_options}}
 
+    - name: Configure CMake (simple)
+      if: matrix.simple_cmake == 'ON'
+      run: >
+        cmake
+        -B ${{github.workspace}}/build
+        -DUMF_BUILD_LIBUMF_POOL_SCALABLE=ON
+        -DUMF_BUILD_SHARED_LIBRARY=ON
+        -DUMF_TESTS_FAIL_ON_SKIP=ON
+        ${{matrix.extra_build_options}}
+
     - name: Build
       run: cmake --build ${{github.workspace}}/build --config Release -j
 

include/umf/proxy_lib_new_delete.h

@@ -68,8 +68,8 @@ static inline void *internal_aligned_alloc(size_t alignment, size_t size) {
 #define decl_new_nothrow(n) [[nodiscard]]
 #endif // defined(_MSC_VER) && defined(_Ret_notnull_) && defined(_Post_writable_byte_size_)
 
-void operator delete(void *p) noexcept { free(p); };
-void operator delete[](void *p) noexcept { free(p); };
+void operator delete(void *p) noexcept { free(p); }
+void operator delete[](void *p) noexcept { free(p); }
 
 void operator delete(void *p, const std::nothrow_t &) noexcept { free(p); }
 void operator delete[](void *p, const std::nothrow_t &) noexcept { free(p); }
@@ -96,11 +96,11 @@ decl_new_nothrow(n) void *operator new[](std::size_t n,
 void operator delete(void *p, std::size_t n) noexcept {
     (void)(n);
     free(p);
-};
+}
 void operator delete[](void *p, std::size_t n) noexcept {
     (void)(n);
     free(p);
-};
+}
 #endif // (__cplusplus >= 201402L || _MSC_VER >= 1916)
 
 #if (__cplusplus > 201402L || defined(__cpp_aligned_new))
@@ -116,12 +116,12 @@ void operator delete(void *p, std::size_t n, std::align_val_t al) noexcept {
     (void)(n);
     (void)(al);
     free(p);
-};
+}
 void operator delete[](void *p, std::size_t n, std::align_val_t al) noexcept {
     (void)(n);
     (void)(al);
     free(p);
-};
+}
 void operator delete(void *p, std::align_val_t al,
                      const std::nothrow_t &) noexcept {
     (void)(al);

src/utils/CMakeLists.txt

@@ -32,6 +32,7 @@ endif()
 if(LINUX OR MACOSX)
     set(UMF_UTILS_SOURCES ${UMF_UTILS_SOURCES_COMMON}
                           ${UMF_UTILS_SOURCES_POSIX})
+    set(UMF_UTILS_LIBS dl)
 elseif(WINDOWS)
     set(UMF_UTILS_SOURCES ${UMF_UTILS_SOURCES_COMMON}
                           ${UMF_UTILS_SOURCES_WINDOWS})
@@ -41,7 +42,8 @@ add_library(umf_utils INTERFACE)
 add_library(${PROJECT_NAME}::utils ALIAS umf_utils)
 
 target_sources(umf_utils INTERFACE ${UMF_UTILS_SOURCES})
-target_link_libraries(umf_utils INTERFACE ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries(umf_utils INTERFACE ${CMAKE_THREAD_LIBS_INIT}
+                                          ${UMF_UTILS_LIBS})
 
 target_include_directories(
     umf_utils