summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlin Năstac <mrness@gentoo.org>2007-11-20 21:08:16 +0000
committerAlin Năstac <mrness@gentoo.org>2007-11-20 21:08:16 +0000
commit81de840599ae8e5160c7766b654ca38914677927 (patch)
tree66c77d3dedeac30c87cd69956a3ef577fba7efc8 /net-proxy
parentsparc stable wrt #199492 (diff)
downloadgentoo-2-81de840599ae8e5160c7766b654ca38914677927.tar.gz
gentoo-2-81de840599ae8e5160c7766b654ca38914677927.tar.bz2
gentoo-2-81de840599ae8e5160c7766b654ca38914677927.zip
Link with -lpcreposix instead libpcreposix.a (#199535).
(Portage version: 2.1.3.16)
Diffstat (limited to 'net-proxy')
-rw-r--r--net-proxy/oops/ChangeLog6
-rw-r--r--net-proxy/oops/files/libpcreposix.patch19
-rw-r--r--net-proxy/oops/oops-1.5.24_pre20050503-r2.ebuild9
3 files changed, 30 insertions, 4 deletions
diff --git a/net-proxy/oops/ChangeLog b/net-proxy/oops/ChangeLog
index 40c677151c79..b08dcde4ce33 100644
--- a/net-proxy/oops/ChangeLog
+++ b/net-proxy/oops/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-proxy/oops
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/oops/ChangeLog,v 1.19 2007/11/04 08:17:05 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/oops/ChangeLog,v 1.20 2007/11/20 21:08:15 mrness Exp $
+
+ 20 Nov 2007; Alin Năstac <mrness@gentoo.org> +files/libpcreposix.patch,
+ oops-1.5.24_pre20050503-r2.ebuild:
+ Link with -lpcreposix instead libpcreposix.a (#199535).
04 Nov 2007; Alin Năstac <mrness@gentoo.org>
oops-1.5.24_pre20050503-r2.ebuild:
diff --git a/net-proxy/oops/files/libpcreposix.patch b/net-proxy/oops/files/libpcreposix.patch
new file mode 100644
index 000000000000..1648ecabb152
--- /dev/null
+++ b/net-proxy/oops/files/libpcreposix.patch
@@ -0,0 +1,19 @@
+diff -Nru oops-1.5.23.orig/configure.in oops-1.5.23/configure.in
+--- oops-1.5.23.orig/configure.in 2007-11-20 22:47:27.000000000 +0200
++++ oops-1.5.23/configure.in 2007-11-20 22:58:42.000000000 +0200
+@@ -454,14 +454,7 @@
+ AC_DEFINE(REGEX_H, <regex.h>)
+ ;;
+ pcre)
+- if test -r "/usr/lib/libpcreposix.a" -a -r "/usr/lib/libpcre.a"; then
+- LIBS="$LIBS /usr/lib/libpcreposix.a /usr/lib/libpcre.a"
+- elif test -r "/usr/local/lib/libpcreposix.a" -a -r "/usr/local/lib/libpcre.a"; then
+- LIBS="$LIBS /usr/local/lib/libpcreposix.a /usr/local/lib/libpcre.a"
+- fi
+- if test "X`echo $CFLAGS | grep '\-I/usr/local/include'`" = "X"; then
+- CFLAGS="$CFLAGS -I/usr/local/include"
+- fi
++ LIBS="$LIBS -lpcreposix"
+ AC_DEFINE(REGEX_H, <pcreposix.h>)
+ ;;
+ builtin)
diff --git a/net-proxy/oops/oops-1.5.24_pre20050503-r2.ebuild b/net-proxy/oops/oops-1.5.24_pre20050503-r2.ebuild
index f5f0b0185274..5245c694c035 100644
--- a/net-proxy/oops/oops-1.5.24_pre20050503-r2.ebuild
+++ b/net-proxy/oops/oops-1.5.24_pre20050503-r2.ebuild
@@ -1,8 +1,10 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/oops/oops-1.5.24_pre20050503-r2.ebuild,v 1.5 2007/11/04 08:17:05 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/oops/oops-1.5.24_pre20050503-r2.ebuild,v 1.6 2007/11/20 21:08:15 mrness Exp $
-inherit eutils flag-o-matic toolchain-funcs
+WANT_AUTOMAKE="none"
+
+inherit eutils flag-o-matic toolchain-funcs autotools
MY_P="${PN}-1.5.23"
@@ -37,8 +39,9 @@ src_unpack() {
epatch "${FILESDIR}/${P/_*}-pthread-rwlock.patch"
epatch "${FILESDIR}/modules-as-needed.patch"
epatch "${FILESDIR}/implicit-decl.patch"
- sed -i -e 's:/usr/local/lib/libpcre:/usr/lib/libpcre:g' configure
+ epatch "${FILESDIR}/libpcreposix.patch"
sed -i -e 's:y\.tab\.h:y.tab.c:' src/Makefile.in
+ eautoconf
}
src_compile() {