diff options
author | Markos Chandras <hwoarang@gentoo.org> | 2010-08-12 14:25:48 +0000 |
---|---|---|
committer | Markos Chandras <hwoarang@gentoo.org> | 2010-08-12 14:25:48 +0000 |
commit | c4a0e5be9c403deb450075811f81792bcd23d143 (patch) | |
tree | 53ff67ef922e462e15eb80605aab2e0b2f33dcf2 /app-shells/scsh | |
parent | whitespace (diff) | |
download | historical-c4a0e5be9c403deb450075811f81792bcd23d143.tar.gz historical-c4a0e5be9c403deb450075811f81792bcd23d143.tar.bz2 historical-c4a0e5be9c403deb450075811f81792bcd23d143.zip |
Respect LDFLAGS. Add missing includes. Bug #331813. Thanks to Cyprien Nicolas <c.nicolas+bugs@gmail.com> for the patch
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'app-shells/scsh')
-rw-r--r-- | app-shells/scsh/ChangeLog | 12 | ||||
-rw-r--r-- | app-shells/scsh/Manifest | 5 | ||||
-rw-r--r-- | app-shells/scsh/files/0.6.7-Makefile.in-LDFLAGS.patch | 11 | ||||
-rw-r--r-- | app-shells/scsh/files/0.6.7-Missing-includes.patch | 22 | ||||
-rw-r--r-- | app-shells/scsh/scsh-0.6.7-r1.ebuild | 44 |
5 files changed, 91 insertions, 3 deletions
diff --git a/app-shells/scsh/ChangeLog b/app-shells/scsh/ChangeLog index 6593c34a0a89..fa3606c4adf9 100644 --- a/app-shells/scsh/ChangeLog +++ b/app-shells/scsh/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-shells/scsh -# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/scsh/ChangeLog,v 1.29 2009/03/28 22:24:00 vadimk Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-shells/scsh/ChangeLog,v 1.30 2010/08/12 14:25:48 hwoarang Exp $ + +*scsh-0.6.7-r1 (12 Aug 2010) + + 12 Aug 2010; Markos Chandras <hwoarang@gentoo.org> + +files/0.6.7-Makefile.in-LDFLAGS.patch, +scsh-0.6.7-r1.ebuild, + +files/0.6.7-Missing-includes.patch: + Respect LDFLAGS. Add missing includes. Bug #331813. Thanks to Cyprien + Nicolas <c.nicolas+bugs@gmail.com> for the patch 28 Mar 2009; Vadim Kuznetsov vadimk@gentoo.org scsh-0.6.7.ebuild: Bug 234691. Using multilib_toolchain_setup to enable amd64 diff --git a/app-shells/scsh/Manifest b/app-shells/scsh/Manifest index 8f93e2c56c17..6102b7c118b5 100644 --- a/app-shells/scsh/Manifest +++ b/app-shells/scsh/Manifest @@ -1,8 +1,11 @@ AUX 0.6.6-Makefile.in-doc-dir-gentoo.patch 4096 RMD160 a59b4f30ce82a27083fea6c130f25264011c4e67 SHA1 c4f3c062cbdb38443b48d86b8c503b6599f5d1b8 SHA256 dd03955a4fdcac99a1e05026b780fb70aea37eb806c2e38861a5e27a043cf653 +AUX 0.6.7-Makefile.in-LDFLAGS.patch 369 RMD160 dbd3620575e6f000cc358dcd9f7570cb74ce3e07 SHA1 1b96cd61ac58f075f9be751894fd32c7f6414e49 SHA256 11fb1938b86c8f7231634c6c05a653b25a53e0b790b73a4d7540183f28feeb20 AUX 0.6.7-Makefile.in-doc-dir-gentoo.patch 4096 RMD160 39b7eccdb62d98a26f25af9b0185a44b3ac36072 SHA1 bfb62bfa7a085d23aa4de3bcbc0e3a9607e3608f SHA256 36ae0151832b064e1a8bf2eaf54ca8f73fa7a2c7511d3ada19fc16b12eca19f3 +AUX 0.6.7-Missing-includes.patch 583 RMD160 d750292d920368c1cd08f05bf383d72f336c5e63 SHA1 4ba3ec775393453f2ad2ce28672adf6452252908 SHA256 56ba1f9113215b894d0652c2e7033a11e6e0ba7150c5c6c0aa285fc36c1030a8 DIST scsh-0.6.6.tar.gz 4332223 RMD160 f81f7bb60d97035c61912092c2b16eebe953b999 SHA1 5d38ec103e1cb885e634bb3475e8912ac892067b SHA256 3cc162ce6e0ac3905d71a1f45b612bbb92f2df55b1a4c4c5736624777350f5bb DIST scsh-0.6.7.tar.gz 4367439 RMD160 f017c5a157cd1a3ad5daeaecba43ce84784c7e51 SHA1 a1eaf0d0593e14914824898a0c3ec166429affd7 SHA256 c4a9f7df2a0bb7a7aa3dafc918aa9e9a566d4ad33a55f0192889de172d1ddb7f EBUILD scsh-0.6.6.ebuild 1003 RMD160 6e0118d553b694d62ddca06fe55c5cc165818bdb SHA1 8cca20afcf73b3698eeea52f4985325ba9d281be SHA256 bce8fcb18c6aae242a566b49ab63c454a5074ec5835bd88a1fdb0c4a859e83e4 +EBUILD scsh-0.6.7-r1.ebuild 1119 RMD160 9a34c6af92f48a7ef55107c8d9f9cbc3d8686e34 SHA1 49aeb660b3905832488c04a1d53b34a4dd2a2d7b SHA256 3381278e2a61652f02ce6dc2c2228867169e07373f2d649edb7b19f515048ece EBUILD scsh-0.6.7.ebuild 1006 RMD160 1d779543235fc954678763294acf5283a00498ca SHA1 721adbc2dd581cd09e20e1162f17191e09fb689f SHA256 4e5d1b1caab8ea566984538085138195c51034a788fcd8ca7ca609a4946d33b0 -MISC ChangeLog 4060 RMD160 a332180ccc02dd36032bd6b734f26661ce3c3cf6 SHA1 9f071a3ed627137cc3d2fbc11d43d69e2cef0b7e SHA256 bc47b42762d36bdb2bfbb15758c256ae30844f636f0bd9cf43e711f820869a9b +MISC ChangeLog 4373 RMD160 4caffbd8c7e645a7fe596f8b4a52ff06055ef285 SHA1 fb897cc531bd34ee0d3213b91bfed4124fa88501 SHA256 326cdb7751c47fee9d8e9465f07e84cdc9cd9c01d2e42598d1463bdcd693bf95 MISC metadata.xml 962 RMD160 1048bd9ca6ce3f6e41e75f6f651a517603d21ff1 SHA1 e947087245a5a7c455097feed94053e2ecadddd6 SHA256 b03fa9f93563cf5208ff3a29a336c54fdbc00cc177641cc83c35a7404fea16b4 diff --git a/app-shells/scsh/files/0.6.7-Makefile.in-LDFLAGS.patch b/app-shells/scsh/files/0.6.7-Makefile.in-LDFLAGS.patch new file mode 100644 index 000000000000..b1c6480885d8 --- /dev/null +++ b/app-shells/scsh/files/0.6.7-Makefile.in-LDFLAGS.patch @@ -0,0 +1,11 @@ +--- Makefile.in.orig 2010-08-11 16:55:09.246939884 +0200 ++++ Makefile.in 2010-08-11 16:55:31.309819842 +0200 +@@ -853,7 +853,7 @@ + cig/libcig.c: cig/libcig.scm + + scsh/scsh: scsh/scsh-tramp.c +- $(CC) -o $@ $(CPPFLAGS) $(CFLAGS) \ ++ $(CC) -o $@ $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) \ + -DVM=\"$(LIB)/$(VM)\" \ + -DIMAGE=\"$(LIB)/scsh.image\" \ + $(srcdir)/scsh/scsh-tramp.c diff --git a/app-shells/scsh/files/0.6.7-Missing-includes.patch b/app-shells/scsh/files/0.6.7-Missing-includes.patch new file mode 100644 index 000000000000..33bb5529d251 --- /dev/null +++ b/app-shells/scsh/files/0.6.7-Missing-includes.patch @@ -0,0 +1,22 @@ +diff -r 3dd93fcbca44 c/unix/dynamo.c +--- a/c/unix/dynamo.c Wed Aug 11 17:02:46 2010 +0200 ++++ b/c/unix/dynamo.c Wed Aug 11 17:04:34 2010 +0200 +@@ -5,6 +5,7 @@ + + #include <stdlib.h> + #include <unistd.h> ++#include <string.h> + #include "sysdep.h" + #include "scheme48.h" + +diff -r 3dd93fcbca44 c/unix/socket.c +--- a/c/unix/socket.c Wed Aug 11 17:02:46 2010 +0200 ++++ b/c/unix/socket.c Wed Aug 11 17:04:34 2010 +0200 +@@ -8,6 +8,7 @@ + #include <sys/types.h> + #include <sys/socket.h> + #include <sys/param.h> ++#include <malloc.h> + #include <errno.h> + #include <fcntl.h> + #include <netdb.h> diff --git a/app-shells/scsh/scsh-0.6.7-r1.ebuild b/app-shells/scsh/scsh-0.6.7-r1.ebuild new file mode 100644 index 000000000000..9d219238ebf5 --- /dev/null +++ b/app-shells/scsh/scsh-0.6.7-r1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-shells/scsh/scsh-0.6.7-r1.ebuild,v 1.1 2010/08/12 14:25:48 hwoarang Exp $ + +EAPI="2" + +inherit eutils multilib + +MY_PV="${PV%*.*}" + +DESCRIPTION="Unix shell embedded in Scheme" +HOMEPAGE="http://www.scsh.net/" +SRC_URI="ftp://ftp.scsh.net/pub/scsh/${MY_PV}/${P}.tar.gz" + +LICENSE="as-is BSD" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="" + +DEPEND="!dev-scheme/scheme48" +RDEPEND="${DEPEND}" + +src_prepare() { + epatch "${FILESDIR}/${PV}-Makefile.in-doc-dir-gentoo.patch" + epatch "${FILESDIR}/${PV}-Makefile.in-LDFLAGS.patch" + epatch "${FILESDIR}/${PV}-Missing-includes.patch" +} + +src_configure() { + use amd64 && multilib_toolchain_setup x86 + SCSH_LIB_DIRS="/usr/$(get_libdir)/${PN}" + econf \ + --libdir=/usr/$(get_libdir) \ + --includedir=/usr/include \ + --with-lib-dirs-list=${SCSH_LIB_DIRS} +} + +src_install() { + emake -j1 DESTDIR="${D}" install || die "make install failed." + + local ENVD="${T}/50scsh" + echo "SCSH_LIB_DIRS=\"${SCSH_LIB_DIRS}\"" > "${ENVD}" + doenvd "${ENVD}" +} |