diff --git a/apk/APKBUILD b/apk/APKBUILD index b6dd5b32e36f7ff0f868fadc1c7c66b85bd86d41..8a020c54b4116496025424c0466a5f8a80e367f5 100644 --- a/apk/APKBUILD +++ b/apk/APKBUILD @@ -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" diff --git a/changelogs/unreleased/gh-7689-remove-dependencies-on-libgomp.md b/changelogs/unreleased/gh-7689-remove-dependencies-on-libgomp.md new file mode 100644 index 0000000000000000000000000000000000000000..3e80233fe03f81edb07b9f863436daf408203c36 --- /dev/null +++ b/changelogs/unreleased/gh-7689-remove-dependencies-on-libgomp.md @@ -0,0 +1,3 @@ +## feature/build + +* Tarantool does not depend on libgomp anymore (gh-7689). diff --git a/cmake/BuildMisc.cmake b/cmake/BuildMisc.cmake index e6905204dec2099035703252ebf39cbdf3f97512..e2e921c9ffa2486057e4f690da8e92f239c551cb 100644 --- a/cmake/BuildMisc.cmake +++ b/cmake/BuildMisc.cmake @@ -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) diff --git a/debian/control b/debian/control index cad7071a36f470edd7509494dbd66b7f1266747d..06d8330f1afe9795438ceff673d6a947ab869d79 100644 --- a/debian/control +++ b/debian/control @@ -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