diff options
| author | ruki <[email protected]> | 2025-01-12 22:04:26 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2025-01-12 22:04:26 +0800 |
| commit | 45033d4729d3c1b21e7491c62510e14c87c4a053 (patch) | |
| tree | 2439908295b40008e1a074ad414c5cc3302a801c /scripts | |
| parent | 3873448ab454385912e0cd5e809c92054269b9dd (diff) | |
remove rpm patch
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/rpmbuild/0002-pkgconfig-unversioned-lua.patch | 15 | ||||
| -rw-r--r-- | scripts/rpmbuild/xmake.spec | 3 |
2 files changed, 1 insertions, 17 deletions
diff --git a/scripts/rpmbuild/0002-pkgconfig-unversioned-lua.patch b/scripts/rpmbuild/0002-pkgconfig-unversioned-lua.patch deleted file mode 100644 index 4ff14000f..000000000 --- a/scripts/rpmbuild/0002-pkgconfig-unversioned-lua.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/core/xmake.sh b/core/xmake.sh -index 2ae2e686b..2b7767b0c 100755 ---- a/core/xmake.sh -+++ b/core/xmake.sh -@@ -91,8 +91,8 @@ option_find_lua() { - local ldflags="" - local cflags="" - option "lua" -- cflags=`pkg-config --cflags lua5.4 2>/dev/null` -- ldflags=`pkg-config --libs lua5.4 2>/dev/null` -+ cflags=`pkg-config --cflags lua 2>/dev/null` -+ ldflags=`pkg-config --libs lua 2>/dev/null` - if test_z "${cflags}"; then - cflags="-I/usr/include/lua5.4" - fi diff --git a/scripts/rpmbuild/xmake.spec b/scripts/rpmbuild/xmake.spec index 5c4664395..1a6985e29 100644 --- a/scripts/rpmbuild/xmake.spec +++ b/scripts/rpmbuild/xmake.spec @@ -3,7 +3,7 @@ Name: xmake Version: 2.9.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A cross-platform build utility based on Lua # Application and 3rd-party modules licensing: @@ -16,7 +16,6 @@ License: Apache-2.0 AND LicenseRef-Fedora-Public-Domain AND BSD URL: https://xmake.io Source0: https://github.com/xmake-io/xmake/releases/download/v%{version}/%{name}-v%{version}.tar.gz Patch0: 0001-use-static-libsv-and-tbox.patch -Patch1: 0002-pkgconfig-unversioned-lua.patch BuildRequires: pkgconfig(ncurses) BuildRequires: pkgconfig(liblz4) |