diff options
| -rw-r--r-- | Build/source/libs/freetype2/ChangeLog | 5 | ||||
| -rw-r--r-- | Build/source/libs/freetype2/Makefile.am | 10 | ||||
| -rw-r--r-- | Build/source/libs/freetype2/Makefile.in | 12 |
3 files changed, 24 insertions, 3 deletions
diff --git a/Build/source/libs/freetype2/ChangeLog b/Build/source/libs/freetype2/ChangeLog new file mode 100644 index 00000000000..b1767f61a62 --- /dev/null +++ b/Build/source/libs/freetype2/ChangeLog @@ -0,0 +1,5 @@ +2009-04-17 Karl Berry <karl@tug.org> + + * Makefile.am (ft-build/Makefile): use --without-zlib instead + of --with-zlib $(ZLIB_FLAGS_FOR_FREETYPE), due to bizarre + "file is not of required architecture" warning from MacOSX ld. diff --git a/Build/source/libs/freetype2/Makefile.am b/Build/source/libs/freetype2/Makefile.am index 39c931bb58b..49f9b63ef3a 100644 --- a/Build/source/libs/freetype2/Makefile.am +++ b/Build/source/libs/freetype2/Makefile.am @@ -31,10 +31,18 @@ ft-build/Makefile: $(abs_srcdir)/$(FREETYPE_TREE)/configure \ $(config_args) --disable-shared \ --with-old-mac-fonts \ - --with-zlib $(ZLIB_FLAGS_FOR_FREETYPE) \ + --without-zlib \ --prefix=$(abs_builddir)/ft-install \ --includedir=$(abs_builddir) +# On MacOSX, using our zlib from TL results in a .a that is unusable; ld +# warns "file is not of required architecture", and does not read it. +# There is no apparent reason for this. Using --without-zlib evidently +# causes freetype2 to use its internal zlib, so no functionality should +# be lost, even though it is not the cleanest solution. +# --with-zlib $(ZLIB_FLAGS_FOR_FREETYPE) \ +# + ## Unfortunately the FreeType build system installs the headers after the library; ## get our dependencies right we wait for a second and then touch the library. libfreetype.a: ft-build/Makefile $(ZLIB_DEPEND) diff --git a/Build/source/libs/freetype2/Makefile.in b/Build/source/libs/freetype2/Makefile.in index 9f79a2dd17f..9ce9c30555b 100644 --- a/Build/source/libs/freetype2/Makefile.in +++ b/Build/source/libs/freetype2/Makefile.in @@ -38,7 +38,7 @@ DIST_COMMON = $(am__configure_deps) \ ../../build-aux/config.guess ../../build-aux/config.sub \ ../../build-aux/depcomp ../../build-aux/install-sh \ ../../build-aux/ltmain.sh ../../build-aux/missing \ - ../../build-aux/texinfo.tex ../../build-aux/ylwrap + ../../build-aux/texinfo.tex ../../build-aux/ylwrap ChangeLog ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ $(top_srcdir)/../../m4/kpse-zlib-flags.m4 \ @@ -432,10 +432,18 @@ ft-build/Makefile: $(abs_srcdir)/$(FREETYPE_TREE)/configure \ $(config_args) --disable-shared \ --with-old-mac-fonts \ - --with-zlib $(ZLIB_FLAGS_FOR_FREETYPE) \ + --without-zlib \ --prefix=$(abs_builddir)/ft-install \ --includedir=$(abs_builddir) +# On MacOSX, using our zlib from TL results in a .a that is unusable; ld +# warns "file is not of required architecture", and does not read it. +# There is no apparent reason for this. Using --without-zlib evidently +# causes freetype2 to use its internal zlib, so no functionality should +# be lost, even though it is not the cleanest solution. +# --with-zlib $(ZLIB_FLAGS_FOR_FREETYPE) \ +# + libfreetype.a: ft-build/Makefile $(ZLIB_DEPEND) rm -rf ft-install cd ft-build \ |