From: <ai...@us...> - 2014-06-20 20:28:12
|
Revision: 13130 http://sourceforge.net/p/plplot/code/13130 Author: airwin Date: 2014-06-20 20:28:03 +0000 (Fri, 20 Jun 2014) Log Message: ----------- Make harbuzz epa_build package depend on freetype_nohb to break the dependency loop between harbuzz and freetype as suggested by Linux from scratch. The result is freetype depends on harbuzz which depends on freetyp_nohb where the two freetype packages are identical (except for the package name and except for the --without-harfbuzz configure option for freetyp_nohb. Furthermore, installed file names are identical between the two freeype versions. Thus, the freetype install completely overwrites the freetype_nohb install. The result is that ldd -r shows libharfbuzz resolves symbols in libfreetype and vice versa without errors. This illustrates the fundamental dependency loop between these two libraries which is allowed but is nevertheless a configuration pain that has been resolved as above. Tested on Linux by building the build_freetype package and running ldd -r on the resulting libfreetype and libharfbuzz libraries. Modified Paths: -------------- trunk/cmake/epa_build/harfbuzz/CMakeLists.txt Modified: trunk/cmake/epa_build/harfbuzz/CMakeLists.txt =================================================================== --- trunk/cmake/epa_build/harfbuzz/CMakeLists.txt 2014-06-20 20:13:56 UTC (rev 13129) +++ trunk/cmake/epa_build/harfbuzz/CMakeLists.txt 2014-06-20 20:28:03 UTC (rev 13130) @@ -31,7 +31,7 @@ # ignored. set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libX11;libXft;xorg-kbproto;xorg-macros;xorg-xproto;dbus ${extra_ignored_dependencies_list}) -set(dependencies_LIST glib;ragel) +set(dependencies_LIST glib;ragel;freetype_nohb) # Do boilerplate tasks that must be done for each different project # that is configured as part of epa_build. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |