diff options
| author | jstebbins <[email protected]> | 2012-10-04 16:54:02 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2012-10-04 16:54:02 +0000 |
| commit | 657a2ce1106c975f15d1bde54dda386c15d51db2 (patch) | |
| tree | 788d95c0bf0f24bc8a10e2c2f9577e6cedbff35a /contrib | |
| parent | 4228b01470a3f5d8798bce4aaad28d8481497911 (diff) | |
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
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/fontconfig/module.defs | 23 | ||||
| -rw-r--r-- | contrib/freetype/module.defs | 3 | ||||
| -rw-r--r-- | contrib/libxml2/module.defs | 3 |
3 files changed, 15 insertions, 14 deletions
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 \ diff --git a/contrib/freetype/module.defs b/contrib/freetype/module.defs index 4f00d68d3..f4ad34568 100644 --- a/contrib/freetype/module.defs +++ b/contrib/freetype/module.defs @@ -1,4 +1,5 @@ -$(eval $(call import.MODULE.defs,FREETYPE,freetype)) +__deps__ := BZIP +$(eval $(call import.MODULE.defs,FREETYPE,freetype,$(__deps__))) $(eval $(call import.CONTRIB.defs,FREETYPE)) FREETYPE.FETCH.url = http://download.handbrake.fr/handbrake/contrib/freetype-2.4.7.tar.bz2 diff --git a/contrib/libxml2/module.defs b/contrib/libxml2/module.defs index 8d25756c3..4c1d14bba 100644 --- a/contrib/libxml2/module.defs +++ b/contrib/libxml2/module.defs @@ -1,4 +1,5 @@ -$(eval $(call import.MODULE.defs,LIBXML2,libxml2)) +__deps__ := LIBICONV +$(eval $(call import.MODULE.defs,LIBXML2,libxml2,$(__deps__))) $(eval $(call import.CONTRIB.defs,LIBXML2)) LIBXML2.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libxml2-2.7.7.tar.gz |