Update to 0.7.8:

Fixes for gcc 4.3.
Source code cleanup.
Build fixes.
This commit is contained in:
wiz 2008-04-28 09:48:13 +00:00
parent 63296f68c0
commit 8f7d63e7ee
3 changed files with 15 additions and 38 deletions

View file

@ -1,8 +1,7 @@
# $NetBSD: Makefile,v 1.27 2007/11/14 18:20:05 drochner Exp $
# $NetBSD: Makefile,v 1.28 2008/04/28 09:48:13 wiz Exp $
#
DISTNAME= libebml-0.7.7
PKGREVISION= 1
DISTNAME= libebml-0.7.8
CATEGORIES= devel
MASTER_SITES= http://dl.matroska.org/downloads/libebml/
EXTRACT_SUFX= .tar.bz2

View file

@ -1,6 +1,6 @@
$NetBSD: distinfo,v 1.15 2007/11/14 18:20:05 drochner Exp $
$NetBSD: distinfo,v 1.16 2008/04/28 09:48:13 wiz Exp $
SHA1 (libebml-0.7.7.tar.bz2) = e79f98968c8566c95637616c4419697e0adbecca
RMD160 (libebml-0.7.7.tar.bz2) = d42ec6606a16cc9b38cff501e14929853136fa0b
Size (libebml-0.7.7.tar.bz2) = 56527 bytes
SHA1 (patch-aa) = ae431e3b2736642d4d0f0292c58cc5f513bcc89a
SHA1 (libebml-0.7.8.tar.bz2) = 2b1b9a8f4bc2a5b6a709f00ec520353dcc0a1d18
RMD160 (libebml-0.7.8.tar.bz2) = 73e196e03df254536e20aa390acc0c2c79940054
Size (libebml-0.7.8.tar.bz2) = 58121 bytes
SHA1 (patch-aa) = 8293712ad0d7f6c8bba8546c3bab9373feadbdca

View file

@ -1,6 +1,6 @@
$NetBSD: patch-aa,v 1.9 2007/11/14 18:20:06 drochner Exp $
$NetBSD: patch-aa,v 1.10 2008/04/28 09:48:13 wiz Exp $
--- make/linux/Makefile.orig 2006-03-30 21:05:11.000000000 +0200
--- make/linux/Makefile.orig 2006-06-02 16:32:15.000000000 +0200
+++ make/linux/Makefile
@@ -16,15 +16,15 @@ prefix=/boot/home/config
else
@ -8,8 +8,8 @@ $NetBSD: patch-aa,v 1.9 2007/11/14 18:20:06 drochner Exp $
endif
-libdir=$(prefix)/lib
-includedir=$(prefix)/include/ebml
+libdir=$(PREFIX)/lib
+includedir=$(PREFIX)/include/ebml
+libdir=$(DESTDIR)$(PREFIX)/lib
+includedir=$(DESTDIR)$(PREFIX)/include/ebml
# Programs
-CXX=g++
@ -52,35 +52,13 @@ $NetBSD: patch-aa,v 1.9 2007/11/14 18:20:06 drochner Exp $
clean:
rm -f $(objects) $(objects_so)
@@ -125,23 +123,22 @@ install: install_staticlib install_share
endif
install_headers:
- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)
+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)
for i in $(INCLUDE_DIR)/*.h; do \
- $(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \
+ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \
done
- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/c
+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/c
for i in $(INCLUDE_DIR)/c/*.h; do \
- $(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \
+ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \
done
install_staticlib: $(LIBRARY)
- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)
+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
+ $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(DESTDIR)$(libdir)
@@ -140,8 +138,7 @@ install_staticlib: $(LIBRARY)
install_sharedlib: $(LIBRARY_SO)
- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
$(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir)
- ln -s $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)
+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
+ $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO) $(DESTDIR)$(libdir)
- ln -fs $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)
+ $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO) $(libdir)
ifneq ($(wildcard .depend),)