diff options
| author | jstebbins <[email protected]> | 2011-03-21 18:14:04 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2011-03-21 18:14:04 +0000 |
| commit | a459a827c23dd2063c559de1f9c4c23fd0384b19 (patch) | |
| tree | 3ca72e08b1dc7c9efa23d84129415b05e28bc9a8 | |
| parent | 01372381e86f1f89ab40cdf8c2a08b9a71bbca23 (diff) | |
Fix linking on mingw when using libtool
Linking the gtk gui uses libtool. The *.la files libtool uses specify
the dependency libraries that libraries are built against. Our
libbluray contrib was being built against the system libxml2 due to
dependencies that were not set in our build system and PKG_CONFIG_PATH
not being set when configuring.
Note that on fedora (and possibly other systems) the ${cross}-pkg-config
script provided is broken and explicitely sets PKG_CONFIG_PATH="". You
need to replace this script with something like this:
PKG_CONFIG_LIBDIR=$(${cross}-gcc --print-sysroot)/mingw/lib/pkgconfig pkg-config $*
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3858 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | contrib/libbluray/module.defs | 2 | ||||
| -rw-r--r-- | make/include/contrib.defs | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/contrib/libbluray/module.defs b/contrib/libbluray/module.defs index f3dab0a6b..b6db7c7de 100644 --- a/contrib/libbluray/module.defs +++ b/contrib/libbluray/module.defs @@ -1,4 +1,4 @@ -$(eval $(call import.MODULE.defs,LIBBLURAY,libbluray)) +$(eval $(call import.MODULE.defs,LIBBLURAY,libbluray,LIBXML2)) $(eval $(call import.CONTRIB.defs,LIBBLURAY)) LIBBLURAY.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libbluray-0.0.1-pre-129-g67ee7bc.tar.gz diff --git a/make/include/contrib.defs b/make/include/contrib.defs index 9edd9389c..0e158cd67 100644 --- a/make/include/contrib.defs +++ b/make/include/contrib.defs @@ -88,8 +88,9 @@ define import.CONTRIB.defs $(1).CONFIGURE.env.CXXFLAGS = CXXFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra)" $(1).CONFIGURE.env.CPPFLAGS = CPPFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra)" $(1).CONFIGURE.env.LDFLAGS = LDFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver)" + $(1).CONFIGURE.env.PKG_CONFIG_PATH = PKG_CONFIG_PATH="$$(call fn.ABSOLUTE,$$(CONTRIB.build/))lib/pkgconfig" - $(1).CONFIGURE.env.args = !CC !CFLAGS !CXX !CXXFLAGS !CPPFLAGS !LDFLAGS + $(1).CONFIGURE.env.args = !CC !CFLAGS !CXX !CXXFLAGS !CPPFLAGS !LDFLAGS !PKG_CONFIG_PATH $(1).CONFIGURE.env = $$(call fn.ARGS,$(1).CONFIGURE.env,$$($(1).CONFIGURE.env.args)) $(1).CONFIGURE.target = $$($(1).build/).stamp.configure |