summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Ahlberg <aliz@gentoo.org>2004-02-25 10:23:34 +0000
committerDaniel Ahlberg <aliz@gentoo.org>2004-02-25 10:23:34 +0000
commitf1ad45a503c799fc8272a3d12d29eed8ac226534 (patch)
tree644558418bfdeb65eb739f752d43f36918d8fc90 /app-admin
parentjust a cleaneup (Manifest recommit) (diff)
downloadgentoo-2-f1ad45a503c799fc8272a3d12d29eed8ac226534.tar.gz
gentoo-2-f1ad45a503c799fc8272a3d12d29eed8ac226534.tar.bz2
gentoo-2-f1ad45a503c799fc8272a3d12d29eed8ac226534.zip
Fix fPIC issues.
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/skey/ChangeLog7
-rw-r--r--app-admin/skey/files/skey-1.1.5-fPIC.patch12
-rw-r--r--app-admin/skey/skey-1.1.5-r1.ebuild16
3 files changed, 23 insertions, 12 deletions
diff --git a/app-admin/skey/ChangeLog b/app-admin/skey/ChangeLog
index d10d01ef5743..a8094f5b773e 100644
--- a/app-admin/skey/ChangeLog
+++ b/app-admin/skey/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-admin/skey
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/skey/ChangeLog,v 1.10 2003/12/07 17:54:17 taviso Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/skey/ChangeLog,v 1.11 2004/02/25 10:23:34 aliz Exp $
+
+ 25 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> skey-1.1.5-r1.ebuild:
+ Fix fPIC issues.
07 Dec 2003; Tavis Ormandy <taviso@gentoo.org> skey-1.1.5-r1.ebuild:
stable
diff --git a/app-admin/skey/files/skey-1.1.5-fPIC.patch b/app-admin/skey/files/skey-1.1.5-fPIC.patch
new file mode 100644
index 000000000000..924cfb4582a3
--- /dev/null
+++ b/app-admin/skey/files/skey-1.1.5-fPIC.patch
@@ -0,0 +1,12 @@
+--- Makefile.in 2004-02-25 10:16:15.219448392 +0000
++++ Makefile.in 2004-02-25 10:16:39.087583762 +0000
+@@ -50,6 +50,9 @@
+
+ ${LIBOBJS}: config.h
+
++${LIBOBJS}: %.o: %.c
++ ${CC} ${CFLAGS} -fPIC -c $< -o $@
++
+ libskey.a: ${LIBOBJS}
+ ${AR} rv $@ ${LIBOBJS}
+ ${RANLIB} $@
diff --git a/app-admin/skey/skey-1.1.5-r1.ebuild b/app-admin/skey/skey-1.1.5-r1.ebuild
index 5b532c184b48..3de85922a2f7 100644
--- a/app-admin/skey/skey-1.1.5-r1.ebuild
+++ b/app-admin/skey/skey-1.1.5-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/skey/skey-1.1.5-r1.ebuild,v 1.9 2004/02/17 08:41:40 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/skey/skey-1.1.5-r1.ebuild,v 1.10 2004/02/25 10:23:34 aliz Exp $
inherit flag-o-matic ccc eutils
@@ -24,26 +24,22 @@ DEPEND="${RDEPEND}"
S=${WORKDIR}/${P}
src_unpack() {
- unpack ${A}
+ unpack ${A} ; cd ${S}
# porting some updates to this skey implementation from the
# NetBSD project, some other updates and fixes, and the addition
# of some new features like shadow password and cracklib support.
# (05 Nov 2003) -taviso@gentoo.org
- cd ${S}; epatch ${FILESDIR}/skey-1.1.5-gentoo.diff.gz
+ epatch ${FILESDIR}/skey-1.1.5-gentoo.diff.gz
# glibc 2.2.x does not define LOGIN_NAME_MAX #33315
# (12 Nov 2003) -taviso@gentoo.org
- cd ${S}; epatch ${FILESDIR}/skey-login_name_max.diff
+ epatch ${FILESDIR}/skey-login_name_max.diff
+
+ epatch ${FILESDIR}/${P}-fPIC.patch
}
src_compile() {
-
- if use alpha; then
- append-flags -fPIC
- append-ldflags -fPIC
- fi
-
# skeyprune wont honour @sysconfdir@
sed -i 's#/etc/skeykeys#/etc/skey/skeyskeys#g' skeyprune.pl skeyprune.8