Fix static linking
This commit is contained in:
parent
9b59610699
commit
66fb3f5500
44
pcre-8.37-RC1-Fix-static-linking-issue-with-pkg-config.patch
Normal file
44
pcre-8.37-RC1-Fix-static-linking-issue-with-pkg-config.patch
Normal file
@ -0,0 +1,44 @@
|
|||||||
|
From 2765d0933715e6b2c78a4e74fa8d5cad27273f29 Mon Sep 17 00:00:00 2001
|
||||||
|
From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
|
||||||
|
Date: Thu, 23 Apr 2015 17:34:33 +0000
|
||||||
|
Subject: [PATCH] Fix static linking issue with pkg-config.
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1552 2f5784b3-3f2a-0410-8824-cb99058d5e15
|
||||||
|
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
||||||
|
|
||||||
|
diff --git a/libpcre.pc.in b/libpcre.pc.in
|
||||||
|
index 1f26b32..0a35da8 100644
|
||||||
|
--- a/libpcre.pc.in
|
||||||
|
+++ b/libpcre.pc.in
|
||||||
|
@@ -9,4 +9,5 @@ Name: libpcre
|
||||||
|
Description: PCRE - Perl compatible regular expressions C library with 8 bit character support
|
||||||
|
Version: @PACKAGE_VERSION@
|
||||||
|
Libs: -L${libdir} -lpcre
|
||||||
|
+Libs.private: @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
|
||||||
|
Cflags: -I${includedir} @PCRE_STATIC_CFLAG@
|
||||||
|
diff --git a/libpcre16.pc.in b/libpcre16.pc.in
|
||||||
|
index f589b75..080c9dc 100644
|
||||||
|
--- a/libpcre16.pc.in
|
||||||
|
+++ b/libpcre16.pc.in
|
||||||
|
@@ -9,4 +9,5 @@ Name: libpcre16
|
||||||
|
Description: PCRE - Perl compatible regular expressions C library with 16 bit character support
|
||||||
|
Version: @PACKAGE_VERSION@
|
||||||
|
Libs: -L${libdir} -lpcre16
|
||||||
|
+Libs.private: @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
|
||||||
|
Cflags: -I${includedir} @PCRE_STATIC_CFLAG@
|
||||||
|
diff --git a/libpcre32.pc.in b/libpcre32.pc.in
|
||||||
|
index 6582105..a3ae0e1 100644
|
||||||
|
--- a/libpcre32.pc.in
|
||||||
|
+++ b/libpcre32.pc.in
|
||||||
|
@@ -9,4 +9,5 @@ Name: libpcre32
|
||||||
|
Description: PCRE - Perl compatible regular expressions C library with 32 bit character support
|
||||||
|
Version: @PACKAGE_VERSION@
|
||||||
|
Libs: -L${libdir} -lpcre32
|
||||||
|
+Libs.private: @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
|
||||||
|
Cflags: -I${includedir} @PCRE_STATIC_CFLAG@
|
||||||
|
--
|
||||||
|
2.1.0
|
||||||
|
|
@ -2,7 +2,7 @@
|
|||||||
%global rcversion RC1
|
%global rcversion RC1
|
||||||
Name: pcre
|
Name: pcre
|
||||||
Version: 8.37
|
Version: 8.37
|
||||||
Release: %{?rcversion:0.}1%{?rcversion:.%rcversion}%{?dist}
|
Release: %{?rcversion:0.}2%{?rcversion:.%rcversion}%{?dist}
|
||||||
%global myversion %{version}%{?rcversion:-%rcversion}
|
%global myversion %{version}%{?rcversion:-%rcversion}
|
||||||
Summary: Perl-compatible regular expression library
|
Summary: Perl-compatible regular expression library
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
@ -30,6 +30,8 @@ Source: ftp://ftp.csx.cam.ac.uk/pub/software/programming/%{name}/%{?rcversion:Te
|
|||||||
Patch0: pcre-8.21-multilib.patch
|
Patch0: pcre-8.21-multilib.patch
|
||||||
# Refused by upstream, bug #675477
|
# Refused by upstream, bug #675477
|
||||||
Patch1: pcre-8.32-refused_spelling_terminated.patch
|
Patch1: pcre-8.32-refused_spelling_terminated.patch
|
||||||
|
# Fix static linking, bug #1214494, in upstream after 8.37-RC1
|
||||||
|
Patch2: pcre-8.37-RC1-Fix-static-linking-issue-with-pkg-config.patch
|
||||||
BuildRequires: readline-devel
|
BuildRequires: readline-devel
|
||||||
# New libtool to get rid of rpath
|
# New libtool to get rid of rpath
|
||||||
BuildRequires: autoconf, automake, libtool
|
BuildRequires: autoconf, automake, libtool
|
||||||
@ -71,6 +73,7 @@ Utilities demonstrating PCRE capabilities like pcregrep or pcretest.
|
|||||||
# Get rid of rpath
|
# Get rid of rpath
|
||||||
%patch0 -p1 -b .multilib
|
%patch0 -p1 -b .multilib
|
||||||
%patch1 -p1 -b .terminated_typos
|
%patch1 -p1 -b .terminated_typos
|
||||||
|
%patch2 -p1 -b .static_linking
|
||||||
# Because of rpath patch
|
# Because of rpath patch
|
||||||
libtoolize --copy --force && autoreconf -vif
|
libtoolize --copy --force && autoreconf -vif
|
||||||
# One contributor's name is non-UTF-8
|
# One contributor's name is non-UTF-8
|
||||||
@ -141,6 +144,9 @@ make %{?_smp_mflags} check VERBOSE=yes
|
|||||||
%{_mandir}/man1/pcretest.*
|
%{_mandir}/man1/pcretest.*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Apr 23 2015 Petr Pisar <ppisar@redhat.com> - 8.37-0.2.RC1
|
||||||
|
- Fix static linking (bug #1214494)
|
||||||
|
|
||||||
* Wed Apr 22 2015 Petr Pisar <ppisar@redhat.com> - 8.37-0.1.RC1
|
* Wed Apr 22 2015 Petr Pisar <ppisar@redhat.com> - 8.37-0.1.RC1
|
||||||
- 8.37 RC1 bump
|
- 8.37 RC1 bump
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user