pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/jq Turn oniguruma support into a (default) option.
details: https://anonhg.NetBSD.org/pkgsrc/rev/1407aee284ab
branches: trunk
changeset: 374416:1407aee284ab
user: fhajny <fhajny%pkgsrc.org@localhost>
date: Mon Jan 22 13:27:41 2018 +0000
description:
Turn oniguruma support into a (default) option.
diffstat:
devel/jq/Makefile | 8 ++++----
devel/jq/options.mk | 13 +++++++++++++
2 files changed, 17 insertions(+), 4 deletions(-)
diffs (47 lines):
diff -r 65b5cee56c48 -r 1407aee284ab devel/jq/Makefile
--- a/devel/jq/Makefile Mon Jan 22 12:51:09 2018 +0000
+++ b/devel/jq/Makefile Mon Jan 22 13:27:41 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2018/01/15 08:51:55 adam Exp $
+# $NetBSD: Makefile,v 1.13 2018/01/22 13:27:41 fhajny Exp $
DISTNAME= jq-1.5
PKGREVISION= 2
@@ -10,17 +10,17 @@
COMMENT= Command-line JSON processor
LICENSE= mit
-GITHUB_PROJECT= jq
-GITHUB_TAG= jq-${PKGVERSION_NOREV}
+GITHUB_TAG= ${DISTNAME}
USE_LANGUAGES= c99
USE_LIBTOOL= yes
USE_TOOLS+= bison flex gmake
GNU_CONFIGURE= yes
+.include "options.mk"
+
CFLAGS.SunOS+= -D_XPG6 -D__EXTENSIONS__
TEST_TARGET= check
-.include "../../textproc/oniguruma/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 65b5cee56c48 -r 1407aee284ab devel/jq/options.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/jq/options.mk Mon Jan 22 13:27:41 2018 +0000
@@ -0,0 +1,13 @@
+# $NetBSD: options.mk,v 1.1 2018/01/22 13:27:41 fhajny Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.jq
+PKG_SUPPORTED_OPTIONS= oniguruma
+PKG_SUGGESTED_OPTIONS= oniguruma
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Moniguruma)
+.include "../../textproc/oniguruma/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= ac_cv_lib_onig_onig_version=no
+.endif
Home |
Main Index |
Thread Index |
Old Index