[prev in list] [next in list] [prev in thread] [next in thread] 

List:       freetype-devel
Subject:    [Devel] Patch to FreeType CVS to link with system zlib better
From:       Anthony Fok <anthony () thizlinux ! com>
Date:       2002-12-23 2:04:07
[Download RAW message or body]

Dear all,

I ran into problem while building the latest FreeType 2 CVS for Debian.
Please add the attached patch, so when SYSTEM_ZLIB=yes,
libtool knows that libfreetype6 depends on libz:

	dependency_libs=' -lz'

otherwise, building ft2demos (and other software) would give error.

Also, as builds/unix/configure.ac is updated by Vincent Caron and now
by me, please run autoconf to regenerate builds/unix/configure before
committing, otherwise variables like @LIBZ@ in freetype-config would be
left unsubstituted.  Many thanks!

Anthony

-- 
Anthony Fok Tung-Ling
ThizLinux Laboratory   <anthony@thizlinux.com> http://www.thizlinux.com/
Debian Chinese Project <foka@debian.org>       http://www.debian.org/intl/zh/
Come visit Our Lady of Victory Camp!           http://www.olvc.ab.ca/

["006-freetype-2.1.3-link-libz.patch" (text/plain)]

diff -Naur freetype-2.1.3~/builds/unix/configure.ac freetype-2.1.3/builds/unix/configure.ac
--- freetype-2.1.3~/builds/unix/configure.ac	2002-12-22 02:11:07.000000000 +0800
+++ freetype-2.1.3/builds/unix/configure.ac	2002-12-22 05:35:50.000000000 +0800
@@ -90,10 +90,12 @@
 fi
 if test x$with_zlib != xno && test -n "$LIBZ"; then
   CFLAGS="$CFLAGS -DFT_CONFIG_OPTION_SYSTEM_ZLIB"
+  LDFLAGS="$LDFLAGS $LIBZ"
   SYSTEM_ZLIB=yes
 fi
 AC_SUBST(LIBZ)
 AC_SUBST(CFLAGS)
+AC_SUBST(LDFLAGS)
 AC_SUBST(SYSTEM_ZLIB)
 
 
diff -Naur freetype-2.1.3~/builds/unix/unix-cc.in freetype-2.1.3/builds/unix/unix-cc.in
--- freetype-2.1.3~/builds/unix/unix-cc.in	2002-05-05 18:57:06.000000000 +0800
+++ freetype-2.1.3/builds/unix/unix-cc.in	2002-12-22 05:33:34.000000000 +0800
@@ -78,6 +78,7 @@
 # Library linking
 #
 LINK_LIBRARY = $(LIBTOOL) --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \
-                          -rpath $(libdir) -version-info $(version_info)
+                          -rpath $(libdir) -version-info $(version_info) \
+                          $(LDFLAGS)
 
 # EOF
diff -Naur freetype-2.1.3~/builds/unix/unix-def.in freetype-2.1.3/builds/unix/unix-def.in
--- freetype-2.1.3~/builds/unix/unix-def.in	2002-12-22 05:38:00.000000000 +0800
+++ freetype-2.1.3/builds/unix/unix-def.in	2002-12-22 05:48:51.000000000 +0800
@@ -85,8 +85,8 @@
 LIB_DIR := $(OBJ_DIR)
 
 
-# The SYSTEM_ZLIB macro is defined if the user whishes to link dynamically
-# whith its system wide zlib. If SYSTEM_ZLIB is 'yes', the zlib part of the
+# The SYSTEM_ZLIB macro is defined if the user wishes to link dynamically
+# with its system wide zlib. If SYSTEM_ZLIB is 'yes', the zlib part of the
 # ftgzip module is not compiled in.
 SYSTEM_ZLIB := @SYSTEM_ZLIB@
 

_______________________________________________
Devel mailing list
Devel@freetype.org
http://www.freetype.org/mailman/listinfo/devel

[prev in list] [next in list] [prev in thread] [next in thread]