From: Fabian Groffen Date: Tue, 3 Feb 2015 21:04:14 +0000 (+0000) Subject: Version bump to version from Darwin14, based on ebuild and patch by Michael Weiser... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5daaefe3eeb5af26f3160feb2a9edb5fec032c48;p=gentoo.git Version bump to version from Darwin14, based on ebuild and patch by Michael Weiser, bug #538602 Package-Manager: portage-2.2.14-prefix/cvs/Darwin i386 Manifest-Sign-Key: 0x5F75F607C5C74E89 --- diff --git a/sys-libs/csu/ChangeLog b/sys-libs/csu/ChangeLog index b6b7c25bd51e..e1bcd70fd92a 100644 --- a/sys-libs/csu/ChangeLog +++ b/sys-libs/csu/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-libs/csu -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/csu/ChangeLog,v 1.7 2011/09/04 13:20:29 grobian Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/csu/ChangeLog,v 1.8 2015/02/03 21:04:09 grobian Exp $ + +*csu-85 (03 Feb 2015) + + 03 Feb 2015; Fabian Groffen +csu-85.ebuild, + +files/csu-85-darwin8.patch, csu-79.ebuild: + Version bump to version from Darwin14, based on ebuild and patch by Michael + Weiser, bug #538602 04 Sep 2011; Fabian Groffen csu-79.ebuild: Fix build on case-sensitive volumes, bug #381779 @@ -28,4 +35,3 @@ 15 Nov 2004; Kito +csu-46.ebuild: initial import. added ~ppc-macos - diff --git a/sys-libs/csu/Manifest b/sys-libs/csu/Manifest index 3bb7d6f2da7d..5ff65c7db083 100644 --- a/sys-libs/csu/Manifest +++ b/sys-libs/csu/Manifest @@ -1,14 +1,17 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 -DIST Csu-79.tar.gz 12719 RMD160 2ab6404116ff40c0e5a3c1cf6f4afc592db33fe2 SHA1 3a2f5de8bbacaa71f1827e6d501a8c773a5ee938 SHA256 d052e1daa1f5de7fc02e7e7cb8b79ee2eeaad0f321c0a70bea4fc7217e232ec2 -EBUILD csu-79.ebuild 860 RMD160 6a593bed7d54c70bd01865f0d2fa735e850a8f0f SHA1 0a13b1cec55681912cb46d5829ced335820cef6b SHA256 c0a36b12a090a001ca002c2634a1af05ba84de2fa77867a3779c680aec02774e -MISC ChangeLog 1048 RMD160 616af4ab8daa6190f12ef20e29537f0519db1b28 SHA1 7c8e355cb9bf062ce660e351368a70c41d106526 SHA256 3156c39fa5c0c26704c1ba248917414d037add111bb11eee952d203461d90d11 -MISC metadata.xml 161 RMD160 6c29747dbb0db1b73447a647429f26ee2f888de6 SHA1 f3516c315c02c36a8ab630c8019d0d88a4507ef0 SHA256 eac14dbe95ed36c1455585d4c47b5f4ce921e4d5cc459f2f49c703926f4a91c0 +AUX csu-85-darwin8.patch 639 SHA256 3794783805ea8a188ae1c051f0a6f7aaa1a75d1f8acfdfb4728296299f4d3e89 SHA512 d687225bf224bde96eece968a7066fecd8b9c35df2de84e46dd8b591e971f53e1a1ae5ff67554a00d35eba708929f43ecc2b45c9feb76f7a6d6934bf3f808acc WHIRLPOOL 0b1c2430d38c3803d20a7959645e6ebb660654552c41ddf90807028b7ea7084f6aa2d03f573f937774097101b5b43b833c8ed5a0246a1aa2fc27c575372b176b +DIST Csu-79.tar.gz 12719 SHA256 d052e1daa1f5de7fc02e7e7cb8b79ee2eeaad0f321c0a70bea4fc7217e232ec2 SHA512 1d47cce40d400241bdd0a4c24e332f999cb7ae08bd43b08b88e9b5fd5a0a53c9752816b0e07c5b6ffb78f7b5bc24f45986c6a50c661bc5cdd15fee5e465da1bb WHIRLPOOL 74df2f9a9c42bc346f165d8db1d9b3862e2eab89f5b7112e73e27c41419258c0f9c203d7c13acbe43bf2f6c253d12d0f37139d98188773b807419f6bd6bdf4cc +DIST Csu-85.tar.gz 13376 SHA256 f2291d7548da854322acf194a875609bfae96c2481738cf6fd1d89eea9ae057a SHA512 3cfeb7d37630fc9d6607da018b9ac1aeb3f41a4c190a67e7dc242ae48e7abd0026e25055b9459f2f187d3bb25644f516f079d1b2e943e8cb4cc6c132ad594467 WHIRLPOOL 96552600235fa7e098658e16e2afc1f95ead6bb705703faa6b8f792ec6bcacf9c5c7da5de729d98f83eae337d086750b536f7c1ee0f1a2d5223b53a18d5143f4 +EBUILD csu-79.ebuild 1259 SHA256 ed46ae8bb3b214daa42de9f42a60f6ae7f54a5890bdc0e181a45c055b96306c2 SHA512 405e7f8b1ef6434daf5479236597721cd2f4da00176d0af309afb8c38a3cce8cc0cfb42d24679b05293d5f6824594c0f423fbe91e1ad337e574e008d2dc77364 WHIRLPOOL b752dcf804842ffb61276f5e076562d271da6f231c7df3b835f869f6112e052af5a1e0523652cc9ae83ee0f87229b2200146fcc5f7207bfed6bc5df866958df7 +EBUILD csu-85.ebuild 1374 SHA256 6d99cfa95b265005e6ada97f8f502a8746a6486c701146b746557ca7022a87be SHA512 83091f8835193aabc77f8e378b3115a0e9bdd354e8b8e64391239c51f9150c5d80e94564a5f9afca40c37bd91db19f2943d9d2b5ced8e981eacca487aff3b46f WHIRLPOOL 8be1c419601a2e5a1323c61248eb1de88f9046c9b5e75287c3bfd298b1036c72bd099bdea679d5d8a6c400a2bb02654d86fdd6633fa23ea986f3453ab463bba8 +MISC ChangeLog 1284 SHA256 c543b905c537c8cd717a0cfc232efd74d908dbc4d35e5e45dc0e9ca732b1838c SHA512 dc64f19adad22cfec53f2e42077d0049b53fa994d6eb53fb28bcb69c175d107cefd0e3c2376300e058fb3141600b10fd4b28e3aa555c747c73251b40f1083c86 WHIRLPOOL 3afde4a7519ba0c581221349d7fc2bc6352c265ece48dd9939de8a6b833c9817625ba1f60ac6b6c2cdaa064c1fbe3d25089822219c65327f19860b56d75673d0 +MISC metadata.xml 161 SHA256 eac14dbe95ed36c1455585d4c47b5f4ce921e4d5cc459f2f49c703926f4a91c0 SHA512 997f3c37368ef884169524d7a8123d77255807934e02650823be61ac10db031b553ec3f2f0cb479032468b32d9c196573bffcbc143ae005263d6acd7a5935e36 WHIRLPOOL 4538c8452ca577cc356b6a0cb2d22f8e87b86af9eb3d1da0a4905238e0bad28522fd1eb8843b2ab4817c210bb70efb03df4b06f77586497885c5c3a86f9d2915 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (Darwin) +Version: GnuPG v2 -iEYEARECAAYFAk5jeyIACgkQX3X2B8XHTolCawCgiZyE0fZITDpoke+FmZxuRjTA -31UAnA8207XCXPC6JjE0XsaKaWWBEtu9 -=fpfc +iEYEAREIAAYFAlTRN8sACgkQX3X2B8XHTokVIQCfTPdRONCi8KS1qoG26cU3bbrQ +kq0An2rAqNohqrojqiC7xYL7cNhA7+yw +=lJ8k -----END PGP SIGNATURE----- diff --git a/sys-libs/csu/csu-79.ebuild b/sys-libs/csu/csu-79.ebuild index 7acc2059bd32..04a22032f955 100644 --- a/sys-libs/csu/csu-79.ebuild +++ b/sys-libs/csu/csu-79.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/csu/csu-79.ebuild,v 1.3 2011/09/04 13:20:29 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/csu/csu-79.ebuild,v 1.4 2015/02/03 21:04:09 grobian Exp $ EAPI=3 -DESCRIPTION="Darwin Csu (crt1.o) - Mac OS X 10.6.6 and 10.7 versions" +DESCRIPTION="Darwin Csu (crt1.o) - Mac OS X 10.6.6 to 10.9.5 versions" HOMEPAGE="http://www.opensource.apple.com/" SRC_URI="http://www.opensource.apple.com/tarballs/Csu/Csu-${PV}.tar.gz" @@ -21,6 +21,15 @@ src_prepare() { -e 's:$(SYMROOT)/crt0.o::' \ -e '/LOCLIBDIR)\/crt0.o/d' \ Makefile || die + + if [[ ${CHOST} == powerpc-*-darwin* && ${CHOST##*-darwin} -le 8 ]] ; then + # *must not* be compiled with -Os on PPC because that will + # optimize out _pointer_to__darwin_gcc3_preregister_frame_info + # which causes linker errors for large programs because the + # jump to ___darwin_gcc3_preregister_frame_info gets to be more + # than 16MB away + sed -i -e "s, -Os , -O ,g" Makefile || die + fi } src_compile() { diff --git a/sys-libs/csu/csu-85.ebuild b/sys-libs/csu/csu-85.ebuild new file mode 100644 index 000000000000..fec699cdf02d --- /dev/null +++ b/sys-libs/csu/csu-85.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/csu/csu-85.ebuild,v 1.1 2015/02/03 21:04:09 grobian Exp $ + +EAPI=5 + +inherit eutils + +DESCRIPTION="Darwin Csu (crt1.o) - Mac OS X 10.10 version" +HOMEPAGE="http://www.opensource.apple.com/" +SRC_URI="http://www.opensource.apple.com/tarballs/Csu/Csu-${PV}.tar.gz" + +LICENSE="APSL-2" + +SLOT="0" +KEYWORDS="~ppc-macos ~x64-macos ~x86-macos" +IUSE="" +S=${WORKDIR}/Csu-${PV} + +src_prepare() { + # since we don't have crt0, we can't build it either + sed -i \ + -e 's:$(SYMROOT)/crt0.o::' \ + -e '/LOCLIBDIR)\/crt0.o/d' \ + -e '/^CC = /d' \ + Makefile || die + + if [[ ${CHOST##*-darwin} -le 8 ]] ; then + # Availability.h missing + epatch "${FILESDIR}"/${P}-darwin8.patch + + if [[ ${CHOST} == powerpc* ]] ; then + # *must not* be compiled with -Os on PPC because that + # will optimize out + # _pointer_to__darwin_gcc3_preregister_frame_info which + # causes linker errors for large programs because the + # jump to ___darwin_gcc3_preregister_frame_info gets to + # be more than 16MB away + sed -i -e "s, -Os , -O ,g" Makefile || die + fi + fi +} + +src_compile() { + emake USRLIBDIR="${EPREFIX}"/lib || die +} + +src_install() { + emake -j1 \ + USRLIBDIR="${EPREFIX}"/lib \ + LOCLIBDIR="${EPREFIX}"/lib \ + DSTROOT="${D}" \ + install || die +} diff --git a/sys-libs/csu/files/csu-85-darwin8.patch b/sys-libs/csu/files/csu-85-darwin8.patch new file mode 100644 index 000000000000..a62a6f6b7045 --- /dev/null +++ b/sys-libs/csu/files/csu-85-darwin8.patch @@ -0,0 +1,23 @@ +--- Csu-85/start.s ++++ Csu-85/start.s +@@ -22,7 +22,10 @@ + * @APPLE_LICENSE_HEADER_END@ + */ + +-#include ++/* This is fun: We could use AvailabilityMacros.h to check if we're compiling ++ * for < 10.5 and not inclue Availability.h then. But we are compiling with ++ * deployment target 10.5 *on this host* where we still won't have ++ * Availability.h. So just drop the include */ + + #if __ppc__ && __DYNAMIC__ + // +@@ -203,7 +206,7 @@ + cmp r4, #0 + bne Lapple + // "apple" param now in r3 +-#if __STATIC__ || ((__IPHONE_OS_VERSION_MIN_REQUIRED >= 30100) && !__ARM_ARCH_4T__) ++#if __STATIC__ + bl _main + b _exit + #else