From 861ad6567ec39f0fd406fb7f2709b12baa5831d0 Mon Sep 17 00:00:00 2001 From: Thomas Debesse Date: Mon, 5 Aug 2019 20:07:29 +0200 Subject: [PATCH] bundle: do not bundle libstdc++, pango, and some remaining X11 stuff on Linux - it's a bad idea to bundle libstdc++ as it may conflict in non-obvious manner (like failing on X11 stuff) - pango is known to conflict with newer distros - no need to bundle libICE and libSM since we expect user to have a working x11 install --- library-bundler | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/library-bundler b/library-bundler index ceac213f..ea276cea 100755 --- a/library-bundler +++ b/library-bundler @@ -45,9 +45,9 @@ Multi::excludeLdd () { # - since we ask user to instal gtk, we can also ask them to install gtkglext, # which is likely to pull gtk itself, x11 and gl dependencies # - old fontconfig does not work correctly if newer fontconfig configuration is installed - # - if gtk and fontconfig is installed, freetype is - egrep -v '/libc\.|/libdl\.|/libm\.|/libX|/libxcb|/libGL' \ - | egrep -v '/libatk|/libgdk|/libgtk|/libgio|/libglib|/libgmodule|/libgobject|/libfontconfig|/libfreetype' + # - if gtk and fontconfig is installed, pango and freetype are + egrep -v '/libc\.|/libstdc\+\+\.|/libdl\.|/libm\.|/libX|/libxcb|/libGL|/libICE\.|/libSM\.' \ + | egrep -v '/libatk|/libgdk|/libgtk|/libgio|/libglib|/libgmodule|/libgobject|/libpango|/libfontconfig|/libfreetype' ;; 'windows') egrep -i '\.dll => [A-Z]:\\msys64\\' \ -- 2.39.2