- updated to 1.3.0 (note: new soname)

[packages/libebml.git] / libebml-makefile.patch

diff --git a/libebml-makefile.patch b/libebml-makefile.patch
index 499abdfe48680832aeb6b355659392e58eff0d93..5c2f12f479cb21f4b787f7dc5118f754f2d254cc 100644 (file)
--- a/libebml-makefile.patch
+++ b/libebml-makefile.patch
@@ -1,6 +1,6 @@
---- libebml-1.0.0/make/linux/Makefile~ 2010-08-05 23:04:21.000000000 +0300
-+++ libebml-1.0.0/make/linux/Makefile  2010-08-05 23:04:54.438670198 +0300
-@@ -28,6 +28,7 @@
+--- libebml-1.3.0/make/linux/Makefile.orig     2013-03-22 22:37:42.558227596 +0100
++++ libebml-1.3.0/make/linux/Makefile  2013-03-22 22:38:41.438225125 +0100
+@@ -29,6 +29,7 @@
  INSTALL_OPTS = -m 644
  INSTALL_OPTS_LIB = -m 644
  INSTALL_DIR_OPTS = -m 755
@@ -8,18 +8,18 @@
  
  # Options
  EXTENSION=.cpp
-@@ -50,9 +51,7 @@
+@@ -47,9 +48,7 @@
  LIBS=
  
  # Names
 -LIBRARY=libebml.a
 -LIBRARY_SO=libebml.so
--LIBRARY_SO_VER=libebml.so.3
+-LIBRARY_SO_VER=libebml.so.4
 +LIBRARY=libebml.la
  
  # source-files
  sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))
-@@ -60,9 +59,8 @@
+@@ -57,9 +56,8 @@
  # header files; replace .cxx extension with .h
  headers:=$(patsubst %$(EXTENSION),%.h,$(sources))
  
@@ -29,9 +29,9 @@
 +# object files; replace .cxx extension with .lo
 +objects:=$(patsubst %$(EXTENSION),%.lo,$(sources))
  
- WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -Wshadow
+ WARNINGFLAGS=-Wall -Wextra -Wno-unknown-pragmas -ansi -fno-gnu-keywords -Wshadow
  COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE)
-@@ -78,20 +78,11 @@
+@@ -80,20 +78,11 @@
        @false
  
  # Build rules
@@ -40,7 +40,7 @@
 -
  %.lo: %$(EXTENSION)
 -      $(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
-+      $(LIBTOOL) --mode=compile --tag=CC $(CXX) -c $(COMPILEFLAGS) -o $@ $<
++      $(LIBTOOL) --mode=compile --tag=CXX $(CXX) -c $(COMPILEFLAGS) -o $@ $<
  
  $(LIBRARY): $(objects)
 -      $(AR) rcvu $@ $(objects)
@@ -50,11 +50,11 @@
 -      $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so)
 -      rm -f $(LIBRARY_SO)
 -      ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)
-+      $(LIBTOOL) --mode=link --tag=CC $(LD) $(LDFLAGS) -version-info 3:0:0 -o $@ $^ $(LIBS) -rpath $(libdir)
++      $(LIBTOOL) --mode=link --tag=CXX $(LD) $(LDFLAGS) -version-info 4:0:0 -o $@ $^ $(LIBS) -rpath $(libdir)
  
  clean:
        rm -f $(objects) $(objects_so)
-@@ -121,27 +110,22 @@
+@@ -118,27 +107,22 @@
  ifeq (Darwin,$(shell uname -s))
  install: install_staticlib install_headers
  else