summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <uberlord@gentoo.org>2007-05-18 16:47:49 +0000
committerRoy Marples <uberlord@gentoo.org>2007-05-18 16:47:49 +0000
commit69d7781968bba8875f44d0086e8d16017dd1e648 (patch)
treebc2807eaba7c5d130889129339970460fe3b5c30 /sys-freebsd/freebsd-bin
parentremoved stale versions (diff)
downloadgentoo-2-69d7781968bba8875f44d0086e8d16017dd1e648.tar.gz
gentoo-2-69d7781968bba8875f44d0086e8d16017dd1e648.tar.bz2
gentoo-2-69d7781968bba8875f44d0086e8d16017dd1e648.zip
Statically link libedit into sh so we don't have another mess if we
ever change things again. We do the same thing with bash/readline too. (Portage version: 2.1.2.7)
Diffstat (limited to 'sys-freebsd/freebsd-bin')
-rw-r--r--sys-freebsd/freebsd-bin/ChangeLog7
-rw-r--r--sys-freebsd/freebsd-bin/files/freebsd-bin-6.2-sh-libedit.patch14
-rw-r--r--sys-freebsd/freebsd-bin/freebsd-bin-6.2.ebuild5
3 files changed, 23 insertions, 3 deletions
diff --git a/sys-freebsd/freebsd-bin/ChangeLog b/sys-freebsd/freebsd-bin/ChangeLog
index 66a6e92ebdd4..180ce6a214e6 100644
--- a/sys-freebsd/freebsd-bin/ChangeLog
+++ b/sys-freebsd/freebsd-bin/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-freebsd/freebsd-bin
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-bin/ChangeLog,v 1.27 2007/01/15 21:34:27 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-bin/ChangeLog,v 1.28 2007/05/18 16:47:49 uberlord Exp $
+
+ 18 May 2007; Roy Marples <uberlord@gentoo.org>
+ +files/freebsd-bin-6.2-sh-libedit.patch, freebsd-bin-6.2.ebuild:
+ Statically link libedit into sh so we don't have another mess if we
+ ever change things again. We do the same thing with bash/readline too.
*freebsd-bin-6.2 (15 Jan 2007)
diff --git a/sys-freebsd/freebsd-bin/files/freebsd-bin-6.2-sh-libedit.patch b/sys-freebsd/freebsd-bin/files/freebsd-bin-6.2-sh-libedit.patch
new file mode 100644
index 000000000000..60e7e3e245f0
--- /dev/null
+++ b/sys-freebsd/freebsd-bin/files/freebsd-bin-6.2-sh-libedit.patch
@@ -0,0 +1,14 @@
+To avoid another libedit mess, we'll statically link it into sh
+
+diff -ur a/sh/Makefile b/sh/Makefile
+--- a/sh/Makefile 2007-05-18 17:27:25 +0100
++++ b/sh/Makefile 2007-05-18 17:27:47 +0100
+@@ -16,7 +16,7 @@
+ # builtin.1 in share/man/man1/.
+
+ DPADD= ${LIBL} ${LIBEDIT} ${LIBTERMCAP}
+-LDADD= -ll -ledit -ltermcap
++LDADD= -Wl,-Bstatic -ledit -Wl,-Bdynamic -ll -ltermcap
+
+ LFLAGS= -8 # 8-bit lex scanner for arithmetic
+ CFLAGS+=-DSHELL -I. -I${.CURDIR}
diff --git a/sys-freebsd/freebsd-bin/freebsd-bin-6.2.ebuild b/sys-freebsd/freebsd-bin/freebsd-bin-6.2.ebuild
index bdc9a877eaca..508c9d811b01 100644
--- a/sys-freebsd/freebsd-bin/freebsd-bin-6.2.ebuild
+++ b/sys-freebsd/freebsd-bin/freebsd-bin-6.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-bin/freebsd-bin-6.2.ebuild,v 1.1 2007/01/15 21:34:27 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-bin/freebsd-bin-6.2.ebuild,v 1.2 2007/05/18 16:47:49 uberlord Exp $
inherit bsdmk freebsd
@@ -26,7 +26,8 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/bin
PATCHES="${FILESDIR}/${PN}-6.0-flex-2.5.31.patch
- ${FILESDIR}/${PN}-6.2-mkdir-posix.patch"
+ ${FILESDIR}/${PN}-6.2-mkdir-posix.patch
+ ${FILESDIR}/${PN}-6.2-sh-libedit.patch"
pkg_setup() {
use nls || mymakeopts="${mymakeopts} NO_NLS= "