Skip to content

Commit

Permalink
giblib: Fix mysterious libtool errors and set LICENSE.
Browse files Browse the repository at this point in the history
  • Loading branch information
alarixnia committed Nov 24, 2020
1 parent 22441f2 commit 1e5e3c3
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 2 deletions.
3 changes: 2 additions & 1 deletion devel/giblib/Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -8,6 +8,7 @@ MASTER_SITES= http://linuxbrit.co.uk/downloads/
MAINTAINER= pkgsrc-users@NetBSD.org
#HOMEPAGE= http://linuxbrit.co.uk/giblib/
COMMENT= Programming utility library
LICENSE= mit

GNU_CONFIGURE= YES
PKGCONFIG_OVERRIDE= giblib.pc.in
Expand Down
3 changes: 2 additions & 1 deletion devel/giblib/distinfo
Original file line number Diff line number Diff line change
@@ -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
36 changes: 36 additions & 0 deletions devel/giblib/patches/patch-giblib_Makefile.in
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 1e5e3c3

Please sign in to comment.