CVS commit: pkgsrc/devel/skalibs

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel/skalibs
From: "Amitai Schleier" <schmonz%netbsd.org@localhost>
Date: Sun, 15 Dec 2019 19:03:51 +0000

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sun Dec 15 19:03:51 UTC 2019

Modified Files:
        pkgsrc/devel/skalibs: Makefile PLIST distinfo
        pkgsrc/devel/skalibs/patches: patch-configure
Added Files:
        pkgsrc/devel/skalibs/patches: patch-Makefile

Log Message:
Update to 2.9.1.0. From the changelog:

- Bugfixes.
- Better support for GNU Hurd.
- Added path_canonicalize().
- Better support of out-of-path toolchains (among other things, that
  means better autotools emulation).
- Build more friendly to recent glibc.
- Refactoring and optimization of scanning and formatting functions.
- Refactoring of stopwatch/wallclock functions. The --enable-clock and
  --enable-monotonic configure switches have been removed. tain_now()
  can now be set at run time to use a wall clock (default, or via
  tain_now_set_wallclock()) or a stopwatch (via
  tain_now_set_stopwatch()), instead of it being fixed at build time.
- Easy cross-compilation: no need to provide a whole sysdeps directory
  anymore. Only a few sysdeps have to be provided manually, via a
  --with-sysdep-K=V option to configure. Currently, that means one:
  --with-sysdep-devurandom=yes|no

pkgsrc changes:

- Libtoolize for shared libraries on Darwin.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/skalibs/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/skalibs/PLIST \
    pkgsrc/devel/skalibs/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/skalibs/patches/patch-Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/skalibs/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/skalibs/Makefile
diff -u pkgsrc/devel/skalibs/Makefile:1.5 pkgsrc/devel/skalibs/Makefile:1.6
--- pkgsrc/devel/skalibs/Makefile:1.5   Sun Nov  3 10:39:30 2019
+++ pkgsrc/devel/skalibs/Makefile       Sun Dec 15 19:03:51 2019
@@ -1,25 +1,24 @@
-# $NetBSD: Makefile,v 1.5 2019/11/03 10:39:30 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2019/12/15 19:03:51 schmonz Exp $
 
-DISTNAME=              skalibs-2.8.1.0
+DISTNAME=              skalibs-2.9.1.0
 CATEGORIES=            devel
-MASTER_SITES=          http://skarnet.org/software/skalibs/
+MASTER_SITES=          ${HOMEPAGE}
 
 MAINTAINER=            cfkoch%edgebsd.org@localhost
-HOMEPAGE=              http://skarnet.org/software/skalibs/
+HOMEPAGE=              https://skarnet.org/software/skalibs/
 COMMENT=               The skarnet.org C system programming library
 LICENSE=               isc
 
 USE_LANGUAGES=         c
 HAS_CONFIGURE=         yes
 USE_TOOLS+=            gmake
+USE_LIBTOOL=           yes
 
 CONFIGURE_ARGS+=       --prefix=${PREFIX:Q}
 
-PLIST_VARS+=                   include-shared-objects
-.if "${OPSYS}" == "Darwin"
-CONFIGURE_ARGS+=               "--disable-shared"
-.else
-PLIST.include-shared-objects=  yes
-.endif
+INSTALLATION_DIRS=     include/skalibs lib/skalibs/sysdeps
+
+post-install:
+       ${LN} -s ../libskarnet.a ${DESTDIR}${PREFIX}/lib/skalibs/libskarnet.a
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/skalibs/PLIST
diff -u pkgsrc/devel/skalibs/PLIST:1.4 pkgsrc/devel/skalibs/PLIST:1.5
--- pkgsrc/devel/skalibs/PLIST:1.4      Thu Jun 20 16:43:38 2019
+++ pkgsrc/devel/skalibs/PLIST  Sun Dec 15 19:03:51 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2019/06/20 16:43:38 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.5 2019/12/15 19:03:51 schmonz Exp $
 include/skalibs/alarm.h
 include/skalibs/alloc.h
 include/skalibs/allreadwrite.h
@@ -7,6 +7,7 @@ include/skalibs/avltree.h
 include/skalibs/avltreen.h
 include/skalibs/biguint.h
 include/skalibs/bitarray.h
+include/skalibs/bsdsnowflake.h
 include/skalibs/bufalloc.h
 include/skalibs/buffer.h
 include/skalibs/bytestr.h
@@ -80,17 +81,12 @@ include/skalibs/unixconnection.h
 include/skalibs/unixmessage.h
 include/skalibs/unixonacid.h
 include/skalibs/webipc.h
-${PLIST.include-shared-objects}lib/libskarnet.so
-${PLIST.include-shared-objects}lib/libskarnet.so.${PKGVERSION}
-${PLIST.include-shared-objects}lib/libskarnet.so.2.8
-${PLIST.include-shared-objects}lib/libskarnet.so.2.8.1
+lib/libskarnet.la
 lib/skalibs/libskarnet.a
 lib/skalibs/sysdeps/socket.lib
 lib/skalibs/sysdeps/spawn.lib
 lib/skalibs/sysdeps/sysclock.lib
 lib/skalibs/sysdeps/sysdeps
-lib/skalibs/sysdeps/sysdeps.h
-lib/skalibs/sysdeps/tainnow.lib
 lib/skalibs/sysdeps/target
 lib/skalibs/sysdeps/timer.lib
 lib/skalibs/sysdeps/util.lib
Index: pkgsrc/devel/skalibs/distinfo
diff -u pkgsrc/devel/skalibs/distinfo:1.4 pkgsrc/devel/skalibs/distinfo:1.5
--- pkgsrc/devel/skalibs/distinfo:1.4   Thu Jun 20 00:56:58 2019
+++ pkgsrc/devel/skalibs/distinfo       Sun Dec 15 19:03:51 2019
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.4 2019/06/20 00:56:58 schmonz Exp $
+$NetBSD: distinfo,v 1.5 2019/12/15 19:03:51 schmonz Exp $
 
-SHA1 (skalibs-2.8.1.0.tar.gz) = c154cc05a2002fb98b6813137635831d1c08d6ae
-RMD160 (skalibs-2.8.1.0.tar.gz) = cf958c0a2f1324b5e514330fed42c3c752cbb4fd
-SHA512 (skalibs-2.8.1.0.tar.gz) = d2717e6f034af22a7b2ce31b019f30cfa270f64c61549db7b60b319defc5236fc6b58d29a4dae0f740ffdf32180b1940630f4239ea40cbedfcc5861398d20d86
-Size (skalibs-2.8.1.0.tar.gz) = 227598 bytes
-SHA1 (patch-configure) = af618b209224dd5d459e1be7104cb4a142375f05
+SHA1 (skalibs-2.9.1.0.tar.gz) = 1383fba2eda9fd8f9a4da6f3e1bafb16a653a1c9
+RMD160 (skalibs-2.9.1.0.tar.gz) = 255a9abd95fbf682a9806e9997c476766bde3d93
+SHA512 (skalibs-2.9.1.0.tar.gz) = a85a9397cdb10cbc42fd7ef4984a77802cf8c42abeabc8ff18de6d2e11ff97d950418aeda5f2dd66a04bd30004a5c4608e7cc6f4c7e23b91f56ef1ff59f4b6d5
+Size (skalibs-2.9.1.0.tar.gz) = 229792 bytes
+SHA1 (patch-Makefile) = de73069f302d5d5acf54f256e72c453773035ef8
+SHA1 (patch-configure) = 7fd2bd9432a5ea94f70eb0bda187dcabf4d2f6dc

Index: pkgsrc/devel/skalibs/patches/patch-configure
diff -u pkgsrc/devel/skalibs/patches/patch-configure:1.2 pkgsrc/devel/skalibs/patches/patch-configure:1.3
--- pkgsrc/devel/skalibs/patches/patch-configure:1.2    Sun Aug 26 19:35:42 2018
+++ pkgsrc/devel/skalibs/patches/patch-configure        Sun Dec 15 19:03:51 2019
@@ -1,10 +1,11 @@
-$NetBSD: patch-configure,v 1.2 2018/08/26 19:35:42 schmonz Exp $
+$NetBSD: patch-configure,v 1.3 2019/12/15 19:03:51 schmonz Exp $
 
 Lower _XOPEN_SOURCE to fix SmartOS build.
+Libtoolize for shared libraries on Darwin.
 
---- configure.orig     2018-05-03 07:14:29.000000000 +0000
+--- configure.orig     2019-09-20 21:59:33.000000000 +0000
 +++ configure
-@@ -211,7 +211,7 @@ trylibs () {
+@@ -335,7 +335,7 @@ trylibs () {
  # Actual script
  
  CC_AUTO=
@@ -13,3 +14,12 @@ Lower _XOPEN_SOURCE to fix SmartOS build
  CPPFLAGS_POST="$CPPFLAGS"
  CPPFLAGS=
  CFLAGS_AUTO="-pipe -Wall"
+@@ -685,7 +685,7 @@ else
+   echo "STATIC_LIBS :="
+ fi
+ if $shared ; then
+-  echo "SHARED_LIBS := libskarnet.so.xyzzy"
++  echo "SHARED_LIBS := libskarnet.la"
+ else
+   echo "SHARED_LIBS :="
+ fi

Added files:

Index: pkgsrc/devel/skalibs/patches/patch-Makefile
diff -u /dev/null pkgsrc/devel/skalibs/patches/patch-Makefile:1.1
--- /dev/null   Sun Dec 15 19:03:51 2019
+++ pkgsrc/devel/skalibs/patches/patch-Makefile Sun Dec 15 19:03:51 2019
@@ -0,0 +1,66 @@
+$NetBSD: patch-Makefile,v 1.1 2019/12/15 19:03:51 schmonz Exp $
+
+Libtoolize for shared libraries on Darwin.
+
+--- Makefile.orig      2019-09-19 14:00:38.000000000 +0000
++++ Makefile
+@@ -17,6 +17,8 @@ CC = $(error Please use ./configure firs
+ -include config.mak
+ include package/deps.mak
+ 
++LIBTOOL=libtool --tag=CC
++
+ version_m := $(basename $(version))
+ version_M := $(basename $(version_m))
+ version_l := $(basename $(version_M))
+@@ -79,8 +81,8 @@ endif
+ install: install-data install-sysdeps install-dynlib install-lib install-include
+ install-data: $(ALL_DATA:src/etc/%=$(DESTDIR)$(datadir)/%)
+ install-sysdeps: $(ALL_SYSDEPS:$(sysdeps)/%=$(DESTDIR)$(sysdepdir)/%)
+-install-dynlib: $(SHARED_LIBS:lib%.so.xyzzy=$(DESTDIR)$(dynlibdir)/lib%.so)
+-install-lib: $(STATIC_LIBS:lib%.a.xyzzy=$(DESTDIR)$(libdir)/lib%.a)
++install-dynlib: $(SHARED_LIBS:lib%.la=$(DESTDIR)$(dynlibdir)/lib%.la)
++install-lib: 
+ install-include: $(ALL_INCLUDES:src/include/$(package)/%.h=$(DESTDIR)$(includedir)/$(package)/%.h)
+ 
+ ifneq ($(exthome),)
+@@ -105,30 +107,22 @@ $(DESTDIR)$(datadir)/%: src/etc/%
+ $(DESTDIR)$(sysdepdir)/%: $(sysdeps)/%
+       exec $(INSTALL) -D -m 644 $< $@
+ 
+-$(DESTDIR)$(dynlibdir)/%.so: %.so.xyzzy
+-      $(INSTALL) -D -m 755 $< $@.$(version) && \
+-      $(INSTALL) -l $(@F).$(version) $@.$(version_m) && \
+-      $(INSTALL) -l $(@F).$(version_m) $@.$(version_M) && \
+-      exec $(INSTALL) -l $(@F).$(version_M) $@
+-
+-$(DESTDIR)$(libdir)/lib%.a: lib%.a.xyzzy
+-      exec $(INSTALL) -D -m 644 $< $@
++$(DESTDIR)$(dynlibdir)/%.la: %.la
++      exec $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) $< $@
+ 
+ $(DESTDIR)$(includedir)/$(package)/%.h: src/include/$(package)/%.h
+       exec $(INSTALL) -D -m 644 $< $@
+ 
+-%.o: %.c
+-      exec $(CC) $(CPPFLAGS_ALL) $(CFLAGS_ALL) -c -o $@ $<
+-
+ %.lo: %.c
+-      exec $(CC) $(CPPFLAGS_ALL) $(CFLAGS_ALL) $(CFLAGS_SHARED) -c -o $@ $<
++      exec $(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS_ALL) $(CFLAGS_ALL) $(CFLAGS_SHARED) -c -o $@ $<
++
++libskarnet.a.xyzzy: libskarnet.la
+ 
+-libskarnet.a.xyzzy: $(ALL_SOBJS)
+-      exec $(AR) rc $@ $^
+-      exec $(RANLIB) $@
++libskarnet.la: libtool-version-number $(ALL_DOBJS)
++      exec $(LIBTOOL) --mode=link $(CC) -o $@ $(CFLAGS_ALL) $(CFLAGS_SHARED) $(LDFLAGS_ALL) $^ $(SOCKET_LIB) $(SPAWN_LIB) $(SYSCLOCK_LIB) $(TAINNOW_LIB) $(TIMER_LIB) $(UTIL_LIB) -version-number 
`cat libtool-version-number` -rpath $(dynlibdir)
+ 
+-libskarnet.so.xyzzy: $(ALL_DOBJS)
+-      exec $(CC) -o $@ $(CFLAGS_ALL) $(CFLAGS_SHARED) $(LDFLAGS_ALL) $(LDFLAGS_SHARED) -Wl,-soname,libskarnet.so.$(version_M) $^ $(SOCKET_LIB) $(SPAWN_LIB) $(SYSCLOCK_LIB) $(TAINNOW_LIB) 
$(TIMER_LIB) $(UTIL_LIB)
++libtool-version-number:
++      echo $(version_m) | awk -F. '{ printf "%d:%d:%d", $$1, $$2, $$3 }' > $@
+ 
+ .PHONY: it all clean distclean tgz strip install install-data install-sysdeps install-dynlib install-lib install-include
+

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index