crtmpsever: add missing unistd.h inclusion for sysconf()
authorFlorian Fainelli <florian@openwrt.org>
Thu, 13 Mar 2014 16:52:13 +0000 (16:52 +0000)
committerFlorian Fainelli <florian@openwrt.org>
Thu, 13 Mar 2014 16:52:13 +0000 (16:52 +0000)
We were failing the build w/ GCC 4.8 on the sysconf() prototype due to a
missing include of unistd.h

Signed-off-by: Florian Fainelli <florian@openwrt.org>
SVN-Revision: 39922

multimedia/crtmpserver/patches/010-link-crypt-for-lua.patch
multimedia/crtmpserver/patches/020-add-rpath.patch
multimedia/crtmpserver/patches/030-default-config.patch
multimedia/crtmpserver/patches/040-use-select.patch
multimedia/crtmpserver/patches/050-add-missing-make-defines.patch
multimedia/crtmpserver/patches/060-add-dl-for-crypto.patch
multimedia/crtmpserver/patches/070-sysconf_unistd.patch [new file with mode: 0644]

index 4840ec40bb4ac21fdfeee7c1f7df1a7c6ce04188..ec758188eccc1605f2f183ff313b366579002b98 100644 (file)
@@ -1,7 +1,5 @@
-Index: crtmpserver-r692/builders/make/compile.mk
-===================================================================
---- crtmpserver-r692.orig/builders/make/compile.mk
-+++ crtmpserver-r692/builders/make/compile.mk
+--- a/builders/make/compile.mk
++++ b/builders/make/compile.mk
 @@ -67,7 +67,7 @@ TINYXML_OBJS = $(TINYXML_SRCS:.cpp=.tiny
  
  #common
index 83ebe561f550d0083328d7be111eb8c775b092c6..1ea832033517371126151ed5fb87d6def43b0dd0 100644 (file)
@@ -1,7 +1,5 @@
-Index: crtmpserver-r692/builders/make/linux.mk
-===================================================================
---- crtmpserver-r692.orig/builders/make/linux.mk
-+++ crtmpserver-r692/builders/make/linux.mk
+--- a/builders/make/linux.mk
++++ b/builders/make/linux.mk
 @@ -31,8 +31,8 @@ OPTIMIZATIONS = -O3
  COMPILE_FLAGS = $(FPIC) $(OPTIMIZATIONS) $(CFLAGS)
  
index a5031c98e73384ec30d7ead627cd703580e503ea..25134e29ba57c17b4774137eb8e645d505cfe1d3 100644 (file)
@@ -1,7 +1,5 @@
-Index: crtmpserver-r726/builders/cmake/crtmpserver/crtmpserver.lua
-===================================================================
---- crtmpserver-r726.orig/builders/cmake/crtmpserver/crtmpserver.lua
-+++ crtmpserver-r726/builders/cmake/crtmpserver/crtmpserver.lua
+--- a/builders/cmake/crtmpserver/crtmpserver.lua
++++ b/builders/cmake/crtmpserver/crtmpserver.lua
 @@ -44,7 +44,7 @@ configuration=
        {
                -- this is the root directory of all applications
index 466f86c9e698ec92e4adf3f70346b9a29e0b3178..380208e803c69659458245efc5bcd00fa8e6176c 100644 (file)
@@ -1,7 +1,5 @@
-Index: crtmpserver-r726/builders/make/linux.mk
-===================================================================
---- crtmpserver-r726.orig/builders/make/linux.mk
-+++ crtmpserver-r726/builders/make/linux.mk
+--- a/builders/make/linux.mk
++++ b/builders/make/linux.mk
 @@ -38,7 +38,7 @@ dynamic_exec_flags = $(FPIC) $(OPTIMIZAT
  PLATFORM_DEFINES = \
        -DLINUX \
index 43447b0040ffbd4de69179fc753c441c05507836..c4671f7313055e1b8321b6fdde8f528ef07ee19e 100644 (file)
@@ -1,7 +1,5 @@
-Index: crtmpserver-r726/builders/make/compile.mk
-===================================================================
---- crtmpserver-r726.orig/builders/make/compile.mk
-+++ crtmpserver-r726/builders/make/compile.mk
+--- a/builders/make/compile.mk
++++ b/builders/make/compile.mk
 @@ -43,10 +43,16 @@ FEATURES_DEFINES = \
        -DHAS_PROTOCOL_RTP \
        -DHAS_PROTOCOL_TS \
index cbd5daf2f89da2fc1e899fbd2be1c79eb094d378..3d2f602a077ead118c06786c522d25bc92772671 100644 (file)
@@ -1,8 +1,6 @@
-Index: crtmpserver-r726/builders/make/compile.mk
-===================================================================
---- crtmpserver-r726.orig/builders/make/compile.mk     2012-06-07 19:53:18.028378001 +0200
-+++ crtmpserver-r726/builders/make/compile.mk  2012-06-07 20:02:08.260400669 +0200
-@@ -59,7 +59,7 @@
+--- a/builders/make/compile.mk
++++ b/builders/make/compile.mk
+@@ -59,7 +59,7 @@ DEFINES = $(PLATFORM_DEFINES) $(FEATURES
  
  #library paths
  SSL_INCLUDE=-I$(SSL_BASE)/include
diff --git a/multimedia/crtmpserver/patches/070-sysconf_unistd.patch b/multimedia/crtmpserver/patches/070-sysconf_unistd.patch
new file mode 100644 (file)
index 0000000..c29be49
--- /dev/null
@@ -0,0 +1,10 @@
+--- a/sources/common/include/platform/linux/linuxplatform.h
++++ b/sources/common/include/platform/linux/linuxplatform.h
+@@ -59,6 +59,7 @@
+ #include <sys/socket.h>
+ #include <string.h>
+ #include <stdarg.h>
++#include <unistd.h>
+ using namespace std;