[pkgsrc/trunk]: pkgsrc libtoolize and build shared libraries,

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc libtoolize and build shared libraries,
From: drochner <drochner%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 05:29:25 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/db44b944aff8
branches:  trunk
changeset: 535343:db44b944aff8
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Wed Nov 14 18:20:05 2007 +0000

description:
libtoolize and build shared libraries,
this will make it usable in dynamically loaded plugins,
bump PKGREVISION

diffstat:

 devel/libebml/Makefile                  |   8 ++++--
 devel/libebml/PLIST                     |   4 +-
 devel/libebml/buildlink3.mk             |   4 +--
 devel/libebml/distinfo                  |   4 +-
 devel/libebml/patches/patch-aa          |  35 ++++++++++++++++++++++++++---
 multimedia/libmatroska/Makefile         |  12 +++++----
 multimedia/libmatroska/PLIST            |   4 +-
 multimedia/libmatroska/buildlink3.mk    |   4 +--
 multimedia/libmatroska/distinfo         |  10 ++++----
 multimedia/libmatroska/patches/patch-ac |  39 +++++++++++++++++++++++++++-----
 10 files changed, 89 insertions(+), 35 deletions(-)

diffs (273 lines):

diff -r 52414b64a9b3 -r db44b944aff8 devel/libebml/Makefile
--- a/devel/libebml/Makefile    Wed Nov 14 16:03:07 2007 +0000
+++ b/devel/libebml/Makefile    Wed Nov 14 18:20:05 2007 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2007/07/01 20:20:45 heinz Exp $
+# $NetBSD: Makefile,v 1.27 2007/11/14 18:20:05 drochner Exp $
 #
 
 DISTNAME=      libebml-0.7.7
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  http://dl.matroska.org/downloads/libebml/
 EXTRACT_SUFX=  .tar.bz2
@@ -15,12 +16,13 @@
 
 USE_TOOLS+=    gmake
 USE_LANGUAGES= c++
+USE_LIBTOOL=   yes
 
 NO_CONFIGURE=  yes
 MAKEFLAGS+=    prefix=${PREFIX:Q}
 MAKE_ENV+=     CXXFLAGS=${CXXFLAGS:M*:Q} RANLIB=${RANLIB:Q}
 BUILD_DIRS=    make/linux
-BUILD_TARGET=  staticlib
-INSTALL_TARGET=        install_headers install_staticlib
+BUILD_TARGET=  sharedlib
+INSTALL_TARGET=        install_headers install_sharedlib
 
 .include "../../mk/bsd.pkg.mk"
diff -r 52414b64a9b3 -r db44b944aff8 devel/libebml/PLIST
--- a/devel/libebml/PLIST       Wed Nov 14 16:03:07 2007 +0000
+++ b/devel/libebml/PLIST       Wed Nov 14 18:20:05 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2005/04/18 00:51:51 salo Exp $
+@comment $NetBSD: PLIST,v 1.5 2007/11/14 18:20:05 drochner Exp $
 include/ebml/Debug.h
 include/ebml/EbmlBinary.h
 include/ebml/EbmlConfig.h
@@ -25,6 +25,6 @@
 include/ebml/MemIOCallback.h
 include/ebml/StdIOCallback.h
 include/ebml/c/libebml_t.h
-lib/libebml.a
+lib/libebml.la
 @dirrm include/ebml/c
 @dirrm include/ebml
diff -r 52414b64a9b3 -r db44b944aff8 devel/libebml/buildlink3.mk
--- a/devel/libebml/buildlink3.mk       Wed Nov 14 16:03:07 2007 +0000
+++ b/devel/libebml/buildlink3.mk       Wed Nov 14 18:20:05 2007 +0000
@@ -1,10 +1,8 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/10/08 03:11:05 salo Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2007/11/14 18:20:05 drochner Exp $
 #
 # This Makefile fragment is included by packages that use libebml.
 #
 
-BUILDLINK_DEPMETHOD.libebml?=  build
-
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 LIBEBML_BUILDLINK3_MK:=        ${LIBEBML_BUILDLINK3_MK}+
 
diff -r 52414b64a9b3 -r db44b944aff8 devel/libebml/distinfo
--- a/devel/libebml/distinfo    Wed Nov 14 16:03:07 2007 +0000
+++ b/devel/libebml/distinfo    Wed Nov 14 18:20:05 2007 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.14 2007/07/01 20:20:45 heinz Exp $
+$NetBSD: distinfo,v 1.15 2007/11/14 18:20:05 drochner 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) = fb3f3869817ba1a0de98caf35abe22f7ff1b4716
+SHA1 (patch-aa) = ae431e3b2736642d4d0f0292c58cc5f513bcc89a
diff -r 52414b64a9b3 -r db44b944aff8 devel/libebml/patches/patch-aa
--- a/devel/libebml/patches/patch-aa    Wed Nov 14 16:03:07 2007 +0000
+++ b/devel/libebml/patches/patch-aa    Wed Nov 14 18:20:05 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.8 2007/07/01 20:20:45 heinz Exp $
+$NetBSD: patch-aa,v 1.9 2007/11/14 18:20:06 drochner Exp $
 
 --- make/linux/Makefile.orig   2006-03-30 21:05:11.000000000 +0200
 +++ make/linux/Makefile
@@ -24,7 +24,35 @@
  INSTALL_OPTS = -m 644
  INSTALL_OPTS_LIB = -m 644
  INSTALL_DIR_OPTS = -m 755
-@@ -125,23 +125,23 @@ install: install_staticlib install_share
+@@ -51,7 +51,7 @@ LIBS=
+ 
+ # Names
+ LIBRARY=libebml.a
+-LIBRARY_SO=libebml.so
++LIBRARY_SO=libebml.la
+ LIBRARY_SO_VER=libebml.so.0
+ 
+ # source-files
+@@ -87,16 +87,14 @@ lib:
+       $(CXX) -c $(COMPILEFLAGS) -o $@ $<
+ 
+ %.lo: %$(EXTENSION)
+-      $(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
++      $(LIBTOOL) --mode=compile $(CXX) -c $(COMPILEFLAGS) -o $@ $<
+ 
+ $(LIBRARY): $(objects)
+       $(AR) $@ $(objects)
+       $(RANLIB) $@
+ 
+ $(LIBRARY_SO): $(objects_so)
+-      $(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 $(CXX) -o $(LIBRARY_SO) $(objects_so) -rpath $(PREFIX)/lib -version-info 0
+ 
+ clean:
+       rm -f $(objects) $(objects_so)
+@@ -125,23 +123,22 @@ install: install_staticlib install_share
  endif
  
  install_headers:
@@ -52,8 +80,7 @@
 -      $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir)
 -      ln -s $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)
 +      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
-+      $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)
-+      ln -s $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)/$(LIBRARY_SO)
++      $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO) $(DESTDIR)$(libdir)
  
  
  ifneq ($(wildcard .depend),)
diff -r 52414b64a9b3 -r db44b944aff8 multimedia/libmatroska/Makefile
--- a/multimedia/libmatroska/Makefile   Wed Nov 14 16:03:07 2007 +0000
+++ b/multimedia/libmatroska/Makefile   Wed Nov 14 18:20:05 2007 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2007/07/01 20:23:19 heinz Exp $
+# $NetBSD: Makefile,v 1.22 2007/11/14 18:27:48 drochner Exp $
 #
 
-DISTNAME=      libmatroska-0.8.0
-PKGREVISION=   1
+DISTNAME=      libmatroska-0.8.1
 CATEGORIES=    multimedia devel
 MASTER_SITES=  http://dl.matroska.org/downloads/libmatroska/
 EXTRACT_SUFX=  .tar.bz2
@@ -16,15 +15,18 @@
 
 USE_TOOLS+=    gmake
 USE_LANGUAGES= c++
+USE_LIBTOOL=   yes
 
 NO_CONFIGURE=  yes
 MAKEFLAGS+=    prefix=${PREFIX:Q}
 MAKE_ENV+=     CXXFLAGS=${CXXFLAGS:M*:Q} RANLIB=${RANLIB:Q}
 BUILD_DIRS=    make/linux
-BUILD_TARGET=  staticlib
-INSTALL_TARGET=        install_headers install_staticlib
+BUILD_TARGET=  sharedlib
+INSTALL_TARGET=        install_headers install_sharedlib
 TEST_TARGET=   test
 
+# needed for libtoolization
+BUILDLINK_API_DEPENDS.libebml+=        libebml>=0.7.7nb1
 .include "../../devel/libebml/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r 52414b64a9b3 -r db44b944aff8 multimedia/libmatroska/PLIST
--- a/multimedia/libmatroska/PLIST      Wed Nov 14 16:03:07 2007 +0000
+++ b/multimedia/libmatroska/PLIST      Wed Nov 14 18:20:05 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2005/04/18 00:57:21 salo Exp $
+@comment $NetBSD: PLIST,v 1.3 2007/11/14 18:27:48 drochner Exp $
 include/matroska/FileKax.h
 include/matroska/KaxAttached.h
 include/matroska/KaxAttachments.h
@@ -27,6 +27,6 @@
 include/matroska/KaxVersion.h
 include/matroska/c/libmatroska.h
 include/matroska/c/libmatroska_t.h
-lib/libmatroska.a
+lib/libmatroska.la
 @dirrm include/matroska/c
 @dirrm include/matroska
diff -r 52414b64a9b3 -r db44b944aff8 multimedia/libmatroska/buildlink3.mk
--- a/multimedia/libmatroska/buildlink3.mk      Wed Nov 14 16:03:07 2007 +0000
+++ b/multimedia/libmatroska/buildlink3.mk      Wed Nov 14 18:20:05 2007 +0000
@@ -1,10 +1,8 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/07/08 23:11:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2007/11/14 18:27:48 drochner Exp $
 #
 # This Makefile fragment is included by packages that use libmatroska.
 #
 
-BUILDLINK_DEPMETHOD.libmatroska?=      build
-
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 LIBMATROSKA_BUILDLINK3_MK:=    ${LIBMATROSKA_BUILDLINK3_MK}+
 
diff -r 52414b64a9b3 -r db44b944aff8 multimedia/libmatroska/distinfo
--- a/multimedia/libmatroska/distinfo   Wed Nov 14 16:03:07 2007 +0000
+++ b/multimedia/libmatroska/distinfo   Wed Nov 14 18:20:05 2007 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.15 2007/07/01 20:23:19 heinz Exp $
+$NetBSD: distinfo,v 1.16 2007/11/14 18:27:48 drochner Exp $
 
-SHA1 (libmatroska-0.8.0.tar.bz2) = 7725d874dbf37ec7c41115804f091fa1554c6338
-RMD160 (libmatroska-0.8.0.tar.bz2) = e2fb6dcad7157373a271273a1a3ffc4428da9744
-Size (libmatroska-0.8.0.tar.bz2) = 90653 bytes
-SHA1 (patch-ac) = cd865ba47b6e1edf5988db2ff12ad9cd2f0dbc1c
+SHA1 (libmatroska-0.8.1.tar.bz2) = 8317c3a2a19f27a05c5dd289c3496c21a1d12456
+RMD160 (libmatroska-0.8.1.tar.bz2) = 195ca5fcf48653fea56e42ce4074d16447c680ac
+Size (libmatroska-0.8.1.tar.bz2) = 91381 bytes
+SHA1 (patch-ac) = 1fb682d09cb14bf1cfea1b396a3055bbf708383b
diff -r 52414b64a9b3 -r db44b944aff8 multimedia/libmatroska/patches/patch-ac
--- a/multimedia/libmatroska/patches/patch-ac   Wed Nov 14 16:03:07 2007 +0000
+++ b/multimedia/libmatroska/patches/patch-ac   Wed Nov 14 18:20:05 2007 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.7 2007/07/01 20:23:19 heinz Exp $
+$NetBSD: patch-ac,v 1.8 2007/11/14 18:27:48 drochner Exp $
 
---- make/linux/Makefile.orig   2005-04-19 09:00:00.000000000 +0200
+--- make/linux/Makefile.orig   2006-06-02 16:32:52.000000000 +0200
 +++ make/linux/Makefile
 @@ -16,15 +16,15 @@ prefix=/boot/home/config
  else
@@ -24,7 +24,35 @@
  INSTALL_OPTS = -m 644
  INSTALL_OPTS_LIB = -m 644
  INSTALL_DIR_OPTS = -m 755
-@@ -155,23 +155,23 @@ install: install_staticlib install_share
+@@ -56,7 +56,7 @@ MUX_LIBS=-lmatroska -lebml $(LIBICONV)
+ 
+ # Names
+ LIBRARY=libmatroska.a
+-LIBRARY_SO=libmatroska.so
++LIBRARY_SO=libmatroska.la
+ LIBRARY_SO_VER=libmatroska.so.0
+ 
+ # source-files
+@@ -95,16 +95,14 @@ lib:
+       $(CXX) -c $(COMPILEFLAGS) -o $@ $<
+ 
+ %.lo: %$(EXTENSION)
+-      $(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
++      $(LIBTOOL) --mode=compile $(CXX) -c $(COMPILEFLAGS) -o $@ $<
+ 
+ $(LIBRARY): $(objects)
+       $(AR) $@ $(objects)
+       $(RANLIB) $@
+ 
+ $(LIBRARY_SO): $(objects_so)
+-      $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -lebml
+-      rm -f $(LIBRARY_SO)
+-      ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)
++      $(LIBTOOL) --mode=link $(CXX) -o $(LIBRARY_SO) $(objects_so) -lebml -rpath $(PREFIX)/lib -version-info 0
+ 
+ clean:        cleantest
+       rm -f $(objects) $(objects_so)
+@@ -156,23 +154,22 @@ install: install_staticlib install_share
  endif
  
  install_headers:
@@ -50,10 +78,9 @@
  install_sharedlib: $(LIBRARY_SO)
 -      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
 -      $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir)
--      ln -s $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)
+-      ln -fs $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)
 +      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
-+      $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)
-+      ln -s $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)/$(LIBRARY_SO)
++      $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO) $(DESTDIR)$(libdir)
  
  ifneq ($(wildcard .depend),)
  include .depend
Prev by Date: [pkgsrc/trunk]: pkgsrc/sysutils/rox Some users don't have "." in their PATH, ...
Next by Date: [pkgsrc/trunk]: pkgsrc/devel Regenerate distfile digests.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/sysutils/rox Some users don't have "." in their PATH, ...
Next by Thread: [pkgsrc/trunk]: pkgsrc/devel Regenerate distfile digests.
Indexes:
Home | Main Index | Thread Index | Old Index