mirror of
https://github.com/neovim/neovim.git
synced 2025-02-25 18:55:25 -06:00
fix(ci): adjust DEPS_INSTALL_DIR on OpenBSD to avoid pkg-config bug (#14803)
Also bumps to OpenBSD 6.9 and updates packages. Co-authored-by: glacambre <code@lacamb.re>
This commit is contained in:
parent
141647cfbb
commit
e2bc0bf665
@ -1,17 +1,17 @@
|
|||||||
# sourcehut CI: https://builds.sr.ht/~jmk/neovim
|
# sourcehut CI: https://builds.sr.ht/~jmk/neovim
|
||||||
|
|
||||||
image: openbsd/6.7
|
image: openbsd/6.9
|
||||||
|
|
||||||
packages:
|
packages:
|
||||||
- autoconf-2.69p2
|
- autoconf-2.71
|
||||||
- automake-1.15.1
|
- automake-1.16.3
|
||||||
- cmake
|
- cmake
|
||||||
- gettext-runtime-0.20.1p1
|
- gettext-runtime-0.21p1
|
||||||
- gettext-tools-0.20.1p3
|
- gettext-tools-0.21p1
|
||||||
- gmake
|
- gmake
|
||||||
- libtool
|
- libtool
|
||||||
- ninja-1.10.0
|
- ninja-1.10.2p0
|
||||||
- unzip-6.0p13
|
- unzip-6.0p14
|
||||||
|
|
||||||
sources:
|
sources:
|
||||||
- https://github.com/neovim/neovim
|
- https://github.com/neovim/neovim
|
||||||
@ -23,8 +23,8 @@ environment:
|
|||||||
|
|
||||||
tasks:
|
tasks:
|
||||||
- build-deps: |
|
- build-deps: |
|
||||||
export AUTOCONF_VERSION=2.69
|
export AUTOCONF_VERSION=2.71
|
||||||
export AUTOMAKE_VERSION=1.15
|
export AUTOMAKE_VERSION=1.16
|
||||||
mkdir neovim/.deps
|
mkdir neovim/.deps
|
||||||
cd neovim/.deps
|
cd neovim/.deps
|
||||||
cmake -G Ninja ../third-party/
|
cmake -G Ninja ../third-party/
|
||||||
|
@ -23,9 +23,23 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
|
|||||||
|
|
||||||
# Prefer our bundled versions of dependencies.
|
# Prefer our bundled versions of dependencies.
|
||||||
if(DEFINED ENV{DEPS_BUILD_DIR})
|
if(DEFINED ENV{DEPS_BUILD_DIR})
|
||||||
|
if(CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
|
||||||
|
# pkg-config 29.2 has a bug on OpenBSD which causes it to drop any paths that
|
||||||
|
# *contain* system include paths. To avoid this, we prefix what would be
|
||||||
|
# "/usr/include" as "/_usr/include".
|
||||||
|
# This check is also performed in the third-party/CMakeLists.txt and in the
|
||||||
|
# else clause following here.
|
||||||
|
# https://github.com/neovim/neovim/pull/14745#issuecomment-860201794
|
||||||
|
set(DEPS_PREFIX "$ENV{DEPS_BUILD_DIR}/_usr" CACHE PATH "Path prefix for finding dependencies")
|
||||||
|
else()
|
||||||
set(DEPS_PREFIX "$ENV{DEPS_BUILD_DIR}/usr" CACHE PATH "Path prefix for finding dependencies")
|
set(DEPS_PREFIX "$ENV{DEPS_BUILD_DIR}/usr" CACHE PATH "Path prefix for finding dependencies")
|
||||||
|
endif()
|
||||||
|
else()
|
||||||
|
if(CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
|
||||||
|
set(DEPS_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/.deps/_usr" CACHE PATH "Path prefix for finding dependencies")
|
||||||
else()
|
else()
|
||||||
set(DEPS_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/.deps/usr" CACHE PATH "Path prefix for finding dependencies")
|
set(DEPS_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/.deps/usr" CACHE PATH "Path prefix for finding dependencies")
|
||||||
|
endif()
|
||||||
# When running from within CLion or Visual Studio,
|
# When running from within CLion or Visual Studio,
|
||||||
# build bundled dependencies automatically.
|
# build bundled dependencies automatically.
|
||||||
if(NOT EXISTS ${DEPS_PREFIX}
|
if(NOT EXISTS ${DEPS_PREFIX}
|
||||||
|
10
third-party/CMakeLists.txt
vendored
10
third-party/CMakeLists.txt
vendored
@ -21,7 +21,17 @@ if(HAS_OG_FLAG)
|
|||||||
set(DEFAULT_MAKE_CFLAGS CFLAGS+=-Og ${DEFAULT_MAKE_CFLAGS})
|
set(DEFAULT_MAKE_CFLAGS CFLAGS+=-Og ${DEFAULT_MAKE_CFLAGS})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if(CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
|
||||||
|
# pkg-config 29.2 has a bug on OpenBSD which causes it to drop any paths that
|
||||||
|
# *contain* system include paths. To avoid this, we prefix what would be
|
||||||
|
# "/usr/include" as "/_usr/include".
|
||||||
|
# This check is also performed in the root CMakeLists.txt
|
||||||
|
# https://github.com/neovim/neovim/pull/14745#issuecomment-860201794
|
||||||
|
set(DEPS_INSTALL_DIR "${CMAKE_BINARY_DIR}/_usr" CACHE PATH "Dependencies install directory.")
|
||||||
|
else()
|
||||||
set(DEPS_INSTALL_DIR "${CMAKE_BINARY_DIR}/usr" CACHE PATH "Dependencies install directory.")
|
set(DEPS_INSTALL_DIR "${CMAKE_BINARY_DIR}/usr" CACHE PATH "Dependencies install directory.")
|
||||||
|
endif()
|
||||||
|
|
||||||
set(DEPS_BIN_DIR "${DEPS_INSTALL_DIR}/bin" CACHE PATH "Dependencies binary install directory.")
|
set(DEPS_BIN_DIR "${DEPS_INSTALL_DIR}/bin" CACHE PATH "Dependencies binary install directory.")
|
||||||
set(DEPS_LIB_DIR "${DEPS_INSTALL_DIR}/lib" CACHE PATH "Dependencies library install directory.")
|
set(DEPS_LIB_DIR "${DEPS_INSTALL_DIR}/lib" CACHE PATH "Dependencies library install directory.")
|
||||||
set(DEPS_BUILD_DIR "${CMAKE_BINARY_DIR}/build" CACHE PATH "Dependencies build directory.")
|
set(DEPS_BUILD_DIR "${CMAKE_BINARY_DIR}/build" CACHE PATH "Dependencies build directory.")
|
||||||
|
Loading…
Reference in New Issue
Block a user