cogl-pango: prevent linking to system cogl during make install
At the moment, on make install, libcogl-pango will link to the version of libcogl that is installed system wide. This leads to interesting problems when the version installed system wide is incompatible with the version of cogl being built. E.g., when building cogl-1.7.4 (with --enable-cogl-pango and --prefix=/usr) on a system that has cogl-1.7.2 installed in /usr: $ make [...] $ ldd cogl-pango/.libs/libcogl-pango.so | grep cogl libcogl.so.2 => /var/tmp/cogl-1.7.4/cogl/.libs/libcogl.so.2 (0x00007eff4bfb2000) $ make DESTDIR=/var/tmp/cogl-1.7.4/dest install [...] $ ldd /var/tmp/cogl-1.7.4/dest/usr/lib64/libcogl-pango.so | grep cogl libcogl.so.1 => /usr/lib64/libcogl.so.1 (0x00007f4647747000) This problem can be avoided by reordering libcogl_pango_la_LIBADD to ensure that during make installs' relinking phase, libtool looks at the libcogl in the build directory before the system wide libcogl. https://bugzilla.gnome.org/show_bug.cgi?id=655026 Reviewed-By: Robert Bragg <robert@linux.intel.com> Reviewed-By: Emmanuele Bassi <ebassi@linux.intel.com>
This commit is contained in:
parent
d259a87602
commit
565e2cabd8
@ -28,8 +28,8 @@ lib_LTLIBRARIES = libcogl-pango.la
|
|||||||
|
|
||||||
libcogl_pango_la_SOURCES = $(source_c) $(source_h) $(source_h_priv)
|
libcogl_pango_la_SOURCES = $(source_c) $(source_h) $(source_h_priv)
|
||||||
libcogl_pango_la_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) $(MAINTAINER_CFLAGS)
|
libcogl_pango_la_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) $(MAINTAINER_CFLAGS)
|
||||||
libcogl_pango_la_LIBADD = $(COGL_DEP_LIBS) $(COGL_EXTRA_LDFLAGS)
|
libcogl_pango_la_LIBADD = $(top_builddir)/cogl/libcogl.la
|
||||||
libcogl_pango_la_LIBADD += $(top_builddir)/cogl/libcogl.la
|
libcogl_pango_la_LIBADD += $(COGL_DEP_LIBS) $(COGL_EXTRA_LDFLAGS)
|
||||||
libcogl_pango_la_LDFLAGS = \
|
libcogl_pango_la_LDFLAGS = \
|
||||||
-export-dynamic \
|
-export-dynamic \
|
||||||
-export-symbols-regex "^cogl_pango_.*"
|
-export-symbols-regex "^cogl_pango_.*"
|
||||||
|
Loading…
Reference in New Issue
Block a user