external/python3/ExternalProject_python3.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e31914d7f4588c475c5d59ffbc0187503967591d
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Jul 1 13:02:23 2016 +0200
python3: override LINKCC properly, it needs -pthread
Build on Fedora 24 fails with "Python/thread.o: undefined
reference to symbol 'pthread_key_delete@@GLIBC_2.0'"
Change-Id: If23838722e1cd0220c509d25932ae0539e8da7a1
diff --git a/external/python3/ExternalProject_python3.mk
b/external/python3/ExternalProject_python3.mk
index 76f8d88..38ed670 100644
--- a/external/python3/ExternalProject_python3.mk
+++ b/external/python3/ExternalProject_python3.mk
@@ -81,7 +81,7 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
$(if $(SYSBASE), -I$(SYSBASE)/usr/include) \
)" \
$(if $(python3_cflags),CFLAGS='$(python3_cflags)') \
- $(if $(filter -fsanitize=%,$(CC)),LINKCC="$(CXX)") \
+ $(if $(filter -fsanitize=%,$(CC)),LINKCC="$(CXX) -pthread") \
LDFLAGS="$(strip $(LDFLAGS) \
$(if $(SYSTEM_OPENSSL),,-L$(call
gb_UnpackedTarball_get_dir,openssl)) \
$(if $(SYSTEM_EXPAT),,-L$(gb_StaticLibrary_WORKDIR)) \
commit ca6592c0ae5de338e48cb0d999468548859b4af1
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Jul 1 12:47:11 2016 +0200
remove executable bit from .mk files
Change-Id: Id79898bb4f71103830ad7f74da71fbd5102e4fb5
diff --git a/external/coinmp/ExternalProject_coinmp.mk
b/external/coinmp/ExternalProject_coinmp.mk
old mode 100755
new mode 100644
diff --git a/external/python3/ExternalProject_python3.mk
b/external/python3/ExternalProject_python3.mk
old mode 100755
new mode 100644
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
