From 33e603d8ef610508045e689e61645da34cc45e2e Mon Sep 17 00:00:00 2001 From: Mohammad Akhlaghi Date: Mon, 5 Aug 2019 12:43:58 +0100 Subject: Libffi builds without Java support Until now, we weren't explicitly disabling Java in the build of libffi because there was no Java platform on the systems we tested. But recently Yahya Sefidbakht report a crash in libffi (reported in bug #56716) because of Java not being compiled properly. Unfortunately libffi doesn't have a configure option to disable Java, but it does have an internal macro (`NO_JAVA_RAW_API'). With this commit, we we defined this macro in the `make' step, and it solved the problem. This fixes bug #56716. --- reproduce/software/make/python.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'reproduce/software/make') diff --git a/reproduce/software/make/python.mk b/reproduce/software/make/python.mk index d0c9a45..6952ad0 100644 --- a/reproduce/software/make/python.mk +++ b/reproduce/software/make/python.mk @@ -244,7 +244,8 @@ $(ibidir)/libffi: $(tdir)/libffi-$(libffi-version).tar.gz # later. To fix this problem, we'll first check if this has indeed # happened (it exists under `lib64', but not under `lib'). If so, # we'll put a copy of the installed libffi libraries in `lib'. - $(call gbuild, $<, libffi-$(libffi-version)) \ + $(call gbuild, $<, libffi-$(libffi-version), , \ + CFLAGS="-DNO_JAVA_RAW_API=1") \ && if [ -f $(idir)/lib64/libffi.a ] \ && [ ! $(idir)/lib/libffi.a ]; then \ cp $(idir)/lib64/libffi* $(ildir)/; \ -- cgit v1.2.1