CVS commit: pkgsrc/math/liblinear

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Feb  5 21:11:45 UTC 2024

Modified Files:
        pkgsrc/math/liblinear: Makefile distinfo
        pkgsrc/math/liblinear/patches: patch-Makefile patch-blas_Makefile

Log Message:
liblinear: updated to 2.47

Version 2.47 released on July 9, 2023. We fix some minor bugs.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/math/liblinear/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/math/liblinear/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/math/liblinear/patches/patch-Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/math/liblinear/patches/patch-blas_Makefile

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

Modified files:

Index: pkgsrc/math/liblinear/Makefile
diff -u pkgsrc/math/liblinear/Makefile:1.8 pkgsrc/math/liblinear/Makefile:1.9
--- pkgsrc/math/liblinear/Makefile:1.8  Fri Apr 16 06:48:04 2021
+++ pkgsrc/math/liblinear/Makefile      Mon Feb  5 21:11:45 2024
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2021/04/16 06:48:04 adam Exp $
+# $NetBSD: Makefile,v 1.9 2024/02/05 21:11:45 adam Exp $
 
-DISTNAME=      liblinear-2.43
+DISTNAME=      liblinear-2.47
 CATEGORIES=    math
 MASTER_SITES=  https://www.csie.ntu.edu.tw/~cjlin/liblinear/
 

Index: pkgsrc/math/liblinear/distinfo
diff -u pkgsrc/math/liblinear/distinfo:1.10 pkgsrc/math/liblinear/distinfo:1.11
--- pkgsrc/math/liblinear/distinfo:1.10 Tue Oct 26 10:55:47 2021
+++ pkgsrc/math/liblinear/distinfo      Mon Feb  5 21:11:45 2024
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.10 2021/10/26 10:55:47 nia Exp $
+$NetBSD: distinfo,v 1.11 2024/02/05 21:11:45 adam Exp $
 
-BLAKE2s (liblinear-2.43.tar.gz) = 1422d7065850b4fcc8429e92ff1b909b110a42f78ef179f8ab8aed7f73c2400f
-SHA512 (liblinear-2.43.tar.gz) = e64dac01a05b31600d749561ae7360a0c16887eed31236de6ab0187809d54f13842d96984fe3b331ee73ca22f3ae63c33604519cc7d93e77160ccde55eb8071c
-Size (liblinear-2.43.tar.gz) = 564336 bytes
-SHA1 (patch-Makefile) = e0e5171d00b484830dc3dcd8134fa9aa0c144701
-SHA1 (patch-blas_Makefile) = d829bdf80671d1eb95e78e4a7592f6fd3ffb7c46
+BLAKE2s (liblinear-2.47.tar.gz) = 82bd0b5cc4e09a180dabc4b7592d29674bf0f694adcf4b4177448fbcaab7cae5
+SHA512 (liblinear-2.47.tar.gz) = 0637f01db8526d640e90471d920a5cdef00f21ddb85e2d190cbd02c4c378047e366974000b34c587dc1a00a17638574b371a60045a6872c7685d5af88843ebea
+Size (liblinear-2.47.tar.gz) = 569095 bytes
+SHA1 (patch-Makefile) = 08b8531523442e9507ed9b03696e54110e386844
+SHA1 (patch-blas_Makefile) = 98f05f989f9ebdbc98caa566d6c26ef58cb3dbe8

Index: pkgsrc/math/liblinear/patches/patch-Makefile
diff -u pkgsrc/math/liblinear/patches/patch-Makefile:1.4 pkgsrc/math/liblinear/patches/patch-Makefile:1.5
--- pkgsrc/math/liblinear/patches/patch-Makefile:1.4    Wed Oct 28 19:32:33 2020
+++ pkgsrc/math/liblinear/patches/patch-Makefile        Mon Feb  5 21:11:45 2024
@@ -1,9 +1,9 @@
-$NetBSD: patch-Makefile,v 1.4 2020/10/28 19:32:33 adam Exp $
+$NetBSD: patch-Makefile,v 1.5 2024/02/05 21:11:45 adam Exp $
 
 Use LIBTOOL.
 Add support for LDFLAGS.
 
---- Makefile.orig      2020-07-29 09:11:00.000000000 +0000
+--- Makefile.orig      2023-07-09 12:45:51.000000000 +0000
 +++ Makefile
 @@ -1,34 +1,29 @@
  CXX ?= g++
@@ -11,19 +11,19 @@ Add support for LDFLAGS.
 -CFLAGS = -Wall -Wconversion -O3 -fPIC
 -LIBS = blas/blas.a
 +LIBS = blas/libblas.la
- SHVER = 4
--OS = $(shell uname)
  #LIBS = -lblas
+ SHVER = 5
+-OS = $(shell uname)
+-ifeq ($(OS),Darwin)
+-      SHARED_LIB_FLAG = -dynamiclib -Wl,-install_name,liblinear.so.$(SHVER)
+-else
+-      SHARED_LIB_FLAG = -shared -Wl,-soname,liblinear.so.$(SHVER)
+-endif
  
  all: train predict
  
 -lib: linear.o newton.o blas/blas.a
--      if [ "$(OS)" = "Darwin" ]; then \
--              SHARED_LIB_FLAG="-dynamiclib -Wl,-install_name,liblinear.so.$(SHVER)"; \
--      else \
--              SHARED_LIB_FLAG="-shared -Wl,-soname,liblinear.so.$(SHVER)"; \
--      fi; \
--      $(CXX) $${SHARED_LIB_FLAG} linear.o newton.o blas/blas.a -o liblinear.so.$(SHVER)
+-      $(CXX) $(SHARED_LIB_FLAG) linear.o newton.o blas/blas.a -o liblinear.so.$(SHVER)
 +lib: linear.lo newton.lo $(LIBS)
 +      ${LIBTOOL} --mode=link $(CXX) -o liblinear.la $(LDFLAGS) $> -rpath ${PREFIX}/lib -version-info ${SHVER}:0
  

Index: pkgsrc/math/liblinear/patches/patch-blas_Makefile
diff -u pkgsrc/math/liblinear/patches/patch-blas_Makefile:1.3 pkgsrc/math/liblinear/patches/patch-blas_Makefile:1.4
--- pkgsrc/math/liblinear/patches/patch-blas_Makefile:1.3       Fri Nov 10 16:18:47 2017
+++ pkgsrc/math/liblinear/patches/patch-blas_Makefile   Mon Feb  5 21:11:45 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-blas_Makefile,v 1.3 2017/11/10 16:18:47 khorben Exp $
+$NetBSD: patch-blas_Makefile,v 1.4 2024/02/05 21:11:45 adam Exp $
 
 Use LIBTOOL.
 Add support for LDFLAGS.
@@ -10,7 +10,7 @@ Add support for LDFLAGS.
  FFLAGS = $(OPTFLAGS)
  
 -blas: $(FILES) $(HEADERS)
--      $(AR) blas.a $(FILES)
+-      $(AR) rcv blas.a $(FILES)
 -      $(RANLIB) blas.a
 +blas: $(FILES:.o=.lo) $(HEADERS)
 +      $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o libblas.la $(LDFLAGS) $(FILES:.o=.lo)