summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-07-16 04:16:47 +0000
committerMike Frysinger <vapier@gentoo.org>2005-07-16 04:16:47 +0000
commitf54359444f46ed864d2ba6a12e496a62327bbc37 (patch)
treeaf62fb9c93e4f337b7cd5e842fe39d37400a8c14 /sys-libs
parentAdding patches needed for mysql-5.0.9_beta (diff)
downloadhistorical-f54359444f46ed864d2ba6a12e496a62327bbc37.tar.gz
historical-f54359444f46ed864d2ba6a12e496a62327bbc37.tar.bz2
historical-f54359444f46ed864d2ba6a12e496a62327bbc37.zip
Fix support for Darwin8. Patch by Kito #99143.
Package-Manager: portage-2.0.51.22-r1
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/readline/ChangeLog6
-rw-r--r--sys-libs/readline/Manifest23
-rw-r--r--sys-libs/readline/files/readline-5.0-darwin.patch17
-rw-r--r--sys-libs/readline/readline-5.0-r2.ebuild5
4 files changed, 37 insertions, 14 deletions
diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog
index 8ef5be04aebf..bb7c3dccd27f 100644
--- a/sys-libs/readline/ChangeLog
+++ b/sys-libs/readline/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-libs/readline
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.48 2005/06/27 22:15:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.49 2005/07/16 04:16:47 vapier Exp $
+
+ 16 Jul 2005; Mike Frysinger <vapier@gentoo.org>
+ +files/readline-5.0-darwin.patch, readline-5.0-r2.ebuild:
+ Fix support for Darwin8. Patch by Kito #99143.
27 Jun 2005; Aron Griffis <agriffis@gentoo.org>
+files/readline-5.0-parallel.patch, readline-5.0-r2.ebuild:
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index c71be0bba483..5457114ea08c 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -3,23 +3,24 @@ Hash: SHA1
MD5 6cd733ddd626b706dc68491cab9bb838 readline-4.3-r6.ebuild 3091
MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 e445742c1d02e2d51f743779c6f0fe2f ChangeLog 7121
-MD5 f33dcb1ac4224298c1d0bf665cf9842a readline-5.0-r2.ebuild 2667
+MD5 081ecf008277f55f7d6ecd8f4a7e34c9 readline-5.0-r2.ebuild 2707
MD5 516ee3121f8b89b2de35d72e02bc9a3b readline-4.3-r5.ebuild 2762
-MD5 b6bf5c9721fc8c623377b40768d18dae files/readline-5.0-del-backspace-policy.patch 1475
-MD5 e3ee94eed45baf4ca76736da56d72bad files/digest-readline-5.0-r2 350
-MD5 cd1beb3627cb585cac6adcb530a01823 files/readline-5.0-parallel.patch 849
-MD5 4a3ebcb995491c2730d156b314cbab0b files/bash-3.0-etc-inputrc.patch 1223
+MD5 2c703c8222b128bdf5ecfe1f1248779e ChangeLog 7280
+MD5 cca21eb56279efff8356d028b1b39dd8 files/digest-readline-4.3-r5 348
MD5 a0bad5c8ba91f5c50ea6c2c97a76f2d1 files/readline-5.0-self-insert.patch 2463
MD5 fe45d673627dab53fb3fcffcb4f55e4e files/readline-5.0-solaris.patch 756
-MD5 cca21eb56279efff8356d028b1b39dd8 files/digest-readline-4.3-r5 348
-MD5 d5f28667389d9681136307274ebc1f28 files/readline-5.0-no_rpath.patch 363
MD5 9905e333ead392447a670e0f2374651a files/macos.patch 504
+MD5 4a3ebcb995491c2730d156b314cbab0b files/bash-3.0-etc-inputrc.patch 1223
+MD5 cd1beb3627cb585cac6adcb530a01823 files/readline-5.0-parallel.patch 849
MD5 cca21eb56279efff8356d028b1b39dd8 files/digest-readline-4.3-r6 348
+MD5 e3ee94eed45baf4ca76736da56d72bad files/digest-readline-5.0-r2 350
+MD5 d5f28667389d9681136307274ebc1f28 files/readline-5.0-no_rpath.patch 363
+MD5 b908c05444b4c9edbeefa1977345182e files/readline-5.0-darwin.patch 461
+MD5 b6bf5c9721fc8c623377b40768d18dae files/readline-5.0-del-backspace-policy.patch 1475
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
-iD8DBQFCwHqRBXaUFmZvwyMRAmzuAJ9YDTPK3cSOtd2YFI8nrgMouXRB2wCePqOA
-n3WqKShtXzzspRB9XcdmOQA=
-=CQ2S
+iD8DBQFC2IqPgIKl8Uu19MoRAmojAJ4ne1HTU6XoWtLXXRX0/NL81C95+QCdG5x2
+2iHL98WiT1wZpBT3o5agjdM=
+=+LCj
-----END PGP SIGNATURE-----
diff --git a/sys-libs/readline/files/readline-5.0-darwin.patch b/sys-libs/readline/files/readline-5.0-darwin.patch
new file mode 100644
index 000000000000..b8bcb9ccea3f
--- /dev/null
+++ b/sys-libs/readline/files/readline-5.0-darwin.patch
@@ -0,0 +1,17 @@
+Support Darwin8 properly.
+
+Patch by Kito.
+
+http://bugs.gentoo.org/99143
+
+--- support/shobj-conf
++++ support/shobj-conf
+@@ -146,7 +146,7 @@
+ SHLIB_LIBSUFF='dylib'
+
+ case "${host_os}" in
+- darwin7*) SHOBJ_LDFLAGS=''
++ darwin[78]*) SHOBJ_LDFLAGS=''
+ SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
+ ;;
+ *) SHOBJ_LDFLAGS='-dynamic'
diff --git a/sys-libs/readline/readline-5.0-r2.ebuild b/sys-libs/readline/readline-5.0-r2.ebuild
index e23f10d19e6a..0f31b82344a3 100644
--- a/sys-libs/readline/readline-5.0-r2.ebuild
+++ b/sys-libs/readline/readline-5.0-r2.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/sys-libs/readline/readline-5.0-r2.ebuild,v 1.4 2005/06/27 22:15:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-5.0-r2.ebuild,v 1.5 2005/07/16 04:16:47 vapier Exp $
inherit eutils gnuconfig
@@ -35,12 +35,13 @@ src_unpack() {
epatch "${FILESDIR}"/${P}-no_rpath.patch
epatch "${FILESDIR}"/${P}-self-insert.patch
epatch "${FILESDIR}"/${P}-del-backspace-policy.patch
+ epatch "${FILESDIR}"/${P}-darwin.patch
# force ncurses linking #71420
sed -i -e 's:^SHLIB_LIBS=:SHLIB_LIBS=-lncurses:' support/shobj-conf || die "sed"
# fix building in parallel
- epatch ${FILESDIR}/readline-5.0-parallel.patch
+ epatch "${FILESDIR}"/readline-5.0-parallel.patch
}
src_compile() {