CVS commit: pkgsrc/print/qpdf

["Yorick Hardy" <yhardy%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   yhardy
Date:           Thu Dec 24 20:35:25 UTC 2020

Modified Files:
        pkgsrc/print/qpdf: distinfo
        pkgsrc/print/qpdf/patches: patch-make_libtool.mk

Log Message:
print/qpdf: make the libtool tags explicit

This fixes compiling on NetBSD/i386 (tested in a pbulk build),
in other cases the package build should remain unchanged.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/print/qpdf/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/print/qpdf/patches/patch-make_libtool.mk

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

Modified files:

Index: pkgsrc/print/qpdf/distinfo
diff -u pkgsrc/print/qpdf/distinfo:1.31 pkgsrc/print/qpdf/distinfo:1.32
--- pkgsrc/print/qpdf/distinfo:1.31     Fri Oct 30 15:13:31 2020
+++ pkgsrc/print/qpdf/distinfo  Thu Dec 24 20:35:25 2020
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.31 2020/10/30 15:13:31 ryoon Exp $
+$NetBSD: distinfo,v 1.32 2020/12/24 20:35:25 yhardy Exp $
 
 SHA1 (qpdf-10.0.2.tar.gz) = cc9b75a217562a9daecb42a4f613063b5b91aa34
 RMD160 (qpdf-10.0.2.tar.gz) = 188774ac119437e4d926d720c8619a78e11c73fa
 SHA512 (qpdf-10.0.2.tar.gz) = f1eec57dc76d0300296a1ec2f2d04bea8a75395ac480b37953d0da6924f96d13a258e4523893ef4e2ee89965686ae48f320886bc95120640fd3103cc3aed7032
 Size (qpdf-10.0.2.tar.gz) = 18458344 bytes
 SHA1 (patch-libqpdf.pc.in) = f592899487bb958a01931afbe4ddf3c749ea103e
-SHA1 (patch-make_libtool.mk) = 8622d6a446da284269102dde38bf14271363dfdc
+SHA1 (patch-make_libtool.mk) = bb639bd38ceec45fef03899a0a6d17a2aeb7717e

Index: pkgsrc/print/qpdf/patches/patch-make_libtool.mk
diff -u pkgsrc/print/qpdf/patches/patch-make_libtool.mk:1.3 pkgsrc/print/qpdf/patches/patch-make_libtool.mk:1.4
--- pkgsrc/print/qpdf/patches/patch-make_libtool.mk:1.3 Wed Oct 23 09:07:27 2013
+++ pkgsrc/print/qpdf/patches/patch-make_libtool.mk     Thu Dec 24 20:35:25 2020
@@ -1,8 +1,10 @@
-$NetBSD: patch-make_libtool.mk,v 1.3 2013/10/23 09:07:27 wiz Exp $
+$NetBSD: patch-make_libtool.mk,v 1.4 2020/12/24 20:35:25 yhardy Exp $
 
 libtool does not need bash.
 
---- make/libtool.mk.orig       2013-01-17 14:51:04.000000000 +0000
+make the libtool tags explicit (fixes compiling on NetBSD/i386).
+
+--- make/libtool.mk.orig       2020-10-27 15:57:48.000000000 +0000
 +++ make/libtool.mk
 @@ -1,7 +1,7 @@
  # --- Required interface definitions ---
@@ -13,3 +15,21 @@ libtool does not need bash.
  
  OBJ=o
  LOBJ=lo
+@@ -60,7 +60,7 @@ endef
+ #                          1   2
+ # Usage: $(call libcompile,src,includes)
+ define libcompile
+-      $(LIBTOOL) --quiet --mode=compile \
++      $(LIBTOOL) --quiet --mode=compile --tag=CXX \
+               $(CXX) $(CXXFLAGS) \
+               $(call libdepflags,$(basename $(call src_to_obj,$(1)))) \
+               $(foreach I,$(2),-I$(I)) \
+@@ -72,7 +72,7 @@ endef
+ #                          1   2
+ # Usage: $(call libcompile,src,includes)
+ define c_libcompile
+-      $(LIBTOOL) --quiet --mode=compile \
++      $(LIBTOOL) --quiet --mode=compile --tag=CC \
+               $(CC) $(CFLAGS) \
+               $(call libdepflags,$(basename $(call c_src_to_obj,$(1)))) \
+               $(foreach I,$(2),-I$(I)) \