[Libreoffice-commits] .: 2 commits - vcl/Library_vcl.mk

[Tor Lillqvist]

 vcl/Library_vcl.mk |   16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

New commits:
commit 2011a3f2d3602da67daa8fb6bbf7f3546419818a
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Jul 15 16:05:19 2011 +0300

    Just using CAIRO_LIBS in ldflags is not enough

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index bf0d1a0..19c1c9e 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -490,10 +490,24 @@ $(eval $(call gb_Library_set_cxxflags,vcl,\
     $$(CAIRO_CFLAGS) \
     -DSYSTEM_CAIRO \
 ))
+
+# CAIRO_LIBS contains both -L and -l options. Thes sets LDFLAGS which
+# goes early into the linking command line before the object files. So
+# on platforms where libraries are searched for symbols undefined at
+# that point as they occur on the command line, it is pointless to
+# search the cairo library at that point as no references to cairo
+# entries have been read from object files yet.
 $(eval $(call gb_Library_set_ldflags,vcl,\
     $$(LDFLAGS) \
     $$(CAIRO_LIBS) \
 ))
+
+# Thus we also need to add cairo to the list of linked libs. These go
+# after the object files on the linking command line.
+$(eval $(call gb_Library_add_linked_libs,vcl,\
+    cairo \
+))
+
 else
 $(eval $(call gb_Library_add_linked_libs,vcl,\
     cairo \
commit f9276501c933dca217437b366bf5e24f3669dcd3
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Jul 15 16:00:42 2011 +0300

    Use gb_Library_win32_OLDNAMES
    
    No need for the OLDNAMESLIB, we already had gb_Library_win32_OLDNAMES
    for this purpose.

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 044b067..bf0d1a0 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -571,7 +571,7 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\
     mpr \
     msimg32 \
     msvcrt \
-    $(OLDNAMESLIB) \
+    $(gb_Library_win32_OLDNAMES) \
     ole32 \
     shell32 \
     user32 \