[gentoo-commits] repo/gentoo:master commit in: sys-libs/csu/

[gentoo-commits] repo/gentoo:master commit in: sys-libs/csu/

[Fabian Groffen]

commit:     53300fdc88e9d3732b6eb30ff06997a02ba3df05
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 13 19:07:42 2017 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Apr 13 19:07:42 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53300fdc

sys-libs/csu: forward port csu-79 from EAPI=3

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sys-libs/csu/csu-79.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-libs/csu/csu-79.ebuild b/sys-libs/csu/csu-79.ebuild
index e8244cfd301..bd386e8f1cd 100644
--- a/sys-libs/csu/csu-79.ebuild
+++ b/sys-libs/csu/csu-79.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=3
+EAPI=5
 
 DESCRIPTION="Darwin Csu (crt1.o) - Mac OS X 10.6.6 to 10.9.5 versions"
 HOMEPAGE="http://www.opensource.apple.com/"

[gentoo-commits] repo/gentoo:master commit in: sys-libs/csu/

[Fabian Groffen]

commit:     54b8dc19fb80e6e6a10ccd8f14dc9765793b6f24
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 12 10:43:54 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jun 12 10:44:10 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54b8dc19

sys-libs/csu: require Clang or gcc-apple compiler

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sys-libs/csu/csu-85.ebuild | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/sys-libs/csu/csu-85.ebuild b/sys-libs/csu/csu-85.ebuild
index f8c0f3f7d29..4e6c9fd1daf 100644
--- a/sys-libs/csu/csu-85.ebuild
+++ b/sys-libs/csu/csu-85.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,6 +16,13 @@ KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 S=${WORKDIR}/Csu-${PV}
 
+# for now it seems FSF GCC can't compile this thing, so we need
+# gcc-apple or clang (which is also sort of "-apple")
+DEPEND="|| (
+		sys-devel/clang
+		=sys-devel/gcc-apple-4.2.1*
+	)"
+
 src_prepare() {
 	# since we don't have crt0, we can't build it either
 	sed -i \
@@ -39,6 +46,12 @@ src_prepare() {
 }
 
 src_compile() {
+	# FSF GCC-7.3.0 most notably complains about private_externs, but it
+	# also has issues with the assembly, so use gcc-apple, if it is
+	# installed.  Normally, (non-ppc) users will have clang installed,
+	# so this isn't used, should they have gcc-apple installed, then
+	# this wouldn't hurt either.
+	type -P gcc-4.2.1 > /dev/null && export CC=gcc-4.2.1
 	emake USRLIBDIR="${EPREFIX}"/lib || die
 }
 

[gentoo-commits] repo/gentoo:master commit in: sys-libs/csu/

[Fabian Groffen]

commit:     b7f6b2f4e3b2caf48d538d1ed5859e6c16228a25
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 26 09:19:31 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Dec 26 09:19:44 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7f6b2f4

sys-libs/csu: revbump to respect CFLAGS

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 sys-libs/csu/{csu-85.ebuild => csu-85-r1.ebuild} | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sys-libs/csu/csu-85.ebuild b/sys-libs/csu/csu-85-r1.ebuild
similarity index 95%
rename from sys-libs/csu/csu-85.ebuild
rename to sys-libs/csu/csu-85-r1.ebuild
index 6d0fb053db7..28ea492c1a5 100644
--- a/sys-libs/csu/csu-85.ebuild
+++ b/sys-libs/csu/csu-85-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -29,6 +29,7 @@ src_prepare() {
 		-e 's:$(SYMROOT)/crt0.o::' \
 		-e '/LOCLIBDIR)\/crt0.o/d' \
 		-e '/^CC = /d' \
+		-e "/ARCH_CFLAGS =/s|=|= ${CFLAGS}|" \
 		Makefile || die
 
 	# only require Availability.h for arm, bugs #538602, #539964

[gentoo-commits] repo/gentoo:master commit in: sys-libs/csu/

[Fabian Groffen]

commit:     e51c8f7c6081fd5cab93d33984a66b246e72a949
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 26 09:22:08 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Dec 26 09:22:08 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e51c8f7c

sys-libs/csu: bump to EAPI=7

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 sys-libs/csu/csu-85-r1.ebuild | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/sys-libs/csu/csu-85-r1.ebuild b/sys-libs/csu/csu-85-r1.ebuild
index 28ea492c1a5..8c9ad7d9a73 100644
--- a/sys-libs/csu/csu-85-r1.ebuild
+++ b/sys-libs/csu/csu-85-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs
 
 DESCRIPTION="Darwin Csu (crt1.o) - Mac OS X 10.10 version"
 HOMEPAGE="http://www.opensource.apple.com/"
@@ -33,7 +33,7 @@ src_prepare() {
 		Makefile || die
 
 	# only require Availability.h for arm, bugs #538602, #539964
-	epatch "${FILESDIR}"/${P}-arm-availability.patch
+	eapply "${FILESDIR}"/${P}-arm-availability.patch
 
 	if [[ ${CHOST} == powerpc* ]] ; then
 		# *must not* be compiled with -Os on PPC because that
@@ -44,6 +44,8 @@ src_prepare() {
 		# be more than 16MB away
 		sed -i -e "s, -Os , -O ,g" Makefile || die
 	fi
+
+	eapply_user
 }
 
 src_compile() {

[gentoo-commits] repo/gentoo:master commit in: sys-libs/csu/

[Fabian Groffen]

commit:     ed4d1de9728f743fd8e072bd896c76078bf5e20c
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  6 15:33:46 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Jan  6 15:33:46 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed4d1de9

sys-libs/csu: drop x86-macos

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 sys-libs/csu/csu-79.ebuild    | 4 ++--
 sys-libs/csu/csu-85-r1.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-libs/csu/csu-79.ebuild b/sys-libs/csu/csu-79.ebuild
index 465515a1d79..c0261b5457a 100644
--- a/sys-libs/csu/csu-79.ebuild
+++ b/sys-libs/csu/csu-79.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="~ppc-macos ~x64-macos"
 IUSE=""
 S=${WORKDIR}/Csu-${PV}
 

diff --git a/sys-libs/csu/csu-85-r1.ebuild b/sys-libs/csu/csu-85-r1.ebuild
index 8c9ad7d9a73..f5c3553c3da 100644
--- a/sys-libs/csu/csu-85-r1.ebuild
+++ b/sys-libs/csu/csu-85-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="~ppc-macos ~x64-macos"
 IUSE=""
 S=${WORKDIR}/Csu-${PV}
 

[gentoo-commits] repo/gentoo:master commit in: sys-libs/csu/

[Jakov Smolić]

commit:     1bf0a0fc84490c026df0c3cd8ade390cd5b7c0a0
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 21 11:22:28 2021 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Thu Oct 21 11:27:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bf0a0fc

sys-libs/csu: drop csu-79

EAPI 5 ebuild

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 sys-libs/csu/Manifest      |  1 -
 sys-libs/csu/csu-79.ebuild | 44 --------------------------------------------
 2 files changed, 45 deletions(-)

diff --git a/sys-libs/csu/Manifest b/sys-libs/csu/Manifest
index 975fae05aff..480d3d1052c 100644
--- a/sys-libs/csu/Manifest
+++ b/sys-libs/csu/Manifest
@@ -1,2 +1 @@
-DIST Csu-79.tar.gz 12719 BLAKE2B f44e979323da828ebe4546ef3077dc1fd6feaf832e0a55aa09a9ba69a83c64759548f34ede8f92769f37e88d78e248b74c4a7e042857f74a8b88fc5958481ea4 SHA512 1d47cce40d400241bdd0a4c24e332f999cb7ae08bd43b08b88e9b5fd5a0a53c9752816b0e07c5b6ffb78f7b5bc24f45986c6a50c661bc5cdd15fee5e465da1bb
 DIST Csu-85.tar.gz 13376 BLAKE2B 59aa275bf01bb785b848447ff1291e0018b2f2bc3c42f4f222957aa6c1f9fd344fa6dca9ee53fb8d9d3b11f6c03c37fff9178c40e5a009712f251f502e1f4957 SHA512 3cfeb7d37630fc9d6607da018b9ac1aeb3f41a4c190a67e7dc242ae48e7abd0026e25055b9459f2f187d3bb25644f516f079d1b2e943e8cb4cc6c132ad594467

diff --git a/sys-libs/csu/csu-79.ebuild b/sys-libs/csu/csu-79.ebuild
deleted file mode 100644
index c0261b5457a..00000000000
--- a/sys-libs/csu/csu-79.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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"
-
-LICENSE="APSL-2"
-
-SLOT="0"
-KEYWORDS="~ppc-macos ~x64-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' \
-		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() {
-	emake USRLIBDIR="${EPREFIX}"/lib
-}
-
-src_install() {
-	emake -j1 \
-		USRLIBDIR="${EPREFIX}"/lib \
-		LOCLIBDIR="${EPREFIX}"/lib \
-		DSTROOT="${D}" \
-		install
-}

[gentoo-commits] repo/gentoo:master commit in: sys-libs/csu/

[Fabian Groffen]

commit:     75ba22b15061af1bbda7a9be9fdb5f8961a5a589
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 13 14:05:56 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Dec 13 14:06:09 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75ba22b1

sys-libs/csu-85-r1: fix compilation for newer setups

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 sys-libs/csu/csu-85-r1.ebuild | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/sys-libs/csu/csu-85-r1.ebuild b/sys-libs/csu/csu-85-r1.ebuild
index 24e82d76af36..4b11e2f86b8d 100644
--- a/sys-libs/csu/csu-85-r1.ebuild
+++ b/sys-libs/csu/csu-85-r1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+inherit flag-o-matic
+
 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"
@@ -21,6 +23,10 @@ DEPEND="|| (
 	)"
 
 src_prepare() {
+	# apart from gcc-4.2.1 possibly not understanding, this better not
+	# be aggressively optimised
+	filter-flags -march=* -mtune=*
+
 	# since we don't have crt0, we can't build it either
 	sed -i \
 		-e 's:$(SYMROOT)/crt0.o::' \