[gentoo-commits] repo/gentoo:master commit in: sys-devel/native-cctools/, sys-devel/native-cctools/files/aix-2/

2023-12-25 Thread Fabian Groffen 
commit: 9240e5af8d9a2cd9452b4ca6c37a44a1f8e61be2
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Dec 25 11:16:51 2023 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Mon Dec 25 11:16:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9240e5af

sys-devel/native-cctools-5-r1: port to EAPI=8, cleanup

Closes: https://bugs.gentoo.org/919474
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-devel/native-cctools/files/aix-2/ld| 143 -
 sys-devel/native-cctools/files/aix-2/mkexpfile |  70 --
 sys-devel/native-cctools/files/aix-2/nm|   6 -
 ...cctools-5.ebuild => native-cctools-5-r1.ebuild} |   4 +-
 4 files changed, 1 insertion(+), 222 deletions(-)

diff --git a/sys-devel/native-cctools/files/aix-2/ld 
b/sys-devel/native-cctools/files/aix-2/ld
deleted file mode 100644
index 8f9841ef32ee..
--- a/sys-devel/native-cctools/files/aix-2/ld
+++ /dev/null
@@ -1,143 +0,0 @@
-#! /usr/bin/env /bin/ksh
-# Copyright 1999-2018 Gentoo Foundation; Distributed under the GPL v2
-
-# Upon '-soname' and similar flags, create a "shared library" on AIX being an
-# archive file containing an Import File and the shared object file, as in:
-# http://lists.gnu.org/archive/html/libtool/2011-01/msg00023.html
-# with updates in:
-# http://lists.gnu.org/archive/html/libtool/2011-02/msg0.html
-#
-# This helper script is meant not depend on anything Gentoo specific.
-
-ld=/usr/ccs/bin/ld
-ar=/usr/ccs/bin/ar
-strip=/usr/ccs/bin/strip
-dump=/usr/sbin/dump
-awk=/usr/bin/awk
-rm=/usr/bin/rm
-mkdir=/usr/bin/mkdir
-mv=/usr/bin/mv
-ln=/usr/bin/ln
-
-oldargs=
-output=
-soname=
-newargs=
-OBJECT_MODE=${OBJECT_MODE:-32}
-
-while [[ $# -gt 0 ]]
-do
-   arg=$1
-   shift
-   case ${arg} in
-   -rpath=*)
-   arg="-R${arg#-rpath=}"
-   ;;
-   esac
-   oldargs="${oldargs} '${arg}'"
-   case ${arg} in
-   -o)
-   newargs="${newargs} -o '$1'"
-   output=$1
-   oldargs="${oldargs} '$1'"
-   shift
-   ;;
-   -bM:SRE)
-   newargs="${newargs} '-G' '-bernotok'"
-   ;;
-   -soname=*)
-   soname=${arg#-soname=}
-   ;;
-   -h*)
-   soname=${arg#-h}
-   ;;
-   -soname|-h)
-   soname=$1
-   shift
-   ;;
-   -b32)
-   newargs="${newargs} '${arg}'"
-   OBJECT_MODE=32
-   ;;
-   -b64)
-   newargs="${newargs} '${arg}'"
-   OBJECT_MODE=64
-   ;;
-   *)
-   newargs="${newargs} '${arg}'"
-   ;;
-   esac
-done
-
-if [[ -z ${output} || -z ${soname} ]]; then
-   eval "exec ${ld} ${oldargs}"
-   exit 1
-fi
-
-# Running ld against the orginal target file to retain
-# ld error message when there's a problem with it:
-eval "${ld} -o '${output}' ${newargs}" || exit 1
-
-workdir="${output}.$$"
-
-${rm} -rf "${workdir}" || exit 1
-trap "${rm} -rf '${workdir}'" 0
-
-case ${soname} in
-*\(*\))
-   shro=${soname#*\(}
-   shro=${shro%\)}
-   shri=${shro%.*}.imp
-   ;;
-*\[*\])
-   shro=${soname#*\[}
-   shro=${shro%\]}
-   shri=${shro%.*}.imp
-   ;;
-none) # loadable only module, not linkable: no import file
-   shro='shr.o'
-   soname="${output##*/}(${shro})"
-   shri=
-   ;;
-auto)
-   shro='shr.o'
-   soname=${output##*/}
-   if [[ ${soname} == lib*.so* ]]; then
-   # linkable library: need import file
-   shri=${shro%.*}.imp
-   else
-   # loadable only module, not linkable: no import file
-   shri=
-   fi
-   soname="${soname}(${shro})"
-   ;;
-*)
-   shro='shr.o'
-   shri=${shro%.*}.imp
-   soname="${soname}(${shro})"
-   ;;
-esac
-
-export OBJECT_MODE
-
-${mkdir} "${workdir}" || exit 1
-${strip} -e "${output}" || exit 1
-if [[ -n ${shri} ]]; then
-   ${dump} -Tv "${output}" > "${workdir}"/syms || exit 1
-   ${awk} '
-   BEGIN {
-   print "#! '"${soname}"'"
-   print "# '"${OBJECT_MODE}"'"
-   }
-   {
-   if ($4 == "EXP" || $4 == "ImpExp") {
-   print $8
-   } else
-   if ($4 == "wEXP") {
-   print $8" weak"
-   }
-   }' <"${workdir}"/syms > "${workdir}"/${shri} || exit 1
-fi
-${mv} "${output}" "${workdir}/${shro}" || exit 1
-${ar} rc "${output}" ${shri:+"${workdir}/${shri}"} "${workdir}/${shro}" || 
exit 1
-exit 0

diff --git a/sys-devel/native-cctools/files/aix-2/mkexpfile 
b/sys-devel/native-cctools/files/aix-2/mkexpfile
deleted file mode 100644
index 4e79e4647b06..
--- a/sys-devel/native-cctools/files/aix-2/mkexpfile
+++ /dev/null
@@ -1,70

[gentoo-commits] repo/gentoo:master commit in: sys-devel/native-cctools/

2023-12-25 Thread Fabian Groffen 
commit: b9de2ac4b093ca04f089b5161dfe4e262e706105
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Dec 25 11:12:57 2023 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Mon Dec 25 11:12:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9de2ac4

sys-devel/native-cctools-4: cleanup old

Signed-off-by: Fabian Groffen  gentoo.org>

 sys-devel/native-cctools/native-cctools-4.ebuild | 103 ---
 1 file changed, 103 deletions(-)

diff --git a/sys-devel/native-cctools/native-cctools-4.ebuild 
b/sys-devel/native-cctools/native-cctools-4.ebuild
deleted file mode 100644
index 695e5c5a8da0..
--- a/sys-devel/native-cctools/native-cctools-4.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils
-
-DESCRIPTION="Host OS native assembler as and static linker ld"
-HOMEPAGE="https://prefix.gentoo.org/;
-SRC_URI=""
-
-LICENSE="GPL-2" # actually, we don't know, the wrapper is
-SLOT="0"
-
-KEYWORDS="~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-IUSE=""
-
-DEPEND="sys-devel/binutils-config"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-   mkdir -p "${S}"
-}
-
-src_install() {
-   LIBPATH=/usr/$(get_libdir)/binutils/${CHOST}/native-${PV}
-   BINPATH=/usr/${CHOST}/binutils-bin/native-${PV}
-
-   keepdir ${LIBPATH} || die
-   dodir ${BINPATH}
-
-   # allow for future hosts with different paths
-   nativepath=""
-   wrappers=()
-   case ${CHOST} in
-   *-solaris*)
-   nativepath=/usr/sfw/bin
-   ;;
-   *-apple-darwin*)
-   nativepath=/usr/bin
-   ;;
-   *)
-   die "Don't know where the native linker for your 
platform is"
-   ;;
-   esac
-
-   what="addr2line as ar c++filt gprof ld nm objcopy objdump \
-   ranlib readelf elfdump size strings strip"
-   # Darwin things
-   what="${what} install_name_tool ld64 libtool lipo nmedit \
-   otool otool64 pagestuff redo_prebinding segedit"
-
-   # copy from the host os
-   cd "${ED}${BINPATH}"
-   for b in ${what} ; do
-   if [[ ${CHOST} == *-darwin* && ${b} == libtool ]] ; then
-   echo "linking darwin libtool ${nativepath}/${b}"
-   ln -s "${nativepath}/${b}" "${b}"
-   elif [[ -x ${nativepath}/g${b} ]] ; then
-   einfo "linking ${nativepath}/g${b}"
-   ln -s "${nativepath}/g${b}" "${b}"
-   elif [[ -x ${nativepath}/${b} ]] ; then
-   einfo "linking ${nativepath}/${b}"
-   ln -s "${nativepath}/${b}" "${b}"
-   else
-   ewarn "skipping ${b} (not in ${nativepath})"
-   fi
-   done
-
-   # post fix for Darwin's ranlib (doesn't like it when its called other 
than
-   # that, as libtool and ranlib are one tool)
-   if [[ ${CHOST} == *-darwin* ]] ; then
-   rm -f ranlib
-   cat <<-EOF > ranlib
-   #!/usr/bin/env bash
-   exec ${nativepath}/ranlib "\$@"
-   EOF
-   chmod 755 ranlib
-   fi
-
-   exeinto ${BINPATH}
-   local wrapper source target
-   for wrapper in "${wrappers[@]}" ; do
-   source=${wrapper#*=}
-   target=${wrapper%%=*}
-   rm -f "${target}"
-   newexe "${source}" "${target}" || die
-   done
-   # Generate an env.d entry for this binutils
-   insinto /etc/env.d/binutils
-   cat <<-EOF > "${T}"/env.d
-   TARGET="${CHOST}"
-   VER="native-${PV}"
-   LIBPATH="${EPREFIX}/${LIBPATH}"
-   FAKE_TARGETS="${CHOST}"
-   EOF
-   newins "${T}"/env.d ${CHOST}-native-${PV}
-}
-
-pkg_postinst() {
-   binutils-config ${CHOST}-native-${PV}
-}

[gentoo-commits] repo/gentoo:master commit in: sys-devel/native-cctools/

2023-05-29 Thread Sam James 
commit: 116e6844f6c7f11d5991cfeed53e6cfeebc4f2dd
Author: Sam James  gentoo  org>
AuthorDate: Sun May 28 11:22:28 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 29 18:19:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=116e6844

sys-devel/native-cctools: drop dead prefix targets

The removal was already done, so this is just cleanup afterwards.

Signed-off-by: Sam James  gentoo.org>

 sys-devel/native-cctools/native-cctools-4.ebuild | 13 +
 sys-devel/native-cctools/native-cctools-5.ebuild | 13 +
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/sys-devel/native-cctools/native-cctools-4.ebuild 
b/sys-devel/native-cctools/native-cctools-4.ebuild
index ecd205bc79e3..695e5c5a8da0 100644
--- a/sys-devel/native-cctools/native-cctools-4.ebuild
+++ b/sys-devel/native-cctools/native-cctools-4.ebuild
@@ -12,8 +12,6 @@ SRC_URI=""
 LICENSE="GPL-2" # actually, we don't know, the wrapper is
 SLOT="0"
 
-AIX_V='aix-2'
-
 KEYWORDS="~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 IUSE=""
@@ -39,18 +37,9 @@ src_install() {
*-solaris*)
nativepath=/usr/sfw/bin
;;
-   *-aix*)
-   nativepath=/usr/ccs/bin
-   wrappers=("${wrappers[@]}" "ld=${FILESDIR}/${AIX_V}/ld")
-   wrappers=("${wrappers[@]}" "nm=${FILESDIR}/${AIX_V}/nm")
-   wrappers=("${wrappers[@]}" 
"mkexpfile=${FILESDIR}/${AIX_V}/mkexpfile")
-   ;;
-   *-apple-darwin*|*-netbsd*|*-openbsd*)
+   *-apple-darwin*)
nativepath=/usr/bin
;;
-   *-interix*)
-   nativepath=/opt/gcc.3.3/bin
-   ;;
*)
die "Don't know where the native linker for your 
platform is"
;;

diff --git a/sys-devel/native-cctools/native-cctools-5.ebuild 
b/sys-devel/native-cctools/native-cctools-5.ebuild
index b5d237ac5d81..11840006b901 100644
--- a/sys-devel/native-cctools/native-cctools-5.ebuild
+++ b/sys-devel/native-cctools/native-cctools-5.ebuild
@@ -12,8 +12,6 @@ SRC_URI=""
 LICENSE="GPL-2" # actually, we don't know, the wrapper is
 SLOT="0"
 
-AIX_V='aix-2'
-
 KEYWORDS="~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 IUSE=""
@@ -39,18 +37,9 @@ src_install() {
*-solaris*)
nativepath=/usr/sfw/bin
;;
-   *-aix*)
-   nativepath=/usr/ccs/bin
-   wrappers=("${wrappers[@]}" "ld=${FILESDIR}/${AIX_V}/ld")
-   wrappers=("${wrappers[@]}" "nm=${FILESDIR}/${AIX_V}/nm")
-   wrappers=("${wrappers[@]}" 
"mkexpfile=${FILESDIR}/${AIX_V}/mkexpfile")
-   ;;
-   *-apple-darwin*|*-netbsd*|*-openbsd*)
+   *-apple-darwin*)
nativepath=/usr/bin
;;
-   *-interix*)
-   nativepath=/opt/gcc.3.3/bin
-   ;;
*)
die "Don't know where the native linker for your 
platform is"
;;

[gentoo-commits] repo/gentoo:master commit in: sys-devel/native-cctools/

2021-01-06 Thread Fabian Groffen 
commit: 0227499ec0667160ab010a8b3e70941c1151aef8
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed Jan  6 15:32:00 2021 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Wed Jan  6 15:32:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0227499e

sys-devel/native-cctools: drop x86-macos

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

 sys-devel/native-cctools/native-cctools-4.ebuild | 4 ++--
 sys-devel/native-cctools/native-cctools-5.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-devel/native-cctools/native-cctools-4.ebuild 
b/sys-devel/native-cctools/native-cctools-4.ebuild
index 3072575483d..f961a43cc03 100644
--- a/sys-devel/native-cctools/native-cctools-4.ebuild
+++ b/sys-devel/native-cctools/native-cctools-4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -14,7 +14,7 @@ SLOT="0"
 
 AIX_V='aix-2'
 
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 
 IUSE=""
 

diff --git a/sys-devel/native-cctools/native-cctools-5.ebuild 
b/sys-devel/native-cctools/native-cctools-5.ebuild
index 0187a4d1380..821c9fafacd 100644
--- a/sys-devel/native-cctools/native-cctools-5.ebuild
+++ b/sys-devel/native-cctools/native-cctools-5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -14,7 +14,7 @@ SLOT="0"
 
 AIX_V='aix-2'
 
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 
 IUSE=""

[gentoo-commits] repo/gentoo:master commit in: sys-devel/native-cctools/

2020-12-27 Thread Fabian Groffen 
commit: 51839677957caded5b5f81afcd5cc2fd4b47e8cf
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Dec 27 18:17:59 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Dec 27 18:17:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51839677

sys-devel/native-cctools: drop ppc-aix m68k-mint

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-devel/native-cctools/native-cctools-4.ebuild | 4 ++--
 sys-devel/native-cctools/native-cctools-5.ebuild | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys-devel/native-cctools/native-cctools-4.ebuild 
b/sys-devel/native-cctools/native-cctools-4.ebuild
index c05aee16d1b..3072575483d 100644
--- a/sys-devel/native-cctools/native-cctools-4.ebuild
+++ b/sys-devel/native-cctools/native-cctools-4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -14,7 +14,7 @@ SLOT="0"
 
 AIX_V='aix-2'
 
-KEYWORDS="~ppc-aix ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 IUSE=""
 

diff --git a/sys-devel/native-cctools/native-cctools-5.ebuild 
b/sys-devel/native-cctools/native-cctools-5.ebuild
index d548ec568b4..0187a4d1380 100644
--- a/sys-devel/native-cctools/native-cctools-5.ebuild
+++ b/sys-devel/native-cctools/native-cctools-5.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 
 AIX_V='aix-2'
 
-KEYWORDS="~ppc-aix ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 IUSE=""

[gentoo-commits] repo/gentoo:master commit in: sys-devel/native-cctools/

2020-11-26 Thread Fabian Groffen 
commit: ddd1c8bdca710a247562f2a25c82f61f14733054
Author: Fabian Groffen  gentoo  org>
AuthorDate: Thu Nov 26 16:46:40 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Thu Nov 26 16:46:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddd1c8bd

sys-devel/native-cctools-5: version bump for macOS Big Sur

Closes: https://bugs.gentoo.org/756157
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-devel/native-cctools/native-cctools-5.ebuild | 119 +++
 1 file changed, 119 insertions(+)

diff --git a/sys-devel/native-cctools/native-cctools-5.ebuild 
b/sys-devel/native-cctools/native-cctools-5.ebuild
new file mode 100644
index 000..d548ec568b4
--- /dev/null
+++ b/sys-devel/native-cctools/native-cctools-5.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils
+
+DESCRIPTION="Host OS native assembler as and static linker ld"
+HOMEPAGE="https://prefix.gentoo.org/;
+SRC_URI=""
+
+LICENSE="GPL-2" # actually, we don't know, the wrapper is
+SLOT="0"
+
+AIX_V='aix-2'
+
+KEYWORDS="~ppc-aix ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+IUSE=""
+
+DEPEND="sys-devel/binutils-config"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+   mkdir -p "${S}"
+}
+
+src_install() {
+   LIBPATH=/usr/$(get_libdir)/binutils/${CHOST}/native-${PV}
+   BINPATH=/usr/${CHOST}/binutils-bin/native-${PV}
+
+   keepdir ${LIBPATH} || die
+   dodir ${BINPATH}
+
+   # allow for future hosts with different paths
+   nativepath=""
+   wrappers=()
+   case ${CHOST} in
+   *-solaris*)
+   nativepath=/usr/sfw/bin
+   ;;
+   *-aix*)
+   nativepath=/usr/ccs/bin
+   wrappers=("${wrappers[@]}" "ld=${FILESDIR}/${AIX_V}/ld")
+   wrappers=("${wrappers[@]}" "nm=${FILESDIR}/${AIX_V}/nm")
+   wrappers=("${wrappers[@]}" 
"mkexpfile=${FILESDIR}/${AIX_V}/mkexpfile")
+   ;;
+   *-apple-darwin*|*-netbsd*|*-openbsd*)
+   nativepath=/usr/bin
+   ;;
+   *-interix*)
+   nativepath=/opt/gcc.3.3/bin
+   ;;
+   *)
+   die "Don't know where the native linker for your 
platform is"
+   ;;
+   esac
+
+   what="addr2line as ar c++filt gprof ld nm objcopy objdump \
+   ranlib readelf elfdump size strings strip"
+   # Darwin things
+   what="${what} install_name_tool ld64 libtool lipo nmedit \
+   otool otool64 pagestuff redo_prebinding segedit"
+
+   # copy from the host os
+   cd "${ED}${BINPATH}"
+   for b in ${what} ; do
+   if [[ ${CHOST} == *-darwin* && ${b} == libtool ]] ; then
+   echo "linking darwin libtool ${nativepath}/${b}"
+   ln -s "${nativepath}/${b}" "${b}"
+   elif [[ -x ${nativepath}/g${b} ]] ; then
+   einfo "linking ${nativepath}/g${b}"
+   ln -s "${nativepath}/g${b}" "${b}"
+   elif [[ -x ${nativepath}/${b} ]] ; then
+   einfo "linking ${nativepath}/${b}"
+   ln -s "${nativepath}/${b}" "${b}"
+   else
+   ewarn "skipping ${b} (not in ${nativepath})"
+   fi
+   done
+
+   # post fix for Darwin's ranlib (doesn't like it when its called other 
than
+   # that, as libtool and ranlib are one tool)
+   # on macOS Big Sur, all tools except ld require to be called plainly as 
well
+   if [[ ${CHOST} == *-darwin* ]] ; then
+   [[ ${CHOST##*-darwin} -lt 20 ]] && what="ranlib"
+   for b in ${what} ; do
+   [[ ${what} == ld ]] && continue
+   rm -f ${b}
+   cat <<-EOF > ${b}
+   #!/usr/bin/env bash
+   exec ${nativepath}/${b} "\$@"
+   EOF
+   chmod 755 ${b}
+   done
+   fi
+
+   exeinto ${BINPATH}
+   local wrapper source target
+   for wrapper in "${wrappers[@]}" ; do
+   source=${wrapper#*=}
+   target=${wrapper%%=*}
+   rm -f "${target}"
+   newexe "${source}" "${target}" || die
+   done
+   # Generate an env.d entry for this binutils
+   insinto /etc/env.d/binutils
+   cat <<-EOF > "${T}"/env.d
+   TARGET="${CHOST}"
+   VER="native-${PV}"
+   LIBPATH="${EPREFIX}/${LIBPATH}"
+   FAKE_TARGETS="${CHOST}"
+   EOF
+   newins "${T}"/env.d ${CHOST}-native-${PV}
+}
+
+pkg_postinst() {
+   binutils-config ${CHOST}-native-${PV}
+}

[gentoo-commits] repo/gentoo:master commit in: sys-devel/native-cctools/files/aix-2/

2018-05-15 Thread Michael Haubenwallner 
commit: f7f7d26f874d75aaed7774f93ce9d43e57928d19
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Tue May 15 10:17:58 2018 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Tue May 15 17:15:02 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7f7d26f

sys-devel/native-cctools: accept -rpath in aix ld

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sys-devel/native-cctools/files/aix-2/ld | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/sys-devel/native-cctools/files/aix-2/ld 
b/sys-devel/native-cctools/files/aix-2/ld
index 7477f11cf6e..8f9841ef32e 100644
--- a/sys-devel/native-cctools/files/aix-2/ld
+++ b/sys-devel/native-cctools/files/aix-2/ld
@@ -1,5 +1,5 @@
 #! /usr/bin/env /bin/ksh
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2018 Gentoo Foundation; Distributed under the GPL v2
 
 # Upon '-soname' and similar flags, create a "shared library" on AIX being an
 # archive file containing an Import File and the shared object file, as in:
@@ -29,6 +29,11 @@ while [[ $# -gt 0 ]]
 do
arg=$1
shift
+   case ${arg} in
+   -rpath=*)
+   arg="-R${arg#-rpath=}"
+   ;;
+   esac
oldargs="${oldargs} '${arg}'"
case ${arg} in
-o)

[gentoo-commits] repo/gentoo:master commit in: sys-devel/native-cctools/files/

2017-12-03 Thread Fabian Groffen 
commit: 1a4ea629d23148b884094897f094fb5e850c318d
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sun Dec  3 08:52:26 2017 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Dec  3 10:11:01 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a4ea629

sys-devel/native-cctools: remove unused files

Signed-off-by: Fabian Groffen  gentoo.org>

 sys-devel/native-cctools/files/ld-aix-1 | 140 
 sys-devel/native-cctools/files/ld-aix-2 | 138 ---
 2 files changed, 278 deletions(-)

diff --git a/sys-devel/native-cctools/files/ld-aix-1 
b/sys-devel/native-cctools/files/ld-aix-1
deleted file mode 100644
index 452edad70d8..000
--- a/sys-devel/native-cctools/files/ld-aix-1
+++ /dev/null
@@ -1,140 +0,0 @@
-#! /usr/bin/env /bin/ksh
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-
-# Upon '-soname' and similar flags, create a "shared library" on AIX being an
-# archive file containing an Import File and the shared object file, as in:
-# http://lists.gnu.org/archive/html/libtool/2011-01/msg00023.html
-# with updates in:
-# http://lists.gnu.org/archive/html/libtool/2011-02/msg0.html
-#
-# This helper script is meant not depend on anything Gentoo specific.
-
-ld=/usr/ccs/bin/ld
-ar=/usr/ccs/bin/ar
-strip=/usr/ccs/bin/strip
-dump=/usr/sbin/dump
-awk=/usr/bin/awk
-rm=/usr/bin/rm
-mkdir=/usr/bin/mkdir
-mv=/usr/bin/mv
-ln=/usr/bin/ln
-
-oldargs=
-output=
-soname=
-newargs=
-OBJECT_MODE=${OBJECT_MODE:-32}
-
-while [[ $# -gt 0 ]]
-do
-   arg=$1
-   shift
-   oldargs="${oldargs} '${arg}'"
-   case ${arg} in
-   -o)
-   newargs="${newargs} -o '$1'"
-   output=$1
-   oldargs="${oldargs} '$1'"
-   shift
-   ;;
-   -bM:SRE)
-   newargs="${newargs} '-G' '-bernotok'"
-   ;;
-   -soname=*)
-   soname=${arg#-soname=}
-   ;;
-   -h*)
-   soname=${arg#-h}
-   ;;
-   -soname|-h)
-   soname=$1
-   shift
-   ;;
-   -b32)
-   newargs="${newargs} '${arg}'"
-   OBJECT_MODE=32
-   ;;
-   -b64)
-   newargs="${newargs} '${arg}'"
-   OBJECT_MODE=64
-   ;;
-   *)
-   newargs="${newargs} '${arg}'"
-   ;;
-   esac
-done
-
-if [[ -z ${output} || -z ${soname} ]]; then
-   eval "exec ${ld} ${oldargs}"
-   exit 1
-fi
-
-# Running ld against the orginal target file to retain
-# ld error message when there's a problem with it:
-eval "${ld} -o '${output}' ${newargs}" || exit 1
-
-workdir="${output}.$$"
-
-${rm} -rf "${workdir}" || exit 1
-trap "${rm} -rf '${workdir}'" 0
-
-case ${soname} in
-*\(*\))
-   shro=${soname#*\(}
-   shro=${shro%\)}
-   shri=${shro%.*}.imp
-   ;;
-*\[*\])
-   shro=${soname#*\[}
-   shro=${shro%\]}
-   shri=${shro%.*}.imp
-   ;;
-none) # loadable only module, not linkable: no import file
-   shro='shr.o'
-   soname="${output##*/}(${shro})"
-   shri=
-   ;;
-auto)
-   shro='shr.o'
-   soname=${output##*/}
-   if [[ ${soname} == lib*.so* ]]; then
-   # linkable library: need import file
-   shri=${shro%.*}.imp
-   else
-   # loadable only module, not linkable: no import file
-   shri=
-   fi
-   soname="${soname}(${shro})"
-   ;;
-*)
-   shro='shr.o'
-   shri=${shro%.*}.imp
-   soname="${soname}(${shro})"
-   ;;
-esac
-
-export OBJECT_MODE
-
-${mkdir} "${workdir}" || exit 1
-${strip} -e "${output}" || exit 1
-if [[ -n ${shri} ]]; then
-   ${dump} -Tv "${output}" > "${workdir}"/syms || exit 1
-   ${awk} '
-   BEGIN {
-   print "#! '"${soname}"'"
-   print "# '"${OBJECT_MODE}"'"
-   }
-   {
-   if ($6 != "SECdef") {
-   if ($4 == "EXP" || $4 == "ImpExp") {
-   print $8
-   } else
-   if ($4 == "wEXP") {
-   print $8" weak"
-   }
-   }
-   }' <"${workdir}"/syms > "${workdir}"/${shri} || exit 1
-fi
-${mv} "${output}" "${workdir}/${shro}" || exit 1
-${ar} rc "${output}" ${shri:+"${workdir}/${shri}"} "${workdir}/${shro}" || 
exit 1
-exit 0

diff --git a/sys-devel/native-cctools/files/ld-aix-2 
b/sys-devel/native-cctools/files/ld-aix-2
deleted file mode 100644
index 3ca9eb2357e..000
--- a/sys-devel/native-cctools/files/ld-aix-2
+++ /dev/null
@@ -1,138 +0,0 @@
-#! /usr/bin/env /bin/ksh
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-
-# Upon '-soname' and similar flags, create a "shared library" on

[gentoo-commits] repo/gentoo:master commit in: sys-devel/native-cctools/

2017-04-13 Thread Fabian Groffen 
commit: 9a060082fff221957e4ab87a48a8757edeb8acc5
Author: Fabian Groffen  gentoo  org>
AuthorDate: Thu Apr 13 19:02:45 2017 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Thu Apr 13 19:02:45 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a060082

sys-devel/native-cctools: cleanup, convert from EAPI=3 to EAPI=6

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sys-devel/native-cctools/native-cctools-1.ebuild | 107 ---
 sys-devel/native-cctools/native-cctools-2.ebuild | 107 ---
 sys-devel/native-cctools/native-cctools-4.ebuild |   6 +-
 3 files changed, 5 insertions(+), 215 deletions(-)

diff --git a/sys-devel/native-cctools/native-cctools-1.ebuild 
b/sys-devel/native-cctools/native-cctools-1.ebuild
deleted file mode 100644
index 6a61a8cee23..000
--- a/sys-devel/native-cctools/native-cctools-1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-inherit eutils
-
-DESCRIPTION="Host OS native assembler as and static linker ld"
-HOMEPAGE="https://prefix.gentoo.org/;
-SRC_URI=""
-
-LICENSE="GPL-2" # actually, we don't know, the wrapper is
-SLOT="0"
-
-LD_AIX_V=1
-
-KEYWORDS="~ppc-aix ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-IUSE=""
-
-DEPEND="sys-devel/binutils-config"
-RDEPEND="${DEPEND}"
-
-src_install() {
-   LIBPATH=/usr/$(get_libdir)/binutils/${CHOST}/native-${PV}
-   BINPATH=/usr/${CHOST}/binutils-bin/native-${PV}
-
-   keepdir ${LIBPATH} || die
-   dodir ${BINPATH} || die
-
-   # allow for future hosts with different paths
-   nativepath=""
-   wrappers=()
-   case ${CHOST} in
-   *-solaris*)
-   nativepath=/usr/sfw/bin
-   ;;
-   *-aix*)
-   nativepath=/usr/ccs/bin
-   wrappers=("${wrappers[@]}" 
"ld=${FILESDIR}/ld-aix-${LD_AIX_V}")
-   ;;
-   *-apple-darwin*|*-netbsd*|*-openbsd*)
-   nativepath=/usr/bin
-   ;;
-   *-interix*)
-   nativepath=/opt/gcc.3.3/bin
-   ;;
-   *)
-   die "Don't know where the native linker for your 
platform is"
-   ;;
-   esac
-
-   what="addr2line as ar c++filt gprof ld nm objcopy objdump \
-   ranlib readelf elfdump size strings strip"
-   # Darwin things
-   what="${what} install_name_tool ld64 libtool lipo nmedit \
-   otool otool64 pagestuff redo_prebinding segedit"
-
-   # copy from the host os
-   cd "${ED}${BINPATH}"
-   for b in ${what} ; do
-   if [[ ${CHOST} == *-darwin* && ${b} == libtool ]] ; then
-   echo "linking darwin libtool ${nativepath}/${b}"
-   ln -s "${nativepath}/${b}" "${b}"
-   elif [[ -x ${nativepath}/g${b} ]] ; then
-   einfo "linking ${nativepath}/g${b}"
-   ln -s "${nativepath}/g${b}" "${b}"
-   elif [[ -x ${nativepath}/${b} ]] ; then
-   einfo "linking ${nativepath}/${b}"
-   ln -s "${nativepath}/${b}" "${b}"
-   else
-   ewarn "skipping ${b} (not in ${nativepath})"
-   fi
-   done
-
-   # post fix for Darwin's ranlib (doesn't like it when its called other 
than
-   # that, as libtool and ranlib are one tool)
-   if [[ ${CHOST} == *-darwin* ]] ; then
-   rm -f ranlib
-   cat <<-EOF > ranlib
-   #!/usr/bin/env bash
-   exec ${nativepath}/ranlib "\$@"
-   EOF
-   chmod 755 ranlib
-   fi
-
-   exeinto ${BINPATH}
-   local wrapper source target
-   for wrapper in "${wrappers[@]}" ; do
-   source=${wrapper#*=}
-   target=${wrapper%%=*}
-   newexe "${source}" "${target}" || die
-   done
-   # Generate an env.d entry for this binutils
-   insinto /etc/env.d/binutils
-   cat <<-EOF > "${T}"/env.d
-   TARGET="${CHOST}"
-   VER="native-${PV}"
-   LIBPATH="${EPREFIX}/${LIBPATH}"
-   FAKE_TARGETS="${CHOST}"
-   EOF
-   newins "${T}"/env.d ${CHOST}-native-${PV}
-}
-
-pkg_postinst() {
-   binutils-config ${CHOST}-native-${PV}
-}

diff --git a/sys-devel/native-cctools/native-cctools-2.ebuild 
b/sys-devel/native-cctools/native-cctools-2.ebuild
deleted file mode 100644
index 5bb62c15c22..000
--- a/sys-devel/native-cctools/native-cctools-2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-inherit eutils
-
-DESCRIPTION="Host OS native assembler as and static linker ld"

[gentoo-commits] repo/gentoo:master commit in: sys-devel/native-cctools/

2017-01-29 Thread Fabian Groffen 
commit: 6ba0f854594bce5f8004b52bab648a8cf46c4fa9
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Jan 29 20:07:21 2017 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Jan 29 20:13:57 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ba0f854

sys-devel/native-cctools: dropped ~x86-interix

Package-Manager: portage-2.3.3

 sys-devel/native-cctools/native-cctools-1.ebuild | 4 ++--
 sys-devel/native-cctools/native-cctools-2.ebuild | 4 ++--
 sys-devel/native-cctools/native-cctools-4.ebuild | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys-devel/native-cctools/native-cctools-1.ebuild 
b/sys-devel/native-cctools/native-cctools-1.ebuild
index dfd5385..f740a00 100644
--- a/sys-devel/native-cctools/native-cctools-1.ebuild
+++ b/sys-devel/native-cctools/native-cctools-1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,7 +15,7 @@ SLOT="0"
 
 LD_AIX_V=1
 
-KEYWORDS="~ppc-aix ~x86-interix ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris 
~x86-solaris"
+KEYWORDS="~ppc-aix ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 IUSE=""
 

diff --git a/sys-devel/native-cctools/native-cctools-2.ebuild 
b/sys-devel/native-cctools/native-cctools-2.ebuild
index c9afc1d..3eecbd0 100644
--- a/sys-devel/native-cctools/native-cctools-2.ebuild
+++ b/sys-devel/native-cctools/native-cctools-2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,7 +15,7 @@ SLOT="0"
 
 LD_AIX_V=2
 
-KEYWORDS="~ppc-aix ~x86-interix ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris 
~x86-solaris"
+KEYWORDS="~ppc-aix ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 IUSE=""
 

diff --git a/sys-devel/native-cctools/native-cctools-4.ebuild 
b/sys-devel/native-cctools/native-cctools-4.ebuild
index fd60567..7e038eb 100644
--- a/sys-devel/native-cctools/native-cctools-4.ebuild
+++ b/sys-devel/native-cctools/native-cctools-4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,7 +15,7 @@ SLOT="0"
 
 AIX_V='aix-2'
 
-KEYWORDS="~ppc-aix ~x86-interix ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris 
~x86-solaris"
+KEYWORDS="~ppc-aix ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 IUSE=""