Am Freitag, den 11.01.2019, 09:43 +0000 schrieb Daniel P. Berrangé: > On Fri, Jan 11, 2019 at 09:40:59AM +0000, Richard W.M. Jones wrote: > > On Fri, Jan 11, 2019 at 09:30:29AM +0000, Daniel P. Berrangé wrote: > > > On Fri, Jan 11, 2019 at 09:24:12AM +0000, Richard W.M. Jones > > > wrote: > > > > On Fri, Jan 11, 2019 at 09:14:29AM +0000, Richard W.M. Jones > > > > wrote: > > > > > https://koji.fedoraproject.org/koji/buildinfo?buildID=1178711 > > > > > > > > > > This broke qemu, and indirectly libvirt. > > > > > > > > > > I will submit a new build for qemu to see if that fixes > > > > > things. I > > > > > didn't look closely to see if there are API changes. > > > > > > > > The rebuild failed - it looks like there are some changes to > > > > capstone, > > > > at least the location of the <capstone.h> headers file, which > > > > break > > > > qemu source. I'll see if there's anything we can backport from > > > > upstream. > > > > > > The headers haven't moved. It looks like the capstone pkgconfig > > > file is > > > broken. > > > > > > In 3.0.5 it had > > > > > > includedir=/usr/include/capstone > > > > > > In 4.0.1 is has > > > > > > includedir=/usr/include > > > > While I don't disagree that this file looks broken, it does seem as > > if > > capstone wants you to use <capstone/capstone.h>. See the tests, for > > example: > > > > https://github.com/aquynh/capstone/blob/master/tests/test_basic.c > > > > The below patch fixes qemu when using the system capstone, but > > probably breaks when using the git-submodule capstone. However I'll > > drop this in as a *temporary* workaround to get Fedora building. > > We should really just fix the pkg-config file in capstone locally. > > I've filed a bug in upstream capstone, as they really do intend > includedir=/usr/include/capstone to be used. > > https://github.com/aquynh/capstone/issues/1339 > > > Regards, > Daniel Index: capstone-4.0.1/Makefile =================================================================== --- capstone-4.0.1.orig/Makefile +++ capstone-4.0.1/Makefile @@ -517,5 +517,5 @@ define generate-pkgcfg echo 'includedir=$(INCDIR)' >> $(PKGCFGF) echo 'archive=$${libdir}/libcapstone.a' >> $(PKGCFGF) echo 'Libs: -L$${libdir} -lcapstone' >> $(PKGCFGF) - echo 'Cflags: -I$${includedir}' >> $(PKGCFGF) + echo 'Cflags: -I$${includedir}/$(LIBNAME)' >> $(PKGCFGF) endef -- This patch should fix the pkgconfig file generated by Makefile. Björn
Attachment:
signature.asc
Description: This is a digitally signed message part
_______________________________________________ devel mailing list -- devel@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to devel-leave@xxxxxxxxxxxxxxxxxxxxxxx Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/devel@xxxxxxxxxxxxxxxxxxxxxxx
