aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Nagel2013-11-25 09:05:50 -0600
committerJack Nagel2013-11-25 09:37:53 -0600
commitd13ce183b2a36cd69867c561bd1b3ed2bf902e4b (patch)
tree5454e26a8d85c66624ef25902035a1318b7ff8c8
parent7e2a2dbbf3f5e07ca24a2c3f76ddf97ac2157674 (diff)
downloadhomebrew-d13ce183b2a36cd69867c561bd1b3ed2bf902e4b.tar.bz2
mkvtoolnix: fix deps
-rw-r--r--Library/Formula/libebml.rb4
-rw-r--r--Library/Formula/libmatroska.rb10
-rw-r--r--Library/Formula/mkvtoolnix.rb4
3 files changed, 15 insertions, 3 deletions
diff --git a/Library/Formula/libebml.rb b/Library/Formula/libebml.rb
index 86c3438af..600b0e450 100644
--- a/Library/Formula/libebml.rb
+++ b/Library/Formula/libebml.rb
@@ -6,7 +6,11 @@ class Libebml < Formula
mirror 'http://www.bunkus.org/videotools/mkvtoolnix/sources/libebml-1.3.0.tar.bz2'
sha256 '83b074d6b62715aa0080406ea84d33df2e44b5d874096640233a4db49b8096de'
+ option :cxx11
+
def install
+ ENV.cxx11 if build.cxx11?
+
cd 'make/linux' do
system "make", "install", "prefix=#{prefix}", "CXX=#{ENV.cxx}"
end
diff --git a/Library/Formula/libmatroska.rb b/Library/Formula/libmatroska.rb
index 6d16dc3fe..6bf2a763f 100644
--- a/Library/Formula/libmatroska.rb
+++ b/Library/Formula/libmatroska.rb
@@ -6,9 +6,17 @@ class Libmatroska < Formula
mirror 'http://www.bunkus.org/videotools/mkvtoolnix/sources/libmatroska-1.4.1.tar.bz2'
sha256 '086f21873e925679babdabf793c3bb85c353d0cd79423543a3355e08e8a4efb7'
- depends_on 'libebml'
+ option :cxx11
+
+ if build.cxx11?
+ depends_on 'libebml' => 'c++11'
+ else
+ depends_on 'libebml'
+ end
def install
+ ENV.cxx11 if build.cxx11?
+
cd 'make/linux' do
system "make", "install", "prefix=#{prefix}", "CXX=#{ENV.cxx}"
end
diff --git a/Library/Formula/mkvtoolnix.rb b/Library/Formula/mkvtoolnix.rb
index 4ae50ce2e..e2a4418a8 100644
--- a/Library/Formula/mkvtoolnix.rb
+++ b/Library/Formula/mkvtoolnix.rb
@@ -10,8 +10,8 @@ class Mkvtoolnix < Formula
depends_on 'pkg-config' => :build
depends_on 'boost' => 'c++11'
depends_on 'libvorbis'
- depends_on 'libmatroska'
- depends_on 'libebml'
+ depends_on 'libmatroska' => 'c++11'
+ depends_on 'libebml' => 'c++11'
depends_on 'flac' => :optional
depends_on 'lzo' => :optional