| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152 |
- From 193eb63cd14e09f5801375075bfdf4b9d0a87954 Mon Sep 17 00:00:00 2001
- From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
- Date: Mon, 7 Oct 2013 17:05:21 +0200
- Subject: [PATCH 08/20] contrib/flac: fix compilation with clang 5.0
- ---
- contrib/src/flac/libFLAC-clang-5.0.patch | 19 +++++++++++++++++++
- contrib/src/flac/rules.mak | 1 +
- 2 files changed, 20 insertions(+)
- create mode 100644 contrib/src/flac/libFLAC-clang-5.0.patch
- diff --git a/contrib/src/flac/libFLAC-clang-5.0.patch b/contrib/src/flac/libFLAC-clang-5.0.patch
- new file mode 100644
- index 0000000..9fcad0b
- --- /dev/null
- +++ b/contrib/src/flac/libFLAC-clang-5.0.patch
- @@ -0,0 +1,19 @@
- +diff -ru flac/configure.ac flac-fixed/configure.ac
- +--- flac/configure.ac 2013-05-27 10:08:57.000000000 +0200
- ++++ flac-fixed/configure.ac 2013-10-07 16:56:51.000000000 +0200
- +@@ -381,15 +381,9 @@
- + CXXFLAGS="$CXXFLAGS -Wall -Wextra -Werror "
- + fi
- +
- +- if test "$GCC_MAJOR_VERSION" -ge 4 && test "$OBJ_FORMAT" = elf; then
- + CPPFLAGS="$CPPFLAGS -DFLAC__USE_VISIBILITY_ATTR"
- + CFLAGS="$CFLAGS -fvisibility=hidden"
- + CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
- +- fi
- +-
- +- if test "x$GCC_MAJOR_VERSION$GCC_MINOR_VERSION" = "x42" ; then
- +- XIPH_ADD_CFLAGS([-fgnu89-inline])
- +- fi
- + fi
- +
- +
- diff --git a/contrib/src/flac/rules.mak b/contrib/src/flac/rules.mak
- index bf72caf..ee6c2b5 100644
- --- a/contrib/src/flac/rules.mak
- +++ b/contrib/src/flac/rules.mak
- @@ -17,6 +17,7 @@ flac: flac-$(FLAC_VERSION).tar.xz .sum-flac
- $(UNPACK)
- $(APPLY) $(SRC)/flac/libFLAC-pc.patch
- ifdef HAVE_DARWIN_OS
- + $(APPLY) $(SRC)/flac/libFLAC-clang-5.0.patch
- cd $(UNPACK_DIR) && sed -e 's,-dynamiclib,-dynamiclib -arch $(ARCH),' -i.orig configure
- endif
- ifdef HAVE_ANDROID
- --
- 1.9.3 (Apple Git-50)
|
