summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2004-09-25 07:26:28 +0000
committerMike Frysinger <vapier@gentoo.org>2004-09-25 07:26:28 +0000
commit6f715a81ece62a7f25fbbd7d65b0f389b4333754 (patch)
tree88dcde9a08374d373c0e61b73cf77b0e5e909b5d /dev-libs/libedit
parentold (Manifest recommit) (diff)
downloadgentoo-2-6f715a81ece62a7f25fbbd7d65b0f389b4333754.tar.gz
gentoo-2-6f715a81ece62a7f25fbbd7d65b0f389b4333754.tar.bz2
gentoo-2-6f715a81ece62a7f25fbbd7d65b0f389b4333754.zip
ugly fix for shared building (PIC lib) but it works ... also add in hppa support while here
Diffstat (limited to 'dev-libs/libedit')
-rw-r--r--dev-libs/libedit/files/20031222-debian-to-gentoo.patch10
-rw-r--r--dev-libs/libedit/libedit-20040907.ebuild11
2 files changed, 12 insertions, 9 deletions
diff --git a/dev-libs/libedit/files/20031222-debian-to-gentoo.patch b/dev-libs/libedit/files/20031222-debian-to-gentoo.patch
index e2351f9b3dcc..4822f2aadf4d 100644
--- a/dev-libs/libedit/files/20031222-debian-to-gentoo.patch
+++ b/dev-libs/libedit/files/20031222-debian-to-gentoo.patch
@@ -30,7 +30,7 @@ diff -ur netbsd-cvs/Makefile libedit-20031222/Makefile
AHDR=vi.h emacs.h common.h
ASRC=${LIBEDITDIR}/vi.c ${LIBEDITDIR}/emacs.c ${LIBEDITDIR}/common.c
-@@ -46,46 +49,54 @@
+@@ -46,46 +49,56 @@
CLEANFILES+= ${AHDR} fcns.h help.h fcns.c help.c
SUBDIR= readline
@@ -98,12 +98,14 @@ diff -ur netbsd-cvs/Makefile libedit-20031222/Makefile
-.include <bsd.lib.mk>
-.include <bsd.subdir.mk>
+.depend: vi.h emacs.h common.h fcns.h help.h help.c
++ -mkdir .a .so
+.c.o:
-+ ${CC} ${CFLAGS} -c $<
++ ${CC} ${CFLAGS} -c $< -o .a/$*
++ ${CC} ${CFLAGS} -fPIC -c $< -o .so/$*
+libedit.a: ${OOBJS}
-+ ar -r $@ ${OOBJS}
++ ar -r $@ .a/*
+libedit.so: ${OOBJS}
-+ ${CC} --shared -o $@ ${OOBJS} ${LIBS}
++ ${CC} --shared -o $@ .so/* ${LIBS}
diff -ur netbsd-cvs/el.c libedit-20031222/el.c
--- netbsd-cvs/el.c 2003-12-22 13:44:25.474909848 -0500
+++ libedit-20031222/el.c 2003-12-22 15:00:15.545194024 -0500
diff --git a/dev-libs/libedit/libedit-20040907.ebuild b/dev-libs/libedit/libedit-20040907.ebuild
index e8f5af6d0823..1006c30aaa3d 100644
--- a/dev-libs/libedit/libedit-20040907.ebuild
+++ b/dev-libs/libedit/libedit-20040907.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libedit/libedit-20040907.ebuild,v 1.2 2004/09/23 15:16:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libedit/libedit-20040907.ebuild,v 1.3 2004/09/25 07:26:28 vapier Exp $
inherit eutils
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="arm ppc x86"
+KEYWORDS="arm hppa ppc x86"
IUSE=""
DEPEND="sys-libs/ncurses
@@ -26,11 +26,12 @@ src_unpack() {
}
src_compile() {
- emake -j1 || die
+ emake -j1 .depend || die "depend"
+ emake || die "make"
}
src_install() {
- dolib.so libedit.so || die
- dolib.a libedit.a || die
+ dolib.so libedit.so || die "dolib.so"
+ dolib.a libedit.a || die "dolib.a"
doman *.[35]
}