remove capstone.tar.gz and 0001-Fix-include-path-in-pkg-config-for-Makefile-too-1339.patch

This commit is contained in:
wangjie 2021-02-01 11:42:13 +08:00
parent 7b71b93e07
commit bb2dab9774
3 changed files with 4 additions and 30 deletions

View File

@ -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

Binary file not shown.

View File

@ -1,7 +1,7 @@
%bcond_with java
Name: capstone
Version: 4.0.2
Release: 1
Release: 2
Summary: A lightweight multi-platform, multi-architecture disassembly framework
License: BSD
URL: http://www.capstone-engine.org/
@ -128,6 +128,9 @@ install -D -p -m 0644 bindings/java/%{name}.jar %{buildroot}/%{_javadir}/%{name
%endif
%changelog
* 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