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
commita25c9c3bb5dd0ad3a3c90162b2850554751465e1 (patch)
tree53e9829622ae62879793a5ffaad123b9cd61b75c /app-misc
parentpseudo-depend on mailbase +pam (diff)
downloadhistorical-a25c9c3bb5dd0ad3a3c90162b2850554751465e1.tar.gz
historical-a25c9c3bb5dd0ad3a3c90162b2850554751465e1.tar.bz2
historical-a25c9c3bb5dd0ad3a3c90162b2850554751465e1.zip
Removed the libelf check from configure.
Package-Manager: portage-2.0.51.22-r1
Diffstat (limited to 'app-misc')
-rw-r--r--app-misc/screen/ChangeLog6
-rw-r--r--app-misc/screen/Manifest11
-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
4 files changed, 33 insertions, 7 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/Manifest b/app-misc/screen/Manifest
index fe724650b062..11db51b42c45 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -2,13 +2,14 @@
Hash: SHA1
MD5 744ffd2e9d77b4debbaaeb4508ed94d9 screen-4.0.2-r1.ebuild 3510
-MD5 fe01c382cb41e2f9896bbf60eee08bc7 screen-4.0.2-r3.ebuild 3695
-MD5 45e7b22476baf48d83a347b6ecc47e05 ChangeLog 12695
+MD5 37f4f96d6bf2c31bc22ba2af2b50762e screen-4.0.2-r3.ebuild 3803
+MD5 34f918e111a7f0e97951f0ae406597fb ChangeLog 12845
MD5 537c3754e8f6422e4f7025358173ef2b metadata.xml 1525
MD5 7f5ab1c54d87ad24f0a8bafbbcf24844 files/4.0.2-no-utempter.patch 440
MD5 35961ab00c29256e3f6d7a374387e327 files/digest-screen-4.0.2-r1 64
MD5 35961ab00c29256e3f6d7a374387e327 files/digest-screen-4.0.2-r3 64
MD5 839ac3a5c896513a3e3c6353a6242f53 files/screen.pam.system-auth 113
+MD5 2531444b0a51bc5ba5ea1db2d2ec1f4b files/4.0.2-no-libelf.patch 555
MD5 1d675e8a000851f610b79049ce863ff8 files/screenrc 10433
MD5 304be93a4c3b72f2f761f45194059287 files/screen-4.0.1-vsprintf.patch 480
MD5 23cfd7dd1968780724e7b9a3cb406cc8 files/screen-4.0.1-int-overflow-fix.patch 930
@@ -17,7 +18,7 @@ MD5 a7f6e6bfb5647c6e69a797eaa16acf3d files/4.0.2-64bit-time.patch 298
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
-iD8DBQFCjeO8I1lqEGTUzyQRAll/AJ46JT5cqEz0wGEhnGBYWyj07zOybwCgsV9+
-B1fUhDviwlyNbBCNkuJimJA=
-=G3Ep
+iD8DBQFCkOV3I1lqEGTUzyQRAj8BAJ9aFF9m2lGtgMZg4ktKsLMuoqhNwwCdG8QM
+/vujHBek0rRoxsJTPfJDfPA=
+=Xjkm
-----END PGP SIGNATURE-----
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