From: "Patrick McLean" <chutzpah@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/jq/files/, app-misc/jq/
Date: Fri, 12 Apr 2019 21:10:28 +0000 (UTC) [thread overview]
Message-ID: <1555103267.0d6f69a4b08c32aec8e8c65f48cc6d75274830d1.chutzpah@gentoo> (raw)
commit: 0d6f69a4b08c32aec8e8c65f48cc6d75274830d1
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Fri Apr 12 21:06:46 2019 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Fri Apr 12 21:07:47 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d6f69a4
app-misc/jq: Revbump, fix oniguruma patch (bug #674680)
Patch by Robin Johnson <robbat2 <AT> gentoo.org>
Closes: https://bugs.gentoo.org/674680
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
.../jq/files/jq-1.6-never-bundle-oniguruma.patch | 80 ----------------------
.../files/jq-1.6-r3-never-bundle-oniguruma.patch | 27 ++++++++
app-misc/jq/{jq-1.6-r2.ebuild => jq-1.6-r3.ebuild} | 6 +-
3 files changed, 30 insertions(+), 83 deletions(-)
diff --git a/app-misc/jq/files/jq-1.6-never-bundle-oniguruma.patch b/app-misc/jq/files/jq-1.6-never-bundle-oniguruma.patch
deleted file mode 100644
index 0b0e9260050..00000000000
--- a/app-misc/jq/files/jq-1.6-never-bundle-oniguruma.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 6344b4e..5f0c74d 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -48,7 +48,7 @@ AM_YFLAGS = --warnings=all -d
- lib_LTLIBRARIES = libjq.la
- libjq_la_SOURCES = ${LIBJQ_SRC}
- libjq_la_LIBADD = -lm
--libjq_la_LDFLAGS = $(onig_LDFLAGS) -export-symbols-regex '^j[qv]_' -version-info 1:4:0
-+libjq_la_LDFLAGS = -export-symbols-regex '^j[qv]_' -version-info 1:4:0
-
- if WIN32
- libjq_la_LIBADD += -lshlwapi
-@@ -137,15 +137,6 @@ jq.1: $(srcdir)/jq.1.prebuilt
- endif
-
-
--### Build oniguruma
--
--if BUILD_ONIGURUMA
--libjq_la_LIBADD += modules/oniguruma/src/.libs/libonig.la
--SUBDIRS = modules/oniguruma
--endif
--
--AM_CFLAGS += $(onig_CFLAGS)
--
- ### Packaging
-
- docs/site.yml: configure.ac
-diff --git a/configure.ac b/configure.ac
-index 280694c..0c5d86f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -236,45 +236,20 @@ AC_ARG_WITH([oniguruma],
- [try this for a non-standard install prefix of the oniguruma library])], ,
- [with_oniguruma=yes])
-
--onig_CFLAGS=
--onig_LDFLAGS=
--build_oniguruma=no
- AS_IF([test "x$with_oniguruma" != xno], [
- save_CFLAGS="$CFLAGS"
- save_LDFLAGS="$LDFLAGS"
-- AS_IF([test "x$with_oniguruma" != xyes], [
-- AS_IF([test "x$with_oniguruma" = xbuiltin], [
-- build_oniguruma=yes
-- ], [
-- onig_CFLAGS="-I${with_oniguruma}/include"
-- onig_LDFLAGS="-L${with_oniguruma}/lib"
-- ])
-- ])
- AS_IF([test "x$build_oniguruma" = xno], [
- # check for ONIGURUMA library, either in /usr or where requested
-- CFLAGS="$CFLAGS $onig_CFLAGS"
-- LDFLAGS="$LDFLAGS $onig_LDFLAGS"
- AC_CHECK_HEADER("oniguruma.h",
- AC_CHECK_LIB([onig],[onig_version]))
- # handle check results
- AS_IF([test "x$ac_cv_lib_onig_onig_version" != "xyes"], [
-- build_oniguruma=yes
-- AC_MSG_NOTICE([Oniguruma was not found. Will use the packaged oniguruma.])
-+ AC_MSG_ERROR(oniguruma.h not found)
- ])
- ])
-- AS_IF([test "x$build_oniguruma" = xyes -a -f "${srcdir}/modules/oniguruma/configure.ac" ], [
-- onig_CFLAGS="-I${srcdir}/modules/oniguruma/src"
-- onig_LDFLAGS="-L${srcdir}/modules/oniguruma/src -Wl,-rpath,${libdir}"
-- AC_CONFIG_SUBDIRS([modules/oniguruma])
-- AC_DEFINE([HAVE_LIBONIG],1,[Define to 1 if the system includes libonig])
-- ])
-- CFLAGS="$save_CFLAGS"
-- LDFLAGS="$save_LDFLAGS"
- ])
--AC_SUBST(onig_CFLAGS)
--AC_SUBST(onig_LDFLAGS)
-
--AM_CONDITIONAL([BUILD_ONIGURUMA], [test "x$build_oniguruma" = xyes])
- AC_SUBST([BUNDLER], ["$bundle_cmd"])
-
- AC_CONFIG_MACRO_DIR([config/m4])
diff --git a/app-misc/jq/files/jq-1.6-r3-never-bundle-oniguruma.patch b/app-misc/jq/files/jq-1.6-r3-never-bundle-oniguruma.patch
new file mode 100644
index 00000000000..75ab111f881
--- /dev/null
+++ b/app-misc/jq/files/jq-1.6-r3-never-bundle-oniguruma.patch
@@ -0,0 +1,27 @@
+diff --git a/Makefile.am b/Makefile.am
+index 6344b4e..86d968e 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -47,7 +47,7 @@ AM_YFLAGS = --warnings=all -d
+
+ lib_LTLIBRARIES = libjq.la
+ libjq_la_SOURCES = ${LIBJQ_SRC}
+-libjq_la_LIBADD = -lm
++libjq_la_LIBADD = -lm $(onig_LIBS)
+ libjq_la_LDFLAGS = $(onig_LDFLAGS) -export-symbols-regex '^j[qv]_' -version-info 1:4:0
+
+ if WIN32
+diff --git a/configure.ac b/configure.ac
+index 280694c..d96026e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -249,6 +249,9 @@ AS_IF([test "x$with_oniguruma" != xno], [
+ onig_CFLAGS="-I${with_oniguruma}/include"
+ onig_LDFLAGS="-L${with_oniguruma}/lib"
+ ])
++ ], [
++ # with_oniguruma == yes
++ PKG_CHECK_MODULES([onig], [oniguruma])
+ ])
+ AS_IF([test "x$build_oniguruma" = xno], [
+ # check for ONIGURUMA library, either in /usr or where requested
diff --git a/app-misc/jq/jq-1.6-r2.ebuild b/app-misc/jq/jq-1.6-r3.ebuild
similarity index 90%
rename from app-misc/jq/jq-1.6-r2.ebuild
rename to app-misc/jq/jq-1.6-r3.ebuild
index 9463846be75..2b187f05c7a 100644
--- a/app-misc/jq/jq-1.6-r2.ebuild
+++ b/app-misc/jq/jq-1.6-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -27,7 +27,7 @@ RDEPEND="
src_prepare() {
local PATCHES=(
- "${FILESDIR}"/jq-1.6-never-bundle-oniguruma.patch
+ "${FILESDIR}"/jq-1.6-r3-never-bundle-oniguruma.patch
"${FILESDIR}"/jq-1.6-runpath.patch
"${FILESDIR}"/jq-1.6-segfault-fix.patch
)
@@ -48,7 +48,7 @@ src_configure() {
--disable-maintainer-mode
--enable-rpathhack
$(use_enable static-libs static)
- $(use_with oniguruma)
+ $(use_with oniguruma oniguruma yes)
)
econf "${econfargs[@]}"
}
next reply other threads:[~2019-04-12 21:10 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-12 21:10 Patrick McLean [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-12-03 9:13 [gentoo-commits] repo/gentoo:master commit in: app-misc/jq/files/, app-misc/jq/ Sam James
2023-10-06 17:29 Patrick McLean
2023-10-06 16:24 Patrick McLean
2021-03-25 18:53 Patrick McLean
2018-12-05 21:56 Patrick McLean
2016-08-08 15:30 Tim Harder
2016-04-30 3:55 Tim Harder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1555103267.0d6f69a4b08c32aec8e8c65f48cc6d75274830d1.chutzpah@gentoo \
--to=chutzpah@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox