Commit f5470b58 authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen

contribs: Fix ebml & openjpeg patches line endings

parent bdddf208
...@@ -2,21 +2,21 @@ diff -ru libebml.orig/make/linux/Makefile libebml/make/linux/Makefile ...@@ -2,21 +2,21 @@ diff -ru libebml.orig/make/linux/Makefile libebml/make/linux/Makefile
--- libebml.orig/make/linux/Makefile 2011-08-03 13:39:21.000000000 +0300 --- libebml.orig/make/linux/Makefile 2011-08-03 13:39:21.000000000 +0300
+++ libebml/make/linux/Makefile 2011-08-03 13:39:57.000000000 +0300 +++ libebml/make/linux/Makefile 2011-08-03 13:39:57.000000000 +0300
@@ -59,7 +59,7 @@ @@ -59,7 +59,7 @@
# object files; replace .cxx extension with .o # object files; replace .cxx extension with .o
objects:=$(patsubst %$(EXTENSION),%.o,$(sources)) objects:=$(patsubst %$(EXTENSION),%.o,$(sources))
-objects_so:=$(patsubst %$(EXTENSION),%.lo,$(sources)) -objects_so:=$(patsubst %$(EXTENSION),%.lo,$(sources))
+objects_so:=$(objects) +objects_so:=$(objects)
WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -Wshadow WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -Wshadow
COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE) COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE)
@@ -81,9 +81,6 @@ @@ -81,9 +81,6 @@
# Build rules # Build rules
%.o: %$(EXTENSION) %.o: %$(EXTENSION)
- $(CXX) -c $(COMPILEFLAGS) -o $@ $< - $(CXX) -c $(COMPILEFLAGS) -o $@ $<
- -
-%.lo: %$(EXTENSION) -%.lo: %$(EXTENSION)
$(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $< $(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
$(LIBRARY): $(objects) $(LIBRARY): $(objects)
--- libebml-1.3.0/make/linux/Makefile.orig 2013-07-04 19:08:40.474927603 +0200 --- libebml-1.3.0/make/linux/Makefile.orig 2013-07-04 19:08:40.474927603 +0200
+++ libebml-1.3.0/make/linux/Makefile 2013-07-04 19:09:09.568664476 +0200 +++ libebml-1.3.0/make/linux/Makefile 2013-07-04 19:09:09.568664476 +0200
@@ -61,7 +61,7 @@ @@ -61,7 +61,7 @@
objects:=$(patsubst %$(EXTENSION),%.o,$(sources)) objects:=$(patsubst %$(EXTENSION),%.o,$(sources))
objects_so:=$(objects) objects_so:=$(objects)
-WARNINGFLAGS=-Wall -Wextra -Wno-unknown-pragmas -ansi -fno-gnu-keywords -Wshadow -WARNINGFLAGS=-Wall -Wextra -Wno-unknown-pragmas -ansi -fno-gnu-keywords -Wshadow
+WARNINGFLAGS=-Wall -Wextra -Wno-unknown-pragmas -fno-gnu-keywords -Wshadow +WARNINGFLAGS=-Wall -Wextra -Wno-unknown-pragmas -fno-gnu-keywords -Wshadow
COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE) COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE)
DEPENDFLAGS = $(CXXFLAGS) $(INCLUDE) DEPENDFLAGS = $(CXXFLAGS) $(INCLUDE)
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
*************** ***************
*** 83,88 **** *** 83,88 ****
--- 83,90 ---- --- 83,90 ----
#else /* Not _WIN32 */ #else /* Not _WIN32 */
#if defined(__sun) #if defined(__sun)
#define HAVE_MEMALIGN #define HAVE_MEMALIGN
+ #elif defined(__FreeBSD__) + #elif defined(__FreeBSD__)
+ #define HAVE_POSIX_MEMALIGN + #define HAVE_POSIX_MEMALIGN
/* Linux x86_64 and OSX always align allocations to 16 bytes */ /* Linux x86_64 and OSX always align allocations to 16 bytes */
#elif !defined(__amd64__) && !defined(__APPLE__) #elif !defined(__amd64__) && !defined(__APPLE__)
#define HAVE_MEMALIGN #define HAVE_MEMALIGN
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment