Compare commits
11 Commits
988d6c966e
...
46cba4e873
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
46cba4e873 | ||
|
|
9cd4ce7579 | ||
|
|
f04126b673 | ||
|
|
ced00755dd | ||
|
|
bb2dab9774 | ||
|
|
7b71b93e07 | ||
|
|
af0cba0cc7 | ||
|
|
52a77541f2 | ||
|
|
98e937f3f0 | ||
|
|
2549795188 | ||
|
|
5ab7027683 |
@ -1,29 +0,0 @@
|
||||
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
4.0.2.tar.gz
Normal file
BIN
4.0.2.tar.gz
Normal file
Binary file not shown.
Binary file not shown.
@ -1,16 +1,14 @@
|
||||
%bcond_with java
|
||||
Name: capstone
|
||||
Version: 4.0.1
|
||||
Release: 2
|
||||
Version: 4.0.2
|
||||
Release: 3
|
||||
Summary: A lightweight multi-platform, multi-architecture disassembly framework
|
||||
License: BSD
|
||||
URL: http://www.capstone-engine.org/
|
||||
Source0: https://github.com/aquynh/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
Source0: https://github.com/aquynh/%{name}/archive/%{version}.tar.gz
|
||||
|
||||
Patch0: 0001-Fix-include-path-in-pkg-config-for-Makefile-too-1339.patch
|
||||
|
||||
%global with_python3 1
|
||||
%global with_python2 1
|
||||
|
||||
BuildRequires: gcc git capstone
|
||||
|
||||
@ -18,10 +16,6 @@ BuildRequires: gcc git capstone
|
||||
Buildrequires: jna java-devel
|
||||
%endif
|
||||
|
||||
%if 0%{?with_python2}
|
||||
BuildRequires: python2 python2-devel python2-setuptools
|
||||
%endif
|
||||
|
||||
%if 0%{?with_python3}
|
||||
BuildRequires: python%{python3_pkgversion} python%{python3_pkgversion}-devel python%{python3_pkgversion}-setuptools
|
||||
%endif
|
||||
@ -37,20 +31,6 @@ Requires:%{name} = %{version}-%{release}
|
||||
%description -n %{name}-devel
|
||||
Development headers and libraries to build upon %{name}
|
||||
|
||||
%if 0%{?with_python2}
|
||||
%package -n python2-capstone
|
||||
Summary: Python bindings for %{name}
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Provides: %{name}-python = %{version}-%{release}
|
||||
Provides: %{name}-python%{?_isa} = %{version}-%{release}
|
||||
Obsoletes: %{name}-python < %{version}-%{release}
|
||||
%{?python_provide:%python_provide python2-capstone}
|
||||
|
||||
%description -n python2-capstone
|
||||
%{common_desc}
|
||||
Python bindings for %{name}.
|
||||
%endif
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%package -n python%{python3_pkgversion}-capstone
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
@ -87,7 +67,6 @@ grep -v archive capstone.pc > capstone.pc.tmp
|
||||
mv capstone.pc.tmp capstone.pc
|
||||
|
||||
pushd bindings/python
|
||||
%py2_build
|
||||
%if 0%{?with_python3}
|
||||
%py3_build
|
||||
%endif
|
||||
@ -97,8 +76,6 @@ popd
|
||||
pushd bindings/java
|
||||
%if 0%{?with_python3}
|
||||
make PYTHON2=%{__python3} PYTHON3=%{__python3} CFLAGS="%{optflags}"
|
||||
%else
|
||||
make PYTHON2=%{__python2} PYTHON3=%{__python2} CFLAGS="%{optflags}"
|
||||
%endif
|
||||
popd
|
||||
%endif
|
||||
@ -107,13 +84,8 @@ popd
|
||||
DESTDIR=%{buildroot} LIBDIRARCH=%{_lib} \
|
||||
INCDIR="%{_includedir}" make install
|
||||
%delete_la_and_a
|
||||
cp -a %{_libdir}/libcapstone.so.3 %{buildroot}%{_libdir}
|
||||
|
||||
pushd bindings/python
|
||||
%if 0%{?with_python2}
|
||||
%py2_install
|
||||
%endif
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%py3_install
|
||||
%endif
|
||||
@ -142,11 +114,6 @@ install -D -p -m 0644 bindings/java/%{name}.jar %{buildroot}/%{_javadir}/%{name
|
||||
%{_libdir}/*.so
|
||||
%{_libdir}/pkgconfig/*
|
||||
|
||||
%if 0%{?with_python2}
|
||||
%files -n python2-capstone
|
||||
%{python2_sitelib}/*egg-info
|
||||
%{python2_sitelib}/%{name}
|
||||
%endif
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%files -n python%{python3_pkgversion}-capstone
|
||||
@ -160,6 +127,21 @@ install -D -p -m 0644 bindings/java/%{name}.jar %{buildroot}/%{_javadir}/%{name
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* 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
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC:remove python2
|
||||
|
||||
* Mon Oct 28 2019 caomeng <caomeng5@huawei.com> - 4.0.1-2
|
||||
- Type:NA
|
||||
- ID:NA
|
||||
|
||||
4
capstone.yaml
Normal file
4
capstone.yaml
Normal file
@ -0,0 +1,4 @@
|
||||
version_control: github
|
||||
src_repo: aquynh/capstone
|
||||
tag_prefix: ^v
|
||||
seperator: "."
|
||||
Loading…
x
Reference in New Issue
Block a user