summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Wegener <swegener@gentoo.org>2005-05-22 20:02:32 +0000
committerSven Wegener <swegener@gentoo.org>2005-05-22 20:02:32 +0000
commitd987d2848e3ea1b0f48cb1e244aaea3b731bd850 (patch)
tree2bae23b8dac40470caa02378c930b35a3a0661ff /app-misc
parentpseudo-depend on mailbase +pam (diff)
downloadgentoo-2-d987d2848e3ea1b0f48cb1e244aaea3b731bd850.tar.gz
gentoo-2-d987d2848e3ea1b0f48cb1e244aaea3b731bd850.tar.bz2
gentoo-2-d987d2848e3ea1b0f48cb1e244aaea3b731bd850.zip
Removed the libelf check from configure.
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'app-misc')
-rw-r--r--app-misc/screen/ChangeLog6
-rw-r--r--app-misc/screen/files/4.0.2-no-libelf.patch18
-rw-r--r--app-misc/screen/screen-4.0.2-r3.ebuild5
3 files changed, 27 insertions, 2 deletions
diff --git a/app-misc/screen/ChangeLog b/app-misc/screen/ChangeLog
index 9727ee32d854..c0e52cd8fdb3 100644
--- a/app-misc/screen/ChangeLog
+++ b/app-misc/screen/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-misc/screen
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.85 2005/05/20 13:18:27 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.86 2005/05/22 20:02:32 swegener Exp $
+
+ 22 May 2005; Sven Wegener <swegener@gentoo.org>
+ +files/4.0.2-no-libelf.patch, screen-4.0.2-r3.ebuild:
+ Removed the libelf check from configure.
20 May 2005; Sven Wegener <swegener@gentoo.org> -files/screen.pam,
screen-4.0.2-r1.ebuild, screen-4.0.2-r3.ebuild:
diff --git a/app-misc/screen/files/4.0.2-no-libelf.patch b/app-misc/screen/files/4.0.2-no-libelf.patch
new file mode 100644
index 000000000000..df06383c9d86
--- /dev/null
+++ b/app-misc/screen/files/4.0.2-no-libelf.patch
@@ -0,0 +1,18 @@
+--- screen-4.0.2/configure.in 2005-05-22 19:55:06.559874997 +0000
++++ screen-4.0.2-no-libelf/configure.in 2005-05-22 19:56:05.895801017 +0000
+@@ -195,15 +195,6 @@
+ #endif
+ ], LIBS="$LIBS -lsocket -linet";seqptx=1)
+
+-oldlibs="$LIBS"
+-LIBS="$LIBS -lelf"
+-AC_CHECKING(SVR4)
+-AC_TRY_LINK([#include <utmpx.h>
+-],,
+-[AC_CHECK_HEADER(dwarf.h, AC_DEFINE(SVR4) AC_DEFINE(BUGGYGETLOGIN),
+-[AC_CHECK_HEADER(elf.h, AC_DEFINE(SVR4) AC_DEFINE(BUGGYGETLOGIN))])]
+-,LIBS="$oldlibs")
+-
+ AC_CHECKING(for Solaris 2.x)
+ AC_EGREP_CPP(yes,
+ [#if defined(SVR4) && defined(sun)
diff --git a/app-misc/screen/screen-4.0.2-r3.ebuild b/app-misc/screen/screen-4.0.2-r3.ebuild
index 98cf7437537c..5148672cad51 100644
--- a/app-misc/screen/screen-4.0.2-r3.ebuild
+++ b/app-misc/screen/screen-4.0.2-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.2-r3.ebuild,v 1.2 2005/05/20 13:18:27 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.2-r3.ebuild,v 1.3 2005/05/22 20:02:32 swegener Exp $
inherit eutils flag-o-matic toolchain-funcs pam
@@ -38,6 +38,9 @@ src_unpack() {
# Don't use utempter even if it is found on the system
epatch "${FILESDIR}"/${PV}-no-utempter.patch
+ # Don't link against libelf even if it is found on the system
+ epatch "${FILESDIR}"/${PV}-no-libelf.patch
+
# Patch for time function on 64bit systems
epatch "${FILESDIR}"/${PV}-64bit-time.patch