[Libreoffice-commits] core.git: 2 commits - bin/check-elf-dynamic-objects external/coinmp

[Michael Stahl (via logerrit)]

 bin/check-elf-dynamic-objects             |    2 +-
 external/coinmp/ExternalProject_coinmp.mk |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 713d2ec43710b8ff36cf43ae1f9eab686a296ca7
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Thu Oct 31 21:09:00 2019 +0100
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Fri Nov 1 10:32:30 2019 +0100

    check-elf-dynamic-objects: GTK3 drags in libharfbuzz.so.0
    
    ... now on Fedora 31; it looks quite stable ABI-wise so we can allow it.
    
    Change-Id: Ic24fa9bdac0d0ce765e3d3844ce4ddcc59c6c9da
    Reviewed-on: https://gerrit.libreoffice.org/81864
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/bin/check-elf-dynamic-objects b/bin/check-elf-dynamic-objects
index f64044dd1e49..640c80a7f079 100755
--- a/bin/check-elf-dynamic-objects
+++ b/bin/check-elf-dynamic-objects
@@ -93,7 +93,7 @@ x11whitelist="libX11.so.6 libXext.so.6 libSM.so.6 libICE.so.6 libXinerama.so.1 l
 openglwhitelist="libGL.so.1"
 giowhitelist="libgio-2.0.so.0 libgobject-2.0.so.0 libgmodule-2.0.so.0 libgthread-2.0.so.0 libglib-2.0.so.0 libdbus-glib-1.so.2 libdbus-1.so.3"
 gstreamerwhitelist="libgstaudio-1.0.so.0 libgstpbutils-1.0.so.0 libgstvideo-1.0.so.0 libgstbase-1.0.so.0 libgstreamer-1.0.so.0"
-gtk3whitelist="libgtk-3.so.0 libgdk-3.so.0 libcairo-gobject.so.2 libpangocairo-1.0.so.0 libfribidi.so.0 libatk-1.0.so.0 libcairo.so.2 libgio-2.0.so.0 libpangoft2-1.0.so.0 libpango-1.0.so.0 libfontconfig.so.1 libfreetype.so.6 libgdk_pixbuf-2.0.so.0 libgobject-2.0.so.0 libglib-2.0.so.0 libgmodule-2.0.so.0 libgthread-2.0.so.0 libdbus-glib-1.so.2 libdbus-1.so.3"
+gtk3whitelist="libgtk-3.so.0 libgdk-3.so.0 libcairo-gobject.so.2 libpangocairo-1.0.so.0 libfribidi.so.0 libatk-1.0.so.0 libcairo.so.2 libgio-2.0.so.0 libpangoft2-1.0.so.0 libpango-1.0.so.0 libfontconfig.so.1 libfreetype.so.6 libgdk_pixbuf-2.0.so.0 libgobject-2.0.so.0 libglib-2.0.so.0 libgmodule-2.0.so.0 libgthread-2.0.so.0 libdbus-glib-1.so.2 libdbus-1.so.3 libharfbuzz.so.0"
 qt5whitelist="libQt5Core.so.5 libQt5Gui.so.5 libQt5Network.so.5 libQt5Widgets.so.5 libQt5X11Extras.so.5 libcairo.so.2 libglib-2.0.so.0 libgobject-2.0.so.0 libxcb.so.1"
 kf5whitelist="libKF5ConfigCore.so.5 libKF5CoreAddons.so.5 libKF5I18n.so.5 libKF5KIOCore.so.5 libKF5KIOFileWidgets.so.5 libKF5KIOWidgets.so.5 libKF5WindowSystem.so.5"
 avahiwhitelist="libdbus-glib-1.so.2 libdbus-1.so.3 libgobject-2.0.so.0 libgmodule-2.0.so.0 libgthread-2.0.so.0 libglib-2.0.so.0 libavahi-common.so.3 libavahi-client.so.3"
commit 82c20b5b1aa76e57a173e0c857ec7f3d02bdda29
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Thu Oct 31 20:59:46 2019 +0100
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Fri Nov 1 10:32:22 2019 +0100

    coinmp: disable "glpk", whatever that is
    
    On Fedora 31, this happens in CppunitTest_sccomp_solver:
    
    - loading component library <file:///work/lo/master/instdir/program/libsolverlo.so> failed
    
    > nm -D instdir/program/libCbcSolver.so.3 | grep cbc_glp_prob
                     U cbc_glp_prob
    
    > grep -r COIN_HAS_GLPK workdir/UnpackedTarball/coinmp | grep config.h
    workdir/UnpackedTarball/coinmp/Osi/src/Osi/config.h:/* #undef COIN_HAS_GLPK */
    workdir/UnpackedTarball/coinmp/Clp/src/config.h.in:#undef COIN_HAS_GLPK
    workdir/UnpackedTarball/coinmp/Cbc/src/config.h:#define COIN_HAS_GLPK 1
    workdir/UnpackedTarball/coinmp/CoinUtils/src/config.h.in:#undef COIN_HAS_GLPK
    
    Somehow 2 different configures in coinmp got different ideas about
    whether something named "glpk" is available.... no idea what that is,
    it looks like there's a "glpk-devel" package installed on the system,
    and i doubt that a dependency on that would be desirable.
    
    Change-Id: Ief01b6aedc692197c1a8fd6351aef4281e530e70
    Reviewed-on: https://gerrit.libreoffice.org/81863
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/external/coinmp/ExternalProject_coinmp.mk b/external/coinmp/ExternalProject_coinmp.mk
index f7362f6a1e1a..e2eeaf93ed8f 100644
--- a/external/coinmp/ExternalProject_coinmp.mk
+++ b/external/coinmp/ExternalProject_coinmp.mk
@@ -33,6 +33,7 @@ $(call gb_ExternalProject_get_state_target,coinmp,build) :
 			$(if $(DISABLE_DYNLOADING),--disable-shared) \
 			--disable-bzlib \
 			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
+			--without-glpk \
 			--enable-dependency-linking F77=unavailable \
 			$(if $(filter LINUX,$(OS)), \
 				'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \