[pkgsrc/trunk]: pkgsrc/devel/giblib giblib: Fix mysterious libtool errors and...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0f99f5b157fa
branches:  trunk
changeset: 442457:0f99f5b157fa
user:      nia <nia%pkgsrc.org@localhost>
date:      Tue Nov 24 17:10:43 2020 +0000

description:
giblib: Fix mysterious libtool errors and set LICENSE.

diffstat:

 devel/giblib/Makefile                         |   3 +-
 devel/giblib/distinfo                         |   3 +-
 devel/giblib/patches/patch-giblib_Makefile.in |  36 +++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 2 deletions(-)

diffs (70 lines):

diff -r 490b667de993 -r 0f99f5b157fa devel/giblib/Makefile
--- a/devel/giblib/Makefile     Tue Nov 24 17:07:03 2020 +0000
+++ b/devel/giblib/Makefile     Tue Nov 24 17:10:43 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2017/08/01 17:40:10 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2020/11/24 17:10:43 nia Exp $
 
 DISTNAME=              giblib-1.2.4
 PKGREVISION=           16
@@ -8,6 +8,7 @@
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 #HOMEPAGE=             http://linuxbrit.co.uk/giblib/
 COMMENT=               Programming utility library
+LICENSE=               mit
 
 GNU_CONFIGURE=         YES
 PKGCONFIG_OVERRIDE=    giblib.pc.in
diff -r 490b667de993 -r 0f99f5b157fa devel/giblib/distinfo
--- a/devel/giblib/distinfo     Tue Nov 24 17:07:03 2020 +0000
+++ b/devel/giblib/distinfo     Tue Nov 24 17:10:43 2020 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.5 2015/11/03 03:27:28 agc Exp $
+$NetBSD: distinfo,v 1.6 2020/11/24 17:10:43 nia Exp $
 
 SHA1 (giblib-1.2.4.tar.gz) = 342e6f7882c67d2277e1765299e1be5078329ab0
 RMD160 (giblib-1.2.4.tar.gz) = fb0cd140ff79c6e8ac34d0aa0fcc930ea7610736
 SHA512 (giblib-1.2.4.tar.gz) = 4866df223e6d219a5c9a327874bcd67260c83fba8f99862222df41ef86fb31efa0172a777bf46c853ca380dc2a64bbd41bf4fd658fcb84a924cab4e0f525dcfd
 Size (giblib-1.2.4.tar.gz) = 287653 bytes
 SHA1 (patch-aa) = 19e3d89366a6455df891fb843f6682d623023b0d
+SHA1 (patch-giblib_Makefile.in) = c2e844ea064a755ff62ca65529cd8ca581c13fc9
diff -r 490b667de993 -r 0f99f5b157fa devel/giblib/patches/patch-giblib_Makefile.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/giblib/patches/patch-giblib_Makefile.in     Tue Nov 24 17:10:43 2020 +0000
@@ -0,0 +1,36 @@
+$NetBSD: patch-giblib_Makefile.in,v 1.1 2020/11/24 17:10:44 nia Exp $
+
+libtool: compile: unable to infer tagged configuration
+libtool:   error: specify a tag with '--tag'
+
+--- giblib/Makefile.in.orig    2004-09-04 15:03:35.000000000 +0000
++++ giblib/Makefile.in
+@@ -124,9 +124,9 @@ libgiblib_la_OBJECTS =  gib_list.lo gib_
+ gib_style.lo gib_imlib.lo gib_stack.lo gib_utils.lo gib_queue.lo
+ CFLAGS = @CFLAGS@
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+ DATA =  $(installed_headers_DATA)
+ 
+ DIST_COMMON =  ./stamp-h.in Makefile.am Makefile.in giblib_config.h.in
+@@ -229,13 +229,13 @@ distclean-compile:
+ maintainer-clean-compile:
+ 
+ .c.lo:
+-      $(LIBTOOL) --mode=compile $(COMPILE) -c $<
++      $(LIBTOOL) --mode=compile --tag=CC $(COMPILE) -c $<
+ 
+ .s.lo:
+-      $(LIBTOOL) --mode=compile $(COMPILE) -c $<
++      $(LIBTOOL) --mode=compile --tag=CC $(COMPILE) -c $<
+ 
+ .S.lo:
+-      $(LIBTOOL) --mode=compile $(COMPILE) -c $<
++      $(LIBTOOL) --mode=compile --tag=CC $(COMPILE) -c $<
+ 
+ mostlyclean-libtool:
+       -rm -f *.lo