(AIX Import File) need to list symbols with type 'SECdef' too

(Portage version: 2.1.9.42/cvs/Linux x86_64)

3 files changed, 254 insertions, 1 deletions

diff --git a/sys-devel/native-cctools/ChangeLog b/sys-devel/native-cctools/ChangeLog
index d69ff1024ad9..bc58ae5cd7b0 100644
--- a/sys-devel/native-cctools/ChangeLog
+++ b/sys-devel/native-cctools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/native-cctools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/native-cctools/ChangeLog,v 1.2 2011/02/28 17:34:23 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/native-cctools/ChangeLog,v 1.3 2011/06/07 12:41:30 haubi Exp $
+
+*native-cctools-2 (07 Jun 2011)
+
+  07 Jun 2011; Michael Haubenwallner <haubi@gentoo.org> +files/ld-aix-2,
+  +native-cctools-2.ebuild:
+  (AIX Import File) need to list symbols with type 'SECdef' too
 
   28 Feb 2011; Michael Haubenwallner <haubi@gentoo.org> files/ld-aix-1:
   use /bin/ksh via /usr/bin/env, for bug#282539
diff --git a/sys-devel/native-cctools/files/ld-aix-2 b/sys-devel/native-cctools/files/ld-aix-2
new file mode 100644
index 000000000000..2e9d1c547f50
--- /dev/null
+++ b/sys-devel/native-cctools/files/ld-aix-2
@@ -0,0 +1,139 @@
+#! /usr/bin/env /bin/ksh
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/native-cctools/files/ld-aix-2,v 1.1 2011/06/07 12:41:31 haubi Exp $
+
+# 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/msg00000.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 ($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/native-cctools-2.ebuild b/sys-devel/native-cctools/native-cctools-2.ebuild
new file mode 100644
index 000000000000..fe5c694cd547
--- /dev/null
+++ b/sys-devel/native-cctools/native-cctools-2.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/native-cctools/native-cctools-2.ebuild,v 1.1 2011/06/07 12:41:31 haubi Exp $
+
+EAPI="3"
+
+inherit eutils
+
+DESCRIPTION="Host OS native assembler as and static linker ld"
+HOMEPAGE="http://youroperatingsystem.com/"
+SRC_URI=""
+
+LICENSE="GPL-2" # actually, we don't know, the wrapper is
+SLOT="0"
+
+LD_AIX_V=2
+
+KEYWORDS="~ppc-aix ~x86-interix ~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}
+}