Skip to content
Snippets Groups Projects
Commit bb7c1620 authored by Ilya Verbin's avatar Ilya Verbin Committed by Vladimir Davydov
Browse files

build: remove dependencies on libgomp

OpenMP is no longer used since commit 4f617b70 ("box: introduce
memtx_sort_threads config parameter"). All dependencies on libgomp
should be removed.

Follow-up #7689

NO_DOC=build
NO_TEST=build
parent 00ac6425
No related branches found
No related tags found
No related merge requests found
......@@ -8,7 +8,7 @@ arch="all"
source=""
giturl="https://github.com/tarantool/tarantool.git"
url="https://github.com/tarantool/tarantool"
depends="g++ libstdc++ readline openssl yaml lz4 binutils ncurses libgomp lua tar zip zlib libunwind icu ca-certificates"
depends="g++ libstdc++ readline openssl yaml lz4 binutils ncurses lua tar zip zlib libunwind icu ca-certificates"
makedepends="gcc cmake file readline-dev openssl-dev yaml-dev bsd-compat-headers lz4-dev zlib-dev binutils-dev ncurses-dev lua-dev musl-dev make git libunwind-dev autoconf automake libtool linux-headers icu-dev"
subpackages="$pkgname-dev $pkgname-dbg $pkgname-doc"
......
## feature/build
* Tarantool does not depend on libgomp anymore (gh-7689).
......@@ -28,14 +28,5 @@ macro(libmisc_build)
add_library(misc STATIC ${misc_src})
set_target_properties(misc PROPERTIES COMPILE_FLAGS "${DEPENDENCY_CFLAGS}")
if (HAVE_OPENMP)
if(BUILD_STATIC)
set(GOMP_LIBRARY libgomp.a)
else()
set(GOMP_LIBRARY gomp)
endif()
target_link_libraries(misc ${GOMP_LIBRARY} pthread ${CMAKE_DL_LIBS})
endif()
unset(misc_src)
endmacro(libmisc_build)
......@@ -72,7 +72,7 @@ Description: Tarantool in-memory database - common files
Package: tarantool
Architecture: i386 amd64 armhf arm64
Priority: optional
Depends: ${shlibs:Depends}, ${misc:Depends}, netbase, libgomp1,
Depends: ${shlibs:Depends}, ${misc:Depends}, netbase,
openssl, tarantool-common (>= 2.2.1), tzdata,
# libcurl dependencies (except ones we have already)
zlib1g
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment