irrlicht: fix patches to have DOS line endings

Fixes:

  http://autobuild.buildroot.net/results/6260307da8acd45eb7611b08e2527a20ee5b357e/

Thanks to Romain Naour for providing the proper patches.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/irrlicht/0001-override-CPPFLAGS-CXXFLAGS-and-CFLAGS-in-Makefile.patch b/package/irrlicht/0001-override-CPPFLAGS-CXXFLAGS-and-CFLAGS-in-Makefile.patch
index 0bb8fcc0b4f275a745c302c9416252e0c79fe156..d6e4b63fd7aa35c9f14c886446a8152b47e3b4a9 100644 (file)
--- a/package/irrlicht/0001-override-CPPFLAGS-CXXFLAGS-and-CFLAGS-in-Makefile.patch
+++ b/package/irrlicht/0001-override-CPPFLAGS-CXXFLAGS-and-CFLAGS-in-Makefile.patch
@@ -20,25 +20,25 @@ index 0712b07..b334e9c 100644
 --- a/source/Irrlicht/Makefile
 +++ b/source/Irrlicht/Makefile
 @@ -62,7 +62,7 @@ LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \
- ###############
- #Compiler flags
- CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng
--CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1
-+override CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1
- CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing
- ifndef NDEBUG
- CXXFLAGS += -g -D_DEBUG
+ ###############\r
+ #Compiler flags\r
+ CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng\r
+-CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1\r
++override CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1\r
+ CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing\r
+ ifndef NDEBUG\r
+ CXXFLAGS += -g -D_DEBUG\r
 @@ -74,8 +74,8 @@ CXXFLAGS += -pg
- endif
- CFLAGS := -O3 -fexpensive-optimizations -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
- 
--sharedlib sharedlib_osx: CXXFLAGS += -fPIC
--sharedlib sharedlib_osx: CFLAGS += -fPIC
-+sharedlib sharedlib_osx: override CXXFLAGS += -fPIC
-+sharedlib sharedlib_osx: override CFLAGS += -fPIC
- 
- #multilib handling
- ifeq ($(HOSTTYPE), x86_64)
+ endif\r
+ CFLAGS := -O3 -fexpensive-optimizations -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES\r
+ \r
+-sharedlib sharedlib_osx: CXXFLAGS += -fPIC\r
+-sharedlib sharedlib_osx: CFLAGS += -fPIC\r
++sharedlib sharedlib_osx: override CXXFLAGS += -fPIC\r
++sharedlib sharedlib_osx: override CFLAGS += -fPIC\r
+ \r
+ #multilib handling\r
+ ifeq ($(HOSTTYPE), x86_64)\r
 -- 
 2.9.3
 

diff --git a/package/irrlicht/0002-remove-sys-sysctl.h.patch b/package/irrlicht/0002-remove-sys-sysctl.h.patch
index 2e5fc63e6f8a9eb8930ea16e7c3cad92471e4f8b..d9142a9a22e82ba7c0d9eef046312dd388f6390d 100644 (file)
--- a/package/irrlicht/0002-remove-sys-sysctl.h.patch
+++ b/package/irrlicht/0002-remove-sys-sysctl.h.patch
@@ -26,13 +26,13 @@ index 0899d1d..ccf5ef5 100644
 --- a/source/Irrlicht/COSOperator.cpp
 +++ b/source/Irrlicht/COSOperator.cpp
 @@ -13,7 +13,6 @@
- #include <unistd.h>
- #ifndef _IRR_SOLARIS_PLATFORM_
- #include <sys/types.h>
--#include <sys/sysctl.h>
- #endif
- #endif
- 
+ #include <unistd.h>\r
+ #ifndef _IRR_SOLARIS_PLATFORM_\r
+ #include <sys/types.h>\r
+-#include <sys/sysctl.h>\r
+ #endif\r
+ #endif\r
+ \r
 -- 
 2.9.3