[vlc-commits] Revert "contrib: srt: fix compilation when the CMAKE_CXX_COMPILER_ID is not found"

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Fri May 25 13:12:49 2018 +0200| [29ba7d03c9a8d931e02dafa73b601636f0c07f8b] | committer: Steve Lhomme

Revert "contrib: srt: fix compilation when the CMAKE_CXX_COMPILER_ID is not found"

This reverts commit c8cb2a6eaa7d409f3bb61a828f31fac9c513b6e7.

Similar to srt-fix-non-gnu-detection.patch

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=29ba7d03c9a8d931e02dafa73b601636f0c07f8b
---

 contrib/src/srt/rules.mak                     |  1 -
 contrib/src/srt/srt-fix-compiler-detect.patch | 23 -----------------------
 2 files changed, 24 deletions(-)

diff --git a/contrib/src/srt/rules.mak b/contrib/src/srt/rules.mak
index 604a83c585..6807b4a7b1 100644
--- a/contrib/src/srt/rules.mak
+++ b/contrib/src/srt/rules.mak
@@ -37,7 +37,6 @@ ifdef HAVE_WINSTORE
 	$(APPLY) $(SRC)/srt/0002-CMakeLists.txt-let-cmake-find-pthread.patch
 	$(APPLY) $(SRC)/srt/srt-no-implicit-libs.patch 
 endif
-	$(APPLY) $(SRC)/srt/srt-fix-compiler-detect.patch
 	$(call pkg_static,"scripts/haisrt.pc.in")
 	mv srt-$(SRT_VERSION) $@ && touch $@
 
diff --git a/contrib/src/srt/srt-fix-compiler-detect.patch b/contrib/src/srt/srt-fix-compiler-detect.patch
deleted file mode 100644
index 34fa833de0..0000000000
--- a/contrib/src/srt/srt-fix-compiler-detect.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- srt/CMakeLists.txt.msvc-detect	2018-05-23 08:55:10.318208300 +0200
-+++ srt/CMakeLists.txt	2018-05-18 13:33:40.442158800 +0200
-@@ -115,12 +115,14 @@ message (STATUS "SSL libraries: ${SSL_LI
- 
- # Detect if the compiler is GNU compatable for flags
- set(HAVE_COMPILER_GNU_COMPAT 0)
--foreach (gnid GNU Intel Clang AppleClang)
--	if (${CMAKE_CXX_COMPILER_ID} STREQUAL ${gnid})
--		set(HAVE_COMPILER_GNU_COMPAT 1)
--		break()
--	endif()
--endforeach()
-+if ( CMAKE_CXX_COMPILER_ID )
-+	foreach (gnid GNU Intel Clang AppleClang)
-+		if (${CMAKE_CXX_COMPILER_ID} STREQUAL ${gnid})
-+			set(HAVE_COMPILER_GNU_COMPAT 1)
-+			break()
-+		endif()
-+	endforeach()
-+endif()
- 
- if (DISABLE_CXX11)
- 	set (ENABLE_CXX11 0)