packages: libebml/libebml-makefile.patch, libebml/libebml.spec, libebml/lib...

glen glen at pld-linux.org
Thu Aug 5 22:00:24 CEST 2010


Author: glen                         Date: Thu Aug  5 20:00:24 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merge to main make patch

---- Files affected:
packages/libebml:
   libebml-makefile.patch (1.10 -> 1.11) , libebml.spec (1.28 -> 1.29) , libtool-tag.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/libebml/libebml-makefile.patch
diff -u packages/libebml/libebml-makefile.patch:1.10 packages/libebml/libebml-makefile.patch:1.11
--- packages/libebml/libebml-makefile.patch:1.10	Sun Jul 13 21:59:35 2008
+++ packages/libebml/libebml-makefile.patch	Thu Aug  5 22:00:18 2010
@@ -1,5 +1,5 @@
---- libebml-0.7.8/make/linux/Makefile.orig	2006-06-02 16:32:15.000000000 +0200
-+++ libebml-0.7.8/make/linux/Makefile	2008-07-13 21:37:16.422034707 +0200
+--- libebml-0.7.8/make/linux/Makefile	2008-07-13 21:37:16.422034707 +0200
++++ libebml-0.7.8/make/linux/Makefile	2010-08-05 22:54:21.405342023 +0300
 @@ -28,6 +28,7 @@
  INSTALL_OPTS = -m 644
  INSTALL_OPTS_LIB = -m 644
@@ -40,7 +40,7 @@
 -
  %.lo: %$(EXTENSION)
 -	$(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
-+	$(LIBTOOL) --mode=compile $(CXX) -c $(COMPILEFLAGS) -o $@ $<
++	$(LIBTOOL) --mode=compile --tag=CC $(CXX) -c $(COMPILEFLAGS) -o $@ $<
  
  $(LIBRARY): $(objects)
 -	$(AR) $@ $(objects)
@@ -50,7 +50,7 @@
 -	$(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 $(LD) $(LDFLAGS) -o $@ $^ $(LIBS) -rpath $(libdir)
++	$(LIBTOOL) --mode=link --tag=CC $(LD) $(LDFLAGS) -o $@ $^ $(LIBS) -rpath $(libdir)
  
  clean:
  	rm -f $(objects) $(objects_so)

================================================================
Index: packages/libebml/libebml.spec
diff -u packages/libebml/libebml.spec:1.28 packages/libebml/libebml.spec:1.29
--- packages/libebml/libebml.spec:1.28	Thu Aug  5 21:56:20 2010
+++ packages/libebml/libebml.spec	Thu Aug  5 22:00:18 2010
@@ -9,7 +9,6 @@
 Source0:	http://dl.matroska.org/downloads/libebml/%{name}-%{version}.tar.bz2
 # Source0-md5:	6278109f52e4f9d2c8a8dfc0d668b587
 Patch0:		%{name}-makefile.patch
-Patch1:		libtool-tag.patch
 URL:		http://www.matroska.org/
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool
@@ -53,7 +52,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__make} -C make/linux \
@@ -100,6 +98,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.29  2010/08/05 20:00:18  glen
+- merge to main make patch
+
 Revision 1.28  2010/08/05 19:56:20  glen
 - fix build with cc with spaces
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libebml/libebml-makefile.patch?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libebml/libebml.spec?r1=1.28&r2=1.29&f=u



More information about the pld-cvs-commit mailing list