[bot-automerge] nvim v0.10.0 (#14)

* updated v0.10.0 * MNT: Re-rendered with conda-build 24.5.0, conda-smithy 3.35.1, and conda-forge-pinning 2024.05.16.16.45.08 * MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and conda-forge-pinning 2024.06.19.13.02.02 * specify path to liblpeg * rerender feedstock * fix cross compilation --------- Co-authored-by: conda-forge-webservices[bot] <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Co-authored-by: danielnachun <[email protected]>
conda-forge · Jun 20, 2024 · f789775 · f789775
1 parent fbdf06a
commit f789775
Show file tree

Hide file tree

Showing 13 changed files with 118 additions and 30 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml
@@ -2,6 +2,10 @@ c_compiler:
 - gcc
 c_compiler_version:
 - '12'
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.12'
 cdt_name:
 - cos6
 channel_sources:
@@ -14,3 +18,6 @@ msgpack_c:
 - '6'
 target_platform:
 - linux-64
+zip_keys:
+- - c_stdlib_version
+  - cdt_name
diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml
@@ -1,9 +1,15 @@
 MACOSX_DEPLOYMENT_TARGET:
-- '10.9'
+- '10.13'
+MACOSX_SDK_VERSION:
+- '10.13'
 c_compiler:
 - clang
 c_compiler_version:
 - '16'
+c_stdlib:
+- macosx_deployment_target
+c_stdlib_version:
+- '10.13'
 channel_sources:
 - conda-forge
 channel_targets:

diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml
@@ -1,9 +1,15 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '11.0'
+MACOSX_SDK_VERSION:
+- '11.0'
 c_compiler:
 - clang
 c_compiler_version:
 - '16'
+c_stdlib:
+- macosx_deployment_target
+c_stdlib_version:
+- '11.0'
 channel_sources:
 - conda-forge
 channel_targets:

diff --git a/.gitattributes b/.gitattributes
diff --git a/.gitignore b/.gitignore
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/build-locally.py b/build-locally.py
diff --git a/recipe/build.sh b/recipe/build.sh
@@ -3,15 +3,48 @@
 set -o xtrace -o nounset -o pipefail -o errexit
 
 if [[ ${CONDA_BUILD_CROSS_COMPILATION:-0} == 1 ]]; then
-    sed -i -e "s,\$<TARGET_FILE:nvim>,${BUILD_PREFIX}/bin/nvim,g" src/nvim/po/CMakeLists.txt test/CMakeLists.txt
-    sed -i -e "s,\${PROJECT_BINARY_DIR}/bin/nvim,${BUILD_PREFIX}/bin/nvim,g" runtime/CMakeLists.txt
+    BOOTSTRAP_CMAKE_ARGS=${CMAKE_ARGS//${PREFIX}/${BUILD_PREFIX}}
+    BOOTSTRAP_CMAKE_ARGS=${BOOTSTRAP_CMAKE_ARGS//${CONDA_TOOLCHAIN_HOST}/${CONDA_TOOLCHAIN_BUILD}}
+
+    CROSS_LDFLAGS=${LDFLAGS}
+    CROSS_CC="${CC}"
+    CROSS_LD="${LD}"
+
+    LDFLAGS=${LDFLAGS//${PREFIX}/${BUILD_PREFIX}}
+    CC=${CC//${CONDA_TOOLCHAIN_HOST}/${CONDA_TOOLCHAIN_BUILD}}
+    LD="${LD//${CONDA_TOOLCHAIN_HOST}/${CONDA_TOOLCHAIN_BUILD}}"
+
+    cmake -S . -B build_host  \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DUSE_BUNDLED=OFF \
+        -DICONV_LIBRARY="${BUILD_PREFIX}/lib/libiconv${SHLIB_EXT}" \
+        -DLIBINTL_LIBRARY="${BUILD_PREFIX}/lib/libintl${SHLIB_EXT}" \
+        -DLIBUV_LIBRARY="${BUILD_PREFIX}/lib/libuv${SHLIB_EXT}" \
+        -DLIBVTERM_LIBRARY="${BUILD_PREFIX}/lib/libvterm${SHLIB_EXT}" \
+        -DLPEG_LIBRARY="${BUILD_PREFIX}/lib/liblpeg${SHLIB_EXT}" \
+        -DLUAJIT_LIBRARY="${BUILD_PREFIX}/lib/libluajit-5.1${SHLIB_EXT}" \
+        -DLUV_LIBRARY="${BUILD_PREFIX}/lib/libluv${SHLIB_EXT}" \
+        -DMSGPACK_LIBRARY="${BUILD_PREFIX}/lib/libmsgpack-c${SHLIB_EXT}" \
+        -DTREESITTER_LIBRARY="${BUILD_PREFIX}/lib/libtree-sitter${SHLIB_EXT}" \
+        -DUNIBILIUM_LIBRARY="${BUILD_PREFIX}/lib/libunibilium${SHLIB_EXT}" \
+        ${BOOTSTRAP_CMAKE_ARGS}
+    cmake --build build_host
+    cmake --install build_host
+
+    LDFLAGS="${CROSS_LDFLAGS}"
+    CC=${CROSS_CC}
+    LD=${CROSS_LD}
+
+    export LUA_CPATH="${SRC_DIR}/build_host/lib/libnlua0.so"
+
+    sed -i -e "s,\$<TARGET_FILE:nvim_bin>,${BUILD_PREFIX}/bin/nvim,g" src/nvim/po/CMakeLists.txt test/CMakeLists.txt runtime/CMakeLists.txt
 fi
 
 cmake -S . -B build \
     -DCMAKE_BUILD_TYPE=Release \
     -DUSE_BUNDLED=OFF \
-    -DLIBLUV_LIBRARY="${PREFIX}/lib/libluv${SHLIB_EXT}" \
     -DLIBUV_LIBRARY="${PREFIX}/lib/libuv${SHLIB_EXT}" \
+    -DLPEG_LIBRARY="${PREFIX}/lib/liblpeg${SHLIB_EXT}" \
     ${CMAKE_ARGS}
 cmake --build build
 cmake --install build
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,13 +1,13 @@
 {% set name = "nvim" %}
-{% set version = "0.9.5" %}
+{% set version = "0.10.0" %}
 
 package:
   name: {{ name|lower }}
   version: {{ version }}
 
 source:
   url: https://github.com/neovim/neovim/archive/v{{ version }}.tar.gz
-  sha256: fe74369fc30a32ec7a086b1013acd0eacd674e7570eb1acc520a66180c9e9719
+  sha256: 372ea2584b0ea2a5a765844d95206bda9e4a57eaa1a2412a9a0726bab750f828
 
 build:
   number: 0
@@ -16,38 +16,46 @@ build:
 requirements:
   build:
     - {{ compiler('c') }}
+    - {{ stdlib("c") }}
     - cmake
-    - libmpack-lua
-    - lua-lpeg
-    - luajit-openresty
     - make
-    - nvim  # [build_platform != target_platform]
     - pkg-config
+    - gettext  # [build_platform != target_platform]
+    - libiconv  # [osx]
+    - libmpack-lua  # [build_platform != target_platform]
+    - libtree-sitter  # [build_platform != target_platform]
+    - libuv  # [build_platform != target_platform]
+    - libvterm  # [build_platform != target_platform]
+    - lua-lpeg  # [build_platform != target_platform]
+    - luajit-openresty  # [build_platform != target_platform]
+    - luv  # [build_platform != target_platform]
+    - msgpack-c  # [build_platform != target_platform]
+    - unibilium  # [build_platform != target_platform]
   host:
     - gettext
     - libiconv  # [osx]
     - libmpack-lua
     - libtermkey
+    - libtree-sitter
     - libuv
     - libvterm
     - lua-lpeg
     - luajit-openresty
     - luv
     - msgpack-c
-    - libtree-sitter
     - unibilium
   run:
     - gettext
     - libiconv  # [osx]
     - libmpack-lua
     - libtermkey
+    - libtree-sitter
     - libuv
     - libvterm
     - lua-lpeg
     - luajit-openresty
     - luv
     - msgpack-c
-    - libtree-sitter
     - unibilium
 
 test: