Compare commits
No commits in common. "d7dc4fa5341d0befbdba655efce1e7b1974fe800" and "52a77541f26e81ba417213b2ab96e378382aaaba" have entirely different histories.
d7dc4fa534
...
52a77541f2
@ -0,0 +1,29 @@
|
|||||||
|
From d36b7395e69c70a8d98f78f2bcb20a32bf9f3173 Mon Sep 17 00:00:00 2001
|
||||||
|
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||||
|
Date: Fri, 11 Jan 2019 13:48:11 +0000
|
||||||
|
Subject: [PATCH] Fix include path in pkg-config for Makefile too (#1339).
|
||||||
|
|
||||||
|
Commit 0a39b785d3 fixed the pkg-config include path when using cmake.
|
||||||
|
However it didn't fix it for the Makefile. This fixes the Makefile
|
||||||
|
path.
|
||||||
|
|
||||||
|
Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
|
||||||
|
---
|
||||||
|
Makefile | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/Makefile b/Makefile
|
||||||
|
index 378f2fea..4a2c2d35 100644
|
||||||
|
--- a/Makefile
|
||||||
|
+++ b/Makefile
|
||||||
|
@@ -514,7 +514,7 @@ define generate-pkgcfg
|
||||||
|
echo 'Description: Capstone disassembly engine' >> $(PKGCFGF)
|
||||||
|
echo 'Version: $(PKG_VERSION)' >> $(PKGCFGF)
|
||||||
|
echo 'libdir=$(LIBDIR)' >> $(PKGCFGF)
|
||||||
|
- echo 'includedir=$(INCDIR)' >> $(PKGCFGF)
|
||||||
|
+ echo 'includedir=$(INCDIR)/capstone' >> $(PKGCFGF)
|
||||||
|
echo 'archive=$${libdir}/libcapstone.a' >> $(PKGCFGF)
|
||||||
|
echo 'Libs: -L$${libdir} -lcapstone' >> $(PKGCFGF)
|
||||||
|
echo 'Cflags: -I$${includedir}' >> $(PKGCFGF)
|
||||||
|
--
|
||||||
|
2.20.1
|
||||||
BIN
5.0.tar.gz
BIN
5.0.tar.gz
Binary file not shown.
BIN
capstone-4.0.1.tar.gz
Normal file
BIN
capstone-4.0.1.tar.gz
Normal file
Binary file not shown.
@ -1,16 +1,17 @@
|
|||||||
%bcond_with java
|
%bcond_with java
|
||||||
Name: capstone
|
Name: capstone
|
||||||
Version: 5.0
|
Version: 4.0.1
|
||||||
Release: 1
|
Release: 3
|
||||||
Summary: A lightweight multi-platform, multi-architecture disassembly framework
|
Summary: A lightweight multi-platform, multi-architecture disassembly framework
|
||||||
License: BSD
|
License: BSD
|
||||||
URL: http://www.capstone-engine.org/
|
URL: http://www.capstone-engine.org/
|
||||||
Source0: https://github.com/capstone-engine/capstone/archive/refs/tags/5.0.tar.gz
|
Source0: https://github.com/aquynh/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||||
|
|
||||||
|
Patch0: 0001-Fix-include-path-in-pkg-config-for-Makefile-too-1339.patch
|
||||||
|
|
||||||
%global with_python3 1
|
%global with_python3 1
|
||||||
|
|
||||||
BuildRequires: gcc capstone
|
BuildRequires: gcc git capstone
|
||||||
|
|
||||||
%if 0%{with java}
|
%if 0%{with java}
|
||||||
Buildrequires: jna java-devel
|
Buildrequires: jna java-devel
|
||||||
@ -55,7 +56,7 @@ This package contains java bindings for %{name}.
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -n %{name}-%{version} -p1
|
%autosetup -n %{name}-%{version} -p1 -Sgit
|
||||||
|
|
||||||
%build
|
%build
|
||||||
DESTDIR="%{buildroot}" V=1 CFLAGS="%{optflags}" \
|
DESTDIR="%{buildroot}" V=1 CFLAGS="%{optflags}" \
|
||||||
@ -84,6 +85,7 @@ popd
|
|||||||
DESTDIR=%{buildroot} LIBDIRARCH=%{_lib} \
|
DESTDIR=%{buildroot} LIBDIRARCH=%{_lib} \
|
||||||
INCDIR="%{_includedir}" make install
|
INCDIR="%{_includedir}" make install
|
||||||
%delete_la_and_a
|
%delete_la_and_a
|
||||||
|
cp -a %{_libdir}/libcapstone.so.3 %{buildroot}%{_libdir}
|
||||||
|
|
||||||
pushd bindings/python
|
pushd bindings/python
|
||||||
%if 0%{?with_python3}
|
%if 0%{?with_python3}
|
||||||
@ -127,27 +129,11 @@ install -D -p -m 0644 bindings/java/%{name}.jar %{buildroot}/%{_javadir}/%{name
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Fri Jul 28 2023 chenzixuan <chenzixuan@kylinos.cn> - 5.0-1
|
* Fri Oct 30 2020 wangjie<wangjie294@huawei.com> -4.0.1-3
|
||||||
- DESC:upgrade 5.0
|
|
||||||
|
|
||||||
* Fri Jul 30 2021 chenyanpanHW <chenyanpan@huawei.com> - 4.0.2-4
|
|
||||||
- DESC: delete -Sgit from %autosetup, and delete BuildRequires git
|
|
||||||
|
|
||||||
* Sat Mar 20 2021 shenyangyang<shenyangyang4@huawei.com> - 4.0.2-3
|
|
||||||
- DESC:Delete unneeded so for bumping version
|
|
||||||
|
|
||||||
* Mon Feb 1 2021 wangjie<wangjie294@huawei.com> - 4.0.2-2
|
|
||||||
- DESC:remove capstone-4.0.1.tar.gz and 0001-Fix-include-path-in-pkg-config-for-Makefile-too-1339.patch after upgrade 4.0.2
|
|
||||||
|
|
||||||
* Mon Feb 1 2021 wangjie<wangjie294@huawei.com> - 4.0.2-1
|
|
||||||
- DESC:upgrade 4.0.2
|
|
||||||
|
|
||||||
* Fri Oct 30 2020 wangjie<wangjie294@huawei.com> - 4.0.1-3
|
|
||||||
- Type:NA
|
- Type:NA
|
||||||
- ID:NA
|
- ID:NA
|
||||||
- SUG:NA
|
- SUG:NA
|
||||||
- DESC:remove python2
|
- DESC:remove python2
|
||||||
|
|
||||||
* Mon Oct 28 2019 caomeng <caomeng5@huawei.com> - 4.0.1-2
|
* Mon Oct 28 2019 caomeng <caomeng5@huawei.com> - 4.0.1-2
|
||||||
- Type:NA
|
- Type:NA
|
||||||
- ID:NA
|
- ID:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user