[packages/jq] don't build with static onig

glen glen at pld-linux.org
Mon May 2 17:39:55 CEST 2016


commit 97271e8acfd54e09b28236c972061f8a4bb4922a
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon May 2 18:38:53 2016 +0300

    don't build with static onig

 jq.spec      | 14 ++++++++++++--
 static.patch | 11 +++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)
---
diff --git a/jq.spec b/jq.spec
index 020b1fe..5333bad 100644
--- a/jq.spec
+++ b/jq.spec
@@ -11,12 +11,16 @@ Name:		jq
 Version:	1.5
 Release:	1
 License:	MIT and ASL 2.0 and CC-BY and GPLv3
+Group:		Applications/Text
 Source0:	https://github.com/stedolan/jq/releases/download/%{name}-%{version}/jq-%{version}.tar.gz
 # Source0-md5:	0933532b086bd8b6a41c1b162b1731f9
-Group:		Applications/Text
+Patch0:		static.patch
 URL:		https://stedolan.github.io/jq/
+BuildRequires:	autoconf
+BuildRequires:	automake
 BuildRequires:	bison
 BuildRequires:	flex
+BuildRequires:	libtool
 BuildRequires:	oniguruma-devel
 %if %{with tests}
 BuildRequires:	valgrind
@@ -52,11 +56,17 @@ Requires:	%{name}-libs = %{version}-%{release}
 Development files for %{name}
 
 %prep
-%setup -qn %{name}-%{version}
+%setup -q
+%patch0 -p1
 
 %build
+%{__aclocal} -I config/m4
+%{__libtoolize}
+%{__autoconf}
+%{__automake}
 %configure \
 	--disable-static \
+	--disable-all-static \
 	--disable-silent-rules
 
 %{__make}
diff --git a/static.patch b/static.patch
new file mode 100644
index 0000000..159447c
--- /dev/null
+++ b/static.patch
@@ -0,0 +1,11 @@
+--- jq-1.5/Makefile.am~	2015-08-16 07:38:10.000000000 +0300
++++ jq-1.5/Makefile.am	2016-05-02 18:36:32.459838273 +0300
+@@ -84,7 +84,7 @@
+ 
+ bin_PROGRAMS = jq
+ jq_SOURCES = main.c version.h
+-jq_LDFLAGS = -static-libtool-libs
++jq_LDFLAGS =
+ jq_LDADD = libjq.la -lm
+ 
+ if ENABLE_ALL_STATIC
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/jq.git/commitdiff/97271e8acfd54e09b28236c972061f8a4bb4922a



More information about the pld-cvs-commit mailing list