Mon Jan 15 08:51:55 2018 UTC ()
jq: fixed dynamic linking (now bin/jq is tiny); cleaned pkglint warnings


(adam)
diff -r1.11 -r1.12 pkgsrc/devel/jq/Makefile
diff -r1.7 -r1.8 pkgsrc/devel/jq/distinfo
diff -r0 -r1.1 pkgsrc/devel/jq/patches/patch-Makefile.in
cvs diff -r1.11 -r1.12 pkgsrc/devel/jq/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/jq/Makefile 2018/01/12 14:41:24 1.11
+++ pkgsrc/devel/jq/Makefile 2018/01/15 08:51:55 1.12
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1# $NetBSD: Makefile,v 1.11 2018/01/12 14:41:24 fhajny Exp $ 1# $NetBSD: Makefile,v 1.12 2018/01/15 08:51:55 adam Exp $
2 2
3DISTNAME= jq-1.5 3DISTNAME= jq-1.5
4PKGREVISION= 2 4PKGREVISION= 2
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= ${MASTER_SITE_GITHUB:=stedolan/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=stedolan/}
7GITHUB_PROJECT= jq 
8GITHUB_TAG= jq-${PKGVERSION_NOREV} 
9 7
10MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://github.com/stedolan/jq/ 9HOMEPAGE= https://github.com/stedolan/jq/
12COMMENT= Command-line JSON processor 10COMMENT= Command-line JSON processor
13LICENSE= mit 11LICENSE= mit
14 12
 13GITHUB_PROJECT= jq
 14GITHUB_TAG= jq-${PKGVERSION_NOREV}
 15
15USE_LANGUAGES= c99 16USE_LANGUAGES= c99
16USE_LIBTOOL= yes 17USE_LIBTOOL= yes
17USE_TOOLS+= bison flex gmake 18USE_TOOLS+= bison flex gmake
18 
19GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
20 20
21CFLAGS.SunOS+= -D_XPG6 -D__EXTENSIONS__ 21CFLAGS.SunOS+= -D_XPG6 -D__EXTENSIONS__
22 22
23TEST_TARGET= check 23TEST_TARGET= check
24 24
25.include "../../textproc/oniguruma/buildlink3.mk" 25.include "../../textproc/oniguruma/buildlink3.mk"
26.include "../../mk/bsd.pkg.mk" 26.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/devel/jq/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/jq/distinfo 2016/05/10 09:20:52 1.7
+++ pkgsrc/devel/jq/distinfo 2018/01/15 08:51:55 1.8
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.7 2016/05/10 09:20:52 tnn Exp $ 1$NetBSD: distinfo,v 1.8 2018/01/15 08:51:55 adam Exp $
2 2
3SHA1 (jq-1.5.tar.gz) = 664638b560d9e734178e8cafb21d98817af5b5f3 3SHA1 (jq-1.5.tar.gz) = 664638b560d9e734178e8cafb21d98817af5b5f3
4RMD160 (jq-1.5.tar.gz) = 33ac77ac93e0539f6d66d29cd717013cdab8cf61 4RMD160 (jq-1.5.tar.gz) = 33ac77ac93e0539f6d66d29cd717013cdab8cf61
5SHA512 (jq-1.5.tar.gz) = 3f9049321e8430b04dbccf81d7f2ab691b89383e91526eaf585bbeeb67698dea73a36b3aa179f6a95ef97cd73a8a9b6dc53cb1a5b0398b6422c11289b705de7b 5SHA512 (jq-1.5.tar.gz) = 3f9049321e8430b04dbccf81d7f2ab691b89383e91526eaf585bbeeb67698dea73a36b3aa179f6a95ef97cd73a8a9b6dc53cb1a5b0398b6422c11289b705de7b
6Size (jq-1.5.tar.gz) = 1118086 bytes 6Size (jq-1.5.tar.gz) = 1118086 bytes
 7SHA1 (patch-Makefile.in) = 446be0fa3517fb6fc1e2f5761d1f8fb28339c79c
7SHA1 (patch-src_jv__parse.c) = efca86e70daf27291a01bf538487b745b7bd600c 8SHA1 (patch-src_jv__parse.c) = efca86e70daf27291a01bf538487b745b7bd600c
File Added: pkgsrc/devel/jq/patches/Attic/patch-Makefile.in
$NetBSD: patch-Makefile.in,v 1.1 2018/01/15 08:51:55 adam Exp $

Fix dynamic linking.

--- Makefile.in.orig	2018-01-15 08:41:01.000000000 +0000
+++ Makefile.in
@@ -681,7 +681,7 @@ include_HEADERS = jv.h jq.h
 @ENABLE_ERROR_INJECTION_TRUE@libinject_errors_la_LDFLAGS = -module
 generate_ver = ver="`{ $(srcdir)/scripts/version || echo '$(VERSION)' ; } | sed 's/.*/\#define JQ_VERSION \"&\"/'`"
 jq_SOURCES = main.c version.h
-jq_LDFLAGS = -static-libtool-libs $(am__append_3)
+jq_LDFLAGS = @ENABLE_ALL_STATIC_TRUE@-static-libtool-libs $(am__append_3)
 jq_LDADD = libjq.la -lm
 
 ### Tests (make check)