From 657a2ce1106c975f15d1bde54dda386c15d51db2 Mon Sep 17 00:00:00 2001 From: jstebbins Date: Thu, 4 Oct 2012 16:54:02 +0000 Subject: Fix mingw build problems If the mingw environment has duplicates of some of the contrib libraries that we build, the mingw system lib or header was being used instead of our contrib version. Also, some dependencies were missing which would cause parallel builds to randomly fail because a necessary contrib hadn't been built yet. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5000 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- contrib/fontconfig/module.defs | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'contrib/fontconfig/module.defs') diff --git a/contrib/fontconfig/module.defs b/contrib/fontconfig/module.defs index 23091597b..ba9752fd7 100644 --- a/contrib/fontconfig/module.defs +++ b/contrib/fontconfig/module.defs @@ -1,4 +1,4 @@ -__deps__ := FREETYPE LIBXML2 +__deps__ := FREETYPE LIBXML2 LIBICONV $(eval $(call import.MODULE.defs,FONTCONFIG,fontconfig,$(__deps__))) $(eval $(call import.CONTRIB.defs,FONTCONFIG)) @@ -51,19 +51,19 @@ FONTCONFIG.CONFIGURE.env.CC = CC="$(FONTCONFIG.GCC.gcc) $(FONTCONFIG.cc_ar # ifeq (max,$(FONTCONFIG.GCC.g)) ifeq (none,$(FONTCONFIG.GCC.O)) - FONTCONFIG.CONFIGURE.env.CFLAGS = CFLAGS="$(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra .g .O)" - FONTCONFIG.CONFIGURE.env.CXXFLAGS = CXXFLAGS="$(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra .g .O)" + FONTCONFIG.CONFIGURE.env.CFLAGS = CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include $(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra .g .O)" + FONTCONFIG.CONFIGURE.env.CXXFLAGS = CXXFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include $(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra .g .O)" else - FONTCONFIG.CONFIGURE.env.CFLAGS = CFLAGS="$(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra .g)" - FONTCONFIG.CONFIGURE.env.CXXFLAGS = CXXFLAGS="$(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra .g)" + FONTCONFIG.CONFIGURE.env.CFLAGS = CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include $(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra .g)" + FONTCONFIG.CONFIGURE.env.CXXFLAGS = CXXFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include $(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra .g)" endif else - FONTCONFIG.CONFIGURE.env.CFLAGS = CFLAGS="$(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra)" - FONTCONFIG.CONFIGURE.env.CXXFLAGS = CXXFLAGS="$(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra)" + FONTCONFIG.CONFIGURE.env.CFLAGS = CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include $(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra)" + FONTCONFIG.CONFIGURE.env.CXXFLAGS = CXXFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include $(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra)" endif -FONTCONFIG.CONFIGURE.env.CPPFLAGS = CPPFLAGS="$(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra)" -FONTCONFIG.CONFIGURE.env.LDFLAGS = LDFLAGS="$(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver)" +FONTCONFIG.CONFIGURE.env.CPPFLAGS = CPPFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include $(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra)" +FONTCONFIG.CONFIGURE.env.LDFLAGS = LDFLAGS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib $(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver)" # # Force use of libxml2 instead of expat with --enable-libxml2. @@ -77,9 +77,8 @@ FONTCONFIG.CONFIGURE.env.LDFLAGS = LDFLAGS="$(call fn.ARGS,FONTCONFIG.GCC,*sysr FONTCONFIG.CONFIGURE.extra = \ --enable-libxml2 \ --with-freetype-config=$(call fn.ABSOLUTE,$(CONTRIB.build/)bin/freetype-config) \ - LIBXML2_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lxml2" \ - LIBXML2_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include/libxml2" \ - $(FONTCONFIG.config_archoption) + $(FONTCONFIG.config_archoption) --disable-silent-rules + ifeq (darwin,$(BUILD.system)) FONTCONFIG.CONFIGURE.extra += \ --with-fcpath=/usr/X11/lib/X11/fontconfig \ -- cgit v1.2.3