Skip to content

Commit

Permalink
build: remove dependencies on libgomp
Browse files Browse the repository at this point in the history
OpenMP is no longer used since commit 4f617b7 ("box: introduce
memtx_sort_threads config parameter"). All dependencies on libgomp
should be removed.

Follow-up #7689

NO_DOC=build
NO_TEST=build
  • Loading branch information
Gumix authored and locker committed Jun 20, 2023
1 parent 00ac642 commit bb7c162
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 11 deletions.
2 changes: 1 addition & 1 deletion apk/APKBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
## feature/build

* Tarantool does not depend on libgomp anymore (gh-7689).
9 changes: 0 additions & 9 deletions cmake/BuildMisc.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit bb7c162

Please sign in to comment.