From 7e4cf5b8b4ed50bf9079be5ec9652f8a327476f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= Date: Wed, 1 Mar 2023 15:17:21 +0100 Subject: [PATCH] Move towards pkgconfig. --- neovim.spec | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/neovim.spec b/neovim.spec index 2cdaaa4..e6977c6 100644 --- a/neovim.spec +++ b/neovim.spec @@ -63,24 +63,18 @@ BuildRequires: gettext BuildRequires: git-core BuildRequires: gperf BuildRequires: hicolor-icon-theme -BuildRequires: libtermkey-devel +BuildRequires: pkgconfig(termkey) BuildRequires: libtool -BuildRequires: libuv-devel -BuildRequires: libvterm-devel >= 0.1 +BuildRequires: pkgconfig(libuv) +BuildRequires: pkgconfig(vterm) >= 0.1 BuildRequires: make -%if 0%{?suse_version} > 1550 -BuildRequires: msgpack-c-devel -%else -BuildRequires: msgpack-devel -%endif +BuildRequires: pkgconfig(msgpack) BuildRequires: pkgconfig BuildRequires: python-rpm-macros -BuildRequires: tree-sitter-devel >= 0.20.2 -BuildRequires: unibilium-devel +BuildRequires: pkgconfig(tree-sitter) >= 0.20.2 +BuildRequires: pkgconfig(unibilium) +BuildRequires: pkgconfig(libutf8proc) BuildRequires: unzip -BuildRequires: utf8proc-devel -## TESTING PATCH 4 -BuildRequires: hunspell-devel Requires: gperf Requires: libvterm0 >= 0.1 Requires: xdg-utils @@ -177,6 +171,7 @@ export CXXFLAGS="%{optflags} -fcommon" -DLUA_PRG=%{_bindir}/%{?with_luajit:luajit}%{!?with_luajit:lua} \ %if %{with luajit} -DBUSTED_PRG="$(readlink -f ../lj-busted.sh)" \ + -DLUAJIT_INCLUDE_DIR:PATH=%(pkgconf --cflags-only-I luajit|cut -c 3-) \ %endif -DUSE_BUNDLED=OFF -DLUAJIT_USE_BUNDLED=ON \ -DCMAKE_SKIP_RPATH=ON -DCMAKE_VERBOSE_MAKEFILE=ON \