mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-28 09:01:55 +02:00
app-misc/jq: Sync with Gentoo
It's from Gentoo commit 4f1d2eefaf73c498a927299b99285daf5c102390.
This commit is contained in:
parent
a3b7cad5cd
commit
836c1538d2
@ -1,17 +0,0 @@
|
|||||||
diff --git a/configure.ac b/configure.ac
|
|
||||||
index 0441d4a..8f1aa23 100644
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -283,4 +283,11 @@ AC_SUBST([BUNDLER], ["$bundle_cmd"])
|
|
||||||
AC_CONFIG_MACRO_DIR([config/m4])
|
|
||||||
AC_CONFIG_FILES([Makefile libjq.pc])
|
|
||||||
AC_OUTPUT
|
|
||||||
-
|
|
||||||
+AC_ARG_ENABLE([rpathhack],
|
|
||||||
+ [AC_HELP_STRING([--enable-rpathhack], [patch libtool to remove RPATH])],
|
|
||||||
+ [
|
|
||||||
+AC_MSG_RESULT([patching libtool to fix rpath])
|
|
||||||
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
|
|
||||||
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
|
|
||||||
+ ],
|
|
||||||
+ [])
|
|
38
sdk_container/src/third_party/portage-stable/app-misc/jq/files/jq-1.7.1-runpath.patch
vendored
Normal file
38
sdk_container/src/third_party/portage-stable/app-misc/jq/files/jq-1.7.1-runpath.patch
vendored
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
Fixes: https://github.com/gentoo/gentoo/commit/df24c1f97695d8a64a82577cd785e85ebe7ad4e7
|
||||||
|
Upstream-PR: https://github.com/jqlang/jq/pull/3212
|
||||||
|
|
||||||
|
From f23a7373d079a4d4fd1f975936e81f35a66dfe84 Mon Sep 17 00:00:00 2001
|
||||||
|
From: orbea <orbea@riseup.net>
|
||||||
|
Date: Mon, 2 Dec 2024 09:46:33 -0800
|
||||||
|
Subject: [PATCH] build: fix insecure RUNPATH
|
||||||
|
|
||||||
|
In Gentoo -static-libtool-libs causes a QA Notice.
|
||||||
|
|
||||||
|
* QA Notice: The following files contain insecure RUNPATHs
|
||||||
|
* Please file a bug about this at https://bugs.gentoo.org/
|
||||||
|
* with the maintainer of the package.
|
||||||
|
* /var/tmp/portage/app-misc/jq-1.7.1/image/usr/bin/jqn RPATH: /var/tmp/portage/app-misc/jq-1.7.1/work/jq-jq-1.7.1/.libs
|
||||||
|
|
||||||
|
Gentoo-Issue: https://bugs.gentoo.org/945698
|
||||||
|
Signed-off-by: orbea <orbea@riseup.net>
|
||||||
|
---
|
||||||
|
Makefile.am | 3 +--
|
||||||
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/Makefile.am b/Makefile.am
|
||||||
|
index a183477fde..3f36993c0a 100644
|
||||||
|
--- a/Makefile.am
|
||||||
|
+++ b/Makefile.am
|
||||||
|
@@ -132,11 +132,10 @@ CLEANFILES = src/version.h .remake-version-h src/builtin.inc src/config_opts.inc
|
||||||
|
|
||||||
|
bin_PROGRAMS = jq
|
||||||
|
jq_SOURCES = src/main.c src/version.h
|
||||||
|
-jq_LDFLAGS = -static-libtool-libs
|
||||||
|
jq_LDADD = libjq.la -lm
|
||||||
|
|
||||||
|
if ENABLE_ALL_STATIC
|
||||||
|
-jq_LDFLAGS += -all-static
|
||||||
|
+jq_LDFLAGS = -all-static
|
||||||
|
endif
|
||||||
|
|
||||||
|
### Tests (make check)
|
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
EAPI=8
|
EAPI=8
|
||||||
|
|
||||||
inherit autotools
|
inherit autotools flag-o-matic
|
||||||
|
|
||||||
MY_PV="${PV/_/}"
|
MY_PV="${PV/_/}"
|
||||||
MY_P="${PN}-${MY_PV}"
|
MY_P="${PN}-${MY_PV}"
|
||||||
@ -30,7 +30,7 @@ RDEPEND="
|
|||||||
"
|
"
|
||||||
PATCHES=(
|
PATCHES=(
|
||||||
"${FILESDIR}"/jq-1.6-r3-never-bundle-oniguruma.patch
|
"${FILESDIR}"/jq-1.6-r3-never-bundle-oniguruma.patch
|
||||||
"${FILESDIR}"/jq-1.7-runpath.patch
|
"${FILESDIR}"/jq-1.7.1-runpath.patch
|
||||||
)
|
)
|
||||||
|
|
||||||
RESTRICT="!test? ( test )"
|
RESTRICT="!test? ( test )"
|
||||||
@ -54,12 +54,15 @@ src_prepare() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
src_configure() {
|
src_configure() {
|
||||||
|
# TODO: Drop on next release > 1.7.1
|
||||||
|
# bug #944014
|
||||||
|
append-cflags -std=gnu17
|
||||||
|
|
||||||
local econfargs=(
|
local econfargs=(
|
||||||
# don't try to rebuild docs
|
# don't try to rebuild docs
|
||||||
--disable-docs
|
--disable-docs
|
||||||
--disable-valgrind
|
--disable-valgrind
|
||||||
--disable-maintainer-mode
|
--disable-maintainer-mode
|
||||||
--enable-rpathhack
|
|
||||||
$(use_enable static-libs static)
|
$(use_enable static-libs static)
|
||||||
$(use_with oniguruma oniguruma yes)
|
$(use_with oniguruma oniguruma yes)
|
||||||
)
|
)
|
Loading…
x
Reference in New Issue
Block a user