CVS commit: pkgsrc/archivers/lz4

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Mar 17 12:39:50 UTC 2024

Modified Files:
        pkgsrc/archivers/lz4: Makefile PLIST distinfo
        pkgsrc/archivers/lz4/patches: patch-lib_Makefile

Log Message:
lz4: Libtoolize.

As well as making this package more portable to exotic linkers, it
can now take better advantage of make-level parallelism.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/archivers/lz4/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/archivers/lz4/PLIST
cvs rdiff -u -r1.25 -r1.26 pkgsrc/archivers/lz4/distinfo
cvs rdiff -u -r1.11 -r1.12 pkgsrc/archivers/lz4/patches/patch-lib_Makefile

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

Modified files:

Index: pkgsrc/archivers/lz4/Makefile
diff -u pkgsrc/archivers/lz4/Makefile:1.27 pkgsrc/archivers/lz4/Makefile:1.28
--- pkgsrc/archivers/lz4/Makefile:1.27  Thu Jun 15 10:03:34 2023
+++ pkgsrc/archivers/lz4/Makefile       Sun Mar 17 12:39:50 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2023/06/15 10:03:34 riastradh Exp $
+# $NetBSD: Makefile,v 1.28 2024/03/17 12:39:50 nia Exp $
 
 DISTNAME=      lz4-1.9.4
 CATEGORIES=    archivers
@@ -12,10 +12,13 @@ LICENSE=    2-clause-bsd
 
 USE_LANGUAGES=         c99 c++
 USE_TOOLS+=            gmake
+USE_LIBTOOL=           yes
 PKGCONFIG_OVERRIDE+=   lib/liblz4.pc.in
 BUILD_TARGET=          # empty
 TEST_TARGET=           test
 
+MAKE_FLAGS+=           PKGCONFIGDIR=${PREFIX}/lib/pkgconfig
+
 # Needed for nanosleep() on Solaris 10, PR pkg/56226
 LDFLAGS.SunOS+=                -lrt
 

Index: pkgsrc/archivers/lz4/PLIST
diff -u pkgsrc/archivers/lz4/PLIST:1.11 pkgsrc/archivers/lz4/PLIST:1.12
--- pkgsrc/archivers/lz4/PLIST:1.11     Thu May 10 13:16:27 2018
+++ pkgsrc/archivers/lz4/PLIST  Sun Mar 17 12:39:50 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2018/05/10 13:16:27 adam Exp $
+@comment $NetBSD: PLIST,v 1.12 2024/03/17 12:39:50 nia Exp $
 bin/lz4
 bin/lz4c
 bin/lz4cat
@@ -7,10 +7,7 @@ include/lz4.h
 include/lz4frame.h
 include/lz4frame_static.h
 include/lz4hc.h
-lib/liblz4.a
-lib/liblz4.so.${PKGVERSION}
-lib/liblz4.so
-lib/liblz4.so.1
+lib/liblz4.la
 lib/pkgconfig/liblz4.pc
 man/man1/lz4.1
 man/man1/lz4c.1

Index: pkgsrc/archivers/lz4/distinfo
diff -u pkgsrc/archivers/lz4/distinfo:1.25 pkgsrc/archivers/lz4/distinfo:1.26
--- pkgsrc/archivers/lz4/distinfo:1.25  Thu Jun 15 10:03:34 2023
+++ pkgsrc/archivers/lz4/distinfo       Sun Mar 17 12:39:50 2024
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.25 2023/06/15 10:03:34 riastradh Exp $
+$NetBSD: distinfo,v 1.26 2024/03/17 12:39:50 nia Exp $
 
 BLAKE2s (lz4-1.9.4.tar.gz) = 47eac8d4a549b2ab125e6b44d9c0acd1ed2c4d0e86054ecacc5f9704a0d4c208
 SHA512 (lz4-1.9.4.tar.gz) = 043a9acb2417624019d73db140d83b80f1d7c43a6fd5be839193d68df8fd0b3f610d7ed4d628c2a9184f7cde9a0fd1ba9d075d8251298e3eb4b3a77f52736684
 Size (lz4-1.9.4.tar.gz) = 354063 bytes
 SHA1 (patch-Makefile.inc) = 7f27fb9d4cde9c14623c8fce167990bec0332161
-SHA1 (patch-lib_Makefile) = 64441f91217cf5832f122ed32a31007b4a8dc5f4
+SHA1 (patch-lib_Makefile) = e62b85be5c4b9628f194398262a041f0309f2f6b
 SHA1 (patch-programs_Makefile) = bf3a8b296bfac8407c3e233c41fa037ba989876c

Index: pkgsrc/archivers/lz4/patches/patch-lib_Makefile
diff -u pkgsrc/archivers/lz4/patches/patch-lib_Makefile:1.11 pkgsrc/archivers/lz4/patches/patch-lib_Makefile:1.12
--- pkgsrc/archivers/lz4/patches/patch-lib_Makefile:1.11        Tue Aug 16 13:02:56 2022
+++ pkgsrc/archivers/lz4/patches/patch-lib_Makefile     Sun Mar 17 12:39:50 2024
@@ -1,6 +1,7 @@
-$NetBSD: patch-lib_Makefile,v 1.11 2022/08/16 13:02:56 adam Exp $
+$NetBSD: patch-lib_Makefile,v 1.12 2024/03/17 12:39:50 nia Exp $
 
-Make portable. Unlock install target. Use pkgsrc install scripts.
+Make portable (inc. libtoolize).
+Unlock install target. Use pkgsrc install scripts.
 
 --- lib/Makefile.orig  2022-08-15 22:45:31.000000000 +0000
 +++ lib/Makefile
@@ -17,25 +18,53 @@ Make portable. Unlock install target. Us
  LIBVER_SCRIPT:= $(LIBVER_MAJOR_SCRIPT).$(LIBVER_MINOR_SCRIPT).$(LIBVER_PATCH_SCRIPT)
  LIBVER_MAJOR := $(shell echo $(LIBVER_MAJOR_SCRIPT))
  LIBVER_MINOR := $(shell echo $(LIBVER_MINOR_SCRIPT))
-@@ -46,6 +46,7 @@ LIBVER  := $(shell echo $(LIBVER_SCRIPT)
- BUILD_SHARED:=yes
- BUILD_STATIC:=yes
- 
-+OS ?= $(shell uname)
- CPPFLAGS+= -DXXH_NAMESPACE=LZ4_
- CPPFLAGS+= $(MOREFLAGS)
- CFLAGS  ?= -O3
-@@ -162,29 +163,24 @@ libdir      ?= $(LIBDIR)
- INCLUDEDIR  ?= $(prefix)/include
- includedir  ?= $(INCLUDEDIR)
- 
--  ifneq (,$(filter $(TARGET_OS),OpenBSD FreeBSD NetBSD DragonFly MidnightBSD))
--PKGCONFIGDIR ?= $(prefix)/libdata/pkgconfig
--  else
--PKGCONFIGDIR ?= $(libdir)/pkgconfig
--  endif
--pkgconfigdir ?= $(PKGCONFIGDIR)
-+pkgconfigdir ?= $(prefix)/lib/pkgconfig
+@@ -56,6 +56,7 @@ CFLAGS  += $(DEBUGFLAGS)
+ FLAGS    = $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
+ 
+ SRCFILES := $(sort $(wildcard *.c))
++OBJFILES := $(patsubst %.c,%.lo,$(SRCFILES))
+ 
+ include ../Makefile.inc
+ 
+@@ -92,10 +93,13 @@ all: lib
+ all32: CFLAGS+=-m32
+ all32: all
+ 
+-liblz4.a: $(SRCFILES)
++.SUFFIXES: .lo
++.c.lo:
++      $(LIBTOOL) --mode=compile --tag=CC $(CC) $(CFLAGS) $(CPPFLAGS) -c $^ -o $@
++
++liblz4.a: $(OBJFILES)
+ ifeq ($(BUILD_STATIC),yes)  # can be disabled on command line
+       @echo compiling static library
+-      $(COMPILE.c) $^
+       $(AR) rcs $@ *.o
+ endif
+ 
+@@ -117,17 +121,13 @@ $(LIBLZ4): $(SRCFILES) liblz4-dll.o
+ 
+ else   # not windows
+ 
+-$(LIBLZ4): $(SRCFILES)
+-      @echo compiling dynamic library $(LIBVER)
+-      $(CC) $(FLAGS) -shared $^ -fPIC -fvisibility=hidden $(SONAME_FLAGS) -o $@
+-      @echo creating versioned links
+-      $(LN_SF) $@ liblz4.$(SHARED_EXT_MAJOR)
+-      $(LN_SF) $@ liblz4.$(SHARED_EXT)
+-
++liblz4.la: $(OBJFILES)
++      @echo linking dynamic library $(LIBVER)
++      $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -rpath $(PREFIX)/lib -version-info $(LIBVER_MAJOR):0 $^ -o $@
+ endif
+ 
+ .PHONY: liblz4
+-liblz4: $(LIBLZ4)
++liblz4: liblz4.la
+ 
+ .PHONY: clean
+ clean:
+@@ -171,20 +171,20 @@ pkgconfigdir ?= $(PKGCONFIGDIR)
  
  liblz4.pc: liblz4.pc.in Makefile
        @echo creating pkgconfig
@@ -65,14 +94,14 @@ Make portable. Unlock install target. Us
    endif
    ifeq ($(BUILD_SHARED),yes)
  # Traditionally, one installs the DLLs in the bin directory as programs
-@@ -194,15 +190,15 @@ install: lib liblz4.pc
+@@ -194,15 +194,13 @@ install: lib liblz4.pc
        $(INSTALL_PROGRAM) dll/$(LIBLZ4).dll $(DESTDIR)$(bindir)
        $(INSTALL_PROGRAM) dll/$(LIBLZ4_EXP) $(DESTDIR)$(libdir)
      else
 -      $(INSTALL_PROGRAM) liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(libdir)
-+      $(BSD_INSTALL_LIB) liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(libdir)
-       $(LN_SF) liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(libdir)/liblz4.$(SHARED_EXT_MAJOR)
-       $(LN_SF) liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(libdir)/liblz4.$(SHARED_EXT)
+-      $(LN_SF) liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(libdir)/liblz4.$(SHARED_EXT_MAJOR)
+-      $(LN_SF) liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(libdir)/liblz4.$(SHARED_EXT)
++      $(LIBTOOL) --mode install $(BSD_INSTALL_LIB) liblz4.la $(DESTDIR)$(libdir)
      endif
    endif
        @echo Installing headers in $(DESTDIR)$(includedir)