summaryrefslogtreecommitdiffstats
path: root/contrib/ffmpeg
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2013-01-03 18:50:14 +0000
committerjstebbins <[email protected]>2013-01-03 18:50:14 +0000
commita03f50f1f07cd2b1db662217b9fc9735676a997c (patch)
tree24041b5029ecca1f732ded3e4cdcd1a4552c5cb2 /contrib/ffmpeg
parentf15d4cb2e2cf4aac27b63314f5f28d486aae1eb6 (diff)
libav: solaris build fixes
1. Link in /usr/lib/values-xpg6.o to get proper POSIX.1-2001 behaviour from libc -- this is controversial within the GCC camp as it "breaks old code" that doesn't assume it has been added. Some libc functions behave very differently with and without this linked. Since we're linking statically to the library, this is not a significant concern. 2. MPC8 disable constraint is clamped down to only apply on SPARC. thanks to icchan for patch. https://reviews.handbrake.fr/r/367/ git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5138 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib/ffmpeg')
-rw-r--r--contrib/ffmpeg/module.defs7
1 files changed, 6 insertions, 1 deletions
diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs
index 2c0d64bdc..3dbe5d88a 100644
--- a/contrib/ffmpeg/module.defs
+++ b/contrib/ffmpeg/module.defs
@@ -87,8 +87,13 @@ ifeq (darwin-i386,$(BUILD.system)-$(BUILD.machine))
endif
endif
-## MPC8 Doesn't compile on SPARC
+## For POSIX.1-2001
ifeq (solaris,$(BUILD.system))
+ FFMPEG.CONFIGURE.extra += --extra-libs=/usr/lib/values-xpg6.o
+endif
+
+## MPC8 Doesn't compile on SPARC
+ifeq (solaris-sparc,$(BUILD.system)-$(BUILD.machine))
FFMPEG.CONFIGURE.extra += --disable-demuxer=mpc8
endif