Attachment 115151 Details for Bug 156901 – patch-ports-net-crtmpserver.txt

[patch] patch-ports-net-crtmpserver.txt

patch-ports-net-crtmpserver.txt (text/plain), 1.90 KB, created by kamikaze on 2011-09-11 12:35:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: kamikaze

Created: 2011-09-11 12:35:37 UTC

Size: 1.90 KB

patch

obsolete

>diff -Nur net/crtmpserver.orig/Makefile net/crtmpserver/Makefile
>--- net/crtmpserver.orig/Makefile	2011-09-08 21:21:00.000000000 +0200
>+++ net/crtmpserver/Makefile	2011-09-08 21:21:52.000000000 +0200
>@@ -18,7 +18,7 @@
> WRKSRC=	${WRKDIR}/crtmpserver-545
> 
> USE_CMAKE=	yes
>-CMAKE_ENV=	"COMPILE_STATIC=1"
>+CONFIGURE_ENV+=	COMPILE_STATIC=1
> CMAKE_OUTSOURCE=	yes
> CMAKE_SOURCE_PATH=	${WRKSRC}/builders/cmake
> CMAKE_BUILD_TYPE=	Release
>diff -Nur net/crtmpserver.orig/files/patch-builders-cmake-cmake_find_modules-pch_support.cmake net/crtmpserver/files/patch-builders-cmake-cmake_find_modules-pch_support.cmake
>--- net/crtmpserver.orig/files/patch-builders-cmake-cmake_find_modules-pch_support.cmake	1970-01-01 01:00:00.000000000 +0100
>+++ net/crtmpserver/files/patch-builders-cmake-cmake_find_modules-pch_support.cmake	2011-09-08 21:28:26.000000000 +0200
>@@ -0,0 +1,24 @@
>+--- builders/cmake/cmake_find_modules/pch_support.cmake.orig	2011-07-25 13:01:58.000000000 +0200
>++++ builders/cmake/cmake_find_modules/pch_support.cmake	2011-09-08 21:28:22.000000000 +0200
>+@@ -1,9 +1,11 @@
>+ #This code is taken from here:
>+ #http://www.mail-archive.com/cmake@cmake.org/msg04394.html
>+ 
>++STRING(REGEX REPLACE "[	 ]+" ";" _CMAKE_CXX_COMPILER_ARG1 "${CMAKE_CXX_COMPILER_ARG1}")
>++
>+ IF(CMAKE_COMPILER_IS_GNUCXX)
>+     EXEC_PROGRAM(
>+-        ${CMAKE_CXX_COMPILER} 
>++        ${CMAKE_CXX_COMPILER} ${_CMAKE_CXX_COMPILER_ARG1}
>+         ARGS                    --version 
>+         OUTPUT_VARIABLE _compiler_output)
>+     STRING(REGEX REPLACE ".* ([0-9]\\.[0-9]\\.[0-9]) .*" "\\1" 
>+@@ -57,7 +59,7 @@
>+ 	#compute the new command
>+ 	ADD_CUSTOM_COMMAND(
>+ 		OUTPUT ${_output}
>+-		COMMAND ${CMAKE_CXX_COMPILER} ${PCH_CXX_FLAGS} ${_compiler_FLAGS} -x c++-header -c -o ${_output} ${_source}
>++		COMMAND ${CMAKE_CXX_COMPILER} ${_CMAKE_CXX_COMPILER_ARG1} ${PCH_CXX_FLAGS} ${_compiler_FLAGS} -x c++-header -c -o ${_output} ${_source}
>+ 		DEPENDS ${_source}
>+ 	)
>+

Actions: View | Diff

Attachments on bug 156901: 115134 | 115135 | 115136 | 115137 | 115138 | 115139 | 115140 | 115141 | 115142 | 115143 | 115144 | 115145 | 115146 | 115147 | 115148 | 115149 | 115150 | 115151 | 115152 | 115153 | 115154 | 115155 | 115156