[gentoo-commits] gentoo-alt r1626 - in trunk/aix-miscutils: . aixdll ldd

[Michael Haubenwallner (haubi)]

Author: haubi
Date: 2008-04-21 12:08:44 +0000 (Mon, 21 Apr 2008)
New Revision: 1626

Added:
   trunk/aix-miscutils/aixdll/
   trunk/aix-miscutils/aixdll/Makefile.am
   trunk/aix-miscutils/aixdll/aixdll
Modified:
   trunk/aix-miscutils/Makefile.am
   trunk/aix-miscutils/configure.ac
   trunk/aix-miscutils/ldd/ldd
Log:
added usr/sbin/aixdll script, will be used by gcc-config on aix

Modified: trunk/aix-miscutils/Makefile.am
===================================================================
--- trunk/aix-miscutils/Makefile.am	2008-04-21 09:39:21 UTC (rev 1625)
+++ trunk/aix-miscutils/Makefile.am	2008-04-21 12:08:44 UTC (rev 1626)
@@ -4,6 +4,6 @@
 
 AUTOMAKE_OPTIONS = 1.9 dist-bzip2
 
-SUBDIRS = ldd
+SUBDIRS = ldd aixdll
 
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 version configure

Added: trunk/aix-miscutils/aixdll/Makefile.am
===================================================================
--- trunk/aix-miscutils/aixdll/Makefile.am	                        (rev 0)
+++ trunk/aix-miscutils/aixdll/Makefile.am	2008-04-21 12:08:44 UTC (rev 1626)
@@ -0,0 +1,9 @@
+# Copyright 2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# Author: Michael Haubenwallner <haubi@g.o>
+
+sbin_SCRIPTS = aixdll
+
+EXTRA_DIST = aixdll
+
+MAINTAINERCLEANFILES = Makefile.in

Added: trunk/aix-miscutils/aixdll/aixdll
===================================================================
--- trunk/aix-miscutils/aixdll/aixdll	                        (rev 0)
+++ trunk/aix-miscutils/aixdll/aixdll	2008-04-21 12:08:44 UTC (rev 1626)
@@ -0,0 +1,494 @@
+#! /usr/bin/env bash
+# Copyright 2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# Author: Michael Haubenwallner <haubi@g.o>
+#
+# Utilities for dynamic link libraries (aka. shared objects) on AIX.
+#
+
+PS4='(${LINENO})+ '
+
+ACTION=${0##*/}
+[[ ${ACTION} == 'aixdll-'* ]] && ACTION=${ACTION#aixdll-} || ACTION=
+
+die() {
+	[[ $# -gt 0 ]] && echo "${ACTION}: $@" >&2
+	exit 1
+}
+
+_aixdll_cutoff() {
+	local line=$1
+	local minlen=$2
+	local maxcol=$((${#line}-${minlen}))
+	local tmpline value
+	if [[ ${line:$((maxcol-1)):1} != ' ' ]]; then
+		tmpline=${line:0:${maxcol}}
+		tmpline=${tmpline% *}
+		maxcol=$((${#tmpline}+1))
+	fi
+	value=${line:${maxcol}}
+	echo ${value}
+	echo "${line%${value}}"
+}
+
+_aixdll_read_RUNPATH_DEPLIBS() {
+	# Reads stdin up to the first empty line.
+	# The first line on stdin must be:
+	#     "INDEX PATH BASE MEMBER "
+	# The blank-counts in this line are used to parse the data.
+	#
+	# Output:
+	# Two lines going to stdout:
+	# "/path1:/path2"
+	# "'lib1.a(shr1.o)' '/path/lib2.a(shr2.o)' 'lib3.so'"
+	local line
+	local runpath= deplibs=
+	local haveHeader=false
+	local dynMEMBER dynBASE dynPATH
+
+	# global constants to calculate once only
+	declare -i PATHlen=0 BASElen=0 MEMBERlen=0
+	declare -i PATHmin=0 BASEmin=0 MEMBERmin=0
+
+	while IFS= read line
+	do
+		# empty line marks end of ImportFileStrings section
+		[[ ${line} ]] || break
+		if [[ ${line} == "INDEX "* ]]; then
+			haveHeader=true
+			if [[ ${PATHmin} -eq 0 ]]; then
+				MEMBERlen=${#line}
+				line=${line%MEMBER *}
+				MEMBERmin=${#line}
+				MEMBERlen=$((MEMBERlen-MEMBERmin))
+				BASElen=${MEMBERmin}
+				line=${line%BASE *}
+				BASEmin=${#line}
+				BASElen=$((BASElen-BASEmin))
+				PATHlen=${BASEmin}
+				line=${line%PATH *}
+				PATHmin=${#line}
+				PATHlen=$((PATHlen-PATHmin))
+			fi
+			continue
+		fi
+		${haveHeader} || continue
+
+		{ IFS= read dynMEMBER; IFS= read line; } <<-EOC
+			$(_aixdll_cutoff "${line}" ${MEMBERlen})
+		EOC
+		{ IFS= read dynBASE; IFS= read line; } <<-EOC
+			$(_aixdll_cutoff "${line}" ${BASElen})
+		EOC
+		{ IFS= read dynPATH; IFS= read line; } <<-EOC
+			$(_aixdll_cutoff "${line}" ${PATHlen})
+		EOC
+
+		if [[ ! ${dynBASE} && ${dynPATH} ]]; then
+			runpath=${dynPATH}
+			continue
+		fi
+
+		[[ ${dynBASE} && ${dynBASE} != .. && ${dynBASE} != . ]] || continue
+
+		deplibs="${deplibs} '${dynPATH%/}${dynPATH:+/}${dynBASE}${dynMEMBER:+(}${dynMEMBER}${dynMEMBER:+)}'"
+	done
+
+	echo "${runpath}"
+	echo "${deplibs}"
+}
+
+aixdll_query() {
+	# Uses /usr/bin/dump to extract information from object files
+	# or archive libraries.
+	#
+	# First argument:
+	#   either
+	#     "/bin/true"
+	#        queries binary information from file.
+	#   or
+	#     "/lib/libc.a"
+	#        queries binary information for each archive member.
+	#   or
+	#     "/lib/libc.a(shr.o)"
+	#        queries binary information for specified archive members,
+	#        archive-members can contain shell-wildcards (*?).
+	# Further arguments:
+	#   any combination of
+	#     FILE MEMBER SHROBJ FLAGS FORMAT RUNPATH DEPLIBS
+	#
+	# Output on stdout:
+	#   One line for each file or archive member, to be evaluated in
+	#   another shell environment, setting at least these variables:
+	#     FILE='...';MEMBER='...';SHROBJ=[true|false]
+	#   The format for each variable is
+	#   either (for '/bin/true')
+	#     FILE='/bin/true'
+	#     MEMBER=''
+	#     FLAGS=
+	#     FORMAT=
+	#     RUNPATH=
+	#     DEPLIBS=
+	#     SHROBJ=false
+	#     FLAGS=' RELFLG EXEC LNNO DYNLOAD DEP__SYSTEM '
+	#     FORMAT='32-bit XCOFF'
+	#     RUNPATH='/usr/lib:/lib:/usr/lpp/xlC/lib'
+	#     DEPLIBS=" 'libc.a(shr.o)'"
+	#   or (for '/lib/libc.a')
+	#     FILE='/lib/libc.a'
+	#     MEMBER='ptrgl_64_64.o'
+	#     FLAGS=
+	#     FORMAT=
+	#     RUNPATH=
+	#     DEPLIBS=
+	#     SHROBJ=false
+	#     FLAGS=' DEP_SYSTEM '
+	#     FORMAT='64-bit XCOFF'
+	#    <newline for each archive member>
+	#     FILE='/lib/libc.a'
+	#     MEMBER='shr.o'
+	#     FLAGS=
+	#     FORMAT=
+	#     RUNPATH=
+	#     DEPLIBS=
+	#     SHROBJ=true
+	#     FLAGS=' EXEC DYNLOAD SHROBJ DEP__SYSTEM '
+	#     FORMAT='32-bit XCOFF'
+	#     RUNPATH='/usr/lib:/lib'
+	#     DEPLIBS=" '/unix' 'libcrypt.a(shr.o)'"
+	#    <newline>
+	#   or (for '/lib/libc.a(shr*)')
+	#     FILE='/lib/libc.a'
+	#     MEMBER='shr.o'
+	#     FLAGS=
+	#     FORMAT=
+	#     RUNPATH=
+	#     DEPLIBS=
+	#     SHROBJ=true
+	#     FLAGS=' EXEC DYNLOAD SHROBJ DEP__SYSTEM '
+	#     FORMAT='32-bit XCOFF'
+	#     RUNPATH='/usr/lib:/lib'
+	#     DEPLIBS=" '/unix' 'libcrypt.a(shr.o)'"
+	#    <newline>
+	#     FILE='/lib/libc.a'
+	#     MEMBER='shr_64.o'
+	#     FLAGS=
+	#     FORMAT=
+	#     RUNPATH=
+	#     DEPLIBS=
+	#     SHROBJ=true
+	#     FLAGS=' EXEC DYNLOAD SHROBJ DEP__SYSTEM '
+	#     FORMAT='64-bit XCOFF'
+	#     RUNPATH='/usr/lib:/lib'
+	#     DEPLIBS=" '/unix' 'libcrypt.a(shr_64.o)'"
+	#    <newline>
+
+	local dll=$1 shrobj=
+	shift
+	local what="$*"
+	local dumpopts='vo' line section
+
+	: ${what:="FILE MEMBER SHROBJ FLAGS FORMAT RUNPATH DEPLIBS"}
+	what=" ${what} "
+	
+	if [[ ${dll} == *'('*')'* ]]; then
+		shrobj=${dll#*(}
+		shrobj="${shrobj%)}"
+		dll=${dll%(${shrobj})}
+	fi
+	
+	[[ ${what} == *" RUNPATH "* \
+	|| ${what} == *" DEPLIBS "* \
+	]] && dumpopts="${dumpopts}H"
+
+	# sections from 'dump -Hov'
+	#    ***Object Module Header***
+	#    ***Optional Header***
+	#    ***Import File Strings***
+	#    ***Loader Section***
+	local usethis=false linebreak=: thisshrobj= x
+	while IFS= read line
+	do
+		if [[ ${line} == *: ]]; then
+			# new archive member
+			# line="/lib/libc.a[shr.o]:"
+			usethis=false
+			if [[ ${line} == "${dll}${shrobj:+[}${shrobj}${shrobj:+]}:" ]] \
+			|| [[ ${line} == "${dll}["${shrobj:-*}"]:" ]] \
+			; then
+				thisshrobj=${line#${dll}}
+				thisshrobj=${thisshrobj%:}
+				thisshrobj=${thisshrobj#[}
+				thisshrobj=${thisshrobj%]}
+				usethis=true
+				${linebreak}
+				linebreak=echo
+				for x in ${what}; do
+					echo -n "${x}=;"
+				done
+				[[ ${what} == *" FILE "* ]] &&
+				echo -n "FILE='${dll}';"
+				# "FILE='/lib/libc.a'
+				[[ ${what} == *" MEMBER "* ]] &&
+				echo -n "MEMBER='${thisshrobj}';"
+				# "MEMBER='shr.o';"
+			fi
+			continue
+		fi
+
+		${usethis} || continue
+
+		case "${section},${line}" in
+		*,) # empty line: end of section
+			section=
+			continue
+			;;
+		*,*'***Import File Strings***')
+			# parse complete section separately using
+			# _aixdll_read_RUNPATH_DEPLIBS()
+			{	IFS= read line
+				[[ ${what} == *" RUNPATH "* ]] &&
+				echo -n "RUNPATH='${line}';"
+				IFS= read line
+				[[ ${what} == *" DEPLIBS "* ]] &&
+				echo -n "DEPLIBS=\"${line}\";"
+			} <<-EOC
+				$(_aixdll_read_RUNPATH_DEPLIBS)
+			EOC
+			continue
+			;;
+		*,*'***')
+			# new section
+			section=${line//\*} # stars
+			section=${section//	}  # tabs
+			section=${section// }  # blanks
+			continue
+			;;
+		"ObjectModuleHeader,Flags="*)
+			# line="Flags=( EXEC DYNLOAD SHROBJ DEP__SYSTEM )"
+			if [[ ${what} == *" SHROBJ "* ]]; then
+				echo -n "SHROBJ="
+				[[ ${line} == *" SHROBJ "* ]] &&
+				echo -n "true;" ||
+				echo -n "false;"
+			fi
+			[[ ${what} == *" FLAGS "* ]] || continue
+			line=${line#Flags=(}
+			line=${line%)}
+			echo -n "FLAGS='${line}';"
+			# "FLAGS=' EXEC DYNLOAD SHROBJ DEP__SYSTEM ';"
+			continue
+			;;
+		"ObjectModuleHeader,Magic = "*)
+			# line="Magic = 0x1df  (32-bit XCOFF)"
+			# line="Magic = 0x1f7  (64-bit XCOFF)"
+			[[ ${what} == *" FORMAT "* ]] || continue
+			line=${line#Magic = *(}
+			line=${line%)}
+			echo -n "FORMAT='${line}';"
+			# "FORMAT='32-bit XCOFF';"
+			# "FORMAT='64-bit XCOFF';"
+			continue
+			;;
+		"ImportFileStrings,INDEX"*)
+		esac
+	done <<-EOF
+		$(/usr/bin/dump -X32_64 -${dumpopts} "${dll}" 2>/dev/null)
+	EOF
+	${linebreak}
+}
+
+aixdll_find_unprepared() {
+	find "$1" -type f -name 'lib*.a' -print
+}
+
+aixdll_find_prepared() {
+	find "$1" -type d -name 'lib*.a.d' -print
+}
+
+aixdll_is_prepared() {
+	local what=$1
+	[[ ${what##*/} == lib*.a.d ]]
+}
+
+aixdll_get_preparedir_for_lib() {
+	echo "${1%.d}.d"
+}
+
+aixdll_get_lib_for_preparedir() {
+	echo "${1%.d}"
+}
+
+aixdll_prepare_for_merge() {
+	# $0 target-library [source-library]
+	local libsrc=${2-${1}}
+	local libad=$(aixdll_get_preparedir_for_lib "${1}")
+	mkdir -p "${libad}" || die "Cannot create ${libad}"
+	pushd "${libad}" >/dev/null || die "Cannot cd to ${libad}"
+	local status
+	/usr/ccs/bin/ar -X32_64 -x "${libsrc}"
+	status=$?
+	popd >/dev/null || die "Cannot cd back from ${libad}"
+	if [[ ${status} -ne 0 ]]; then
+		rmdir "${libad}" >&/dev/null
+		die "Cannot un-ar ${libsrc}"
+	fi
+	true
+}
+
+aixdll_finish_merge_single() {
+	local arg keepdir
+	local libad
+	for arg
+	do
+		case ${arg} in
+		--keepdir=*)
+			keepdir=${arg#*=}
+			continue
+			;;
+		*)
+			libad=$(aixdll_get_preparedir_for_lib "${arg}")
+			;;
+		esac
+	done
+
+	: ${keepdir:=true}
+
+	aixdll_is_prepared "${libad}" || return 0
+	local liba=$(aixdll_get_lib_for_preparedir "${libad}")
+	local f
+
+	if [[ -d ${libad} && $(ls -A "${libad}/") ]]; then
+		pushd "${libad}" >/dev/null || die "Cannot cd to ${libad}"
+		rm -f "./${liba##*/}.new" || die "Cannot remove ${liba##*/}.new"
+		/usr/ccs/bin/ar -coqszvl -X 32_64 "./${liba##*/}.new" ./* || die "Cannot recreate ${liba}"
+		mv -f "./${liba##*/}.new" "${liba}" || die "Cannot move ${liba##*/}.new to ${liba}"
+		popd >/dev/null || die "Cannot cd back from ${libad}"
+	elif [[ -f ${liba} ]]; then
+		rm -f "${liba}" || die "Cannot prune '${liba}'"
+		keepdir=false
+	fi
+
+	if [[ -d ${libad} ]] && ! ${keepdir}; then
+		pushd "${libad}" >/dev/null || die "Cannot cd to ${libad}"
+		rm -f ./* || die "Cannot prune '${libad}/*'"
+		popd >/dev/null || die "Cannot cd back from ${libad}"
+		rmdir "${libad}" || die "Cannot prune '${libad}'"
+	fi
+	true
+}
+
+aixdll_finish_merge() {
+	local arg status keepdir
+	for arg
+	do
+		[[ ${arg} == --keepdir=* ]] && keepdir=${arg#*=}
+	done
+
+	for arg
+	do
+		[[ ${arg} != --* ]] || continue
+		( aixdll_finish_merge_single --keepdir=${keepdir} "${arg}" ) || status=$?
+	done
+	return ${status}
+}
+
+aixdll_merge_runtime() {
+	[[ $# -gt 0 ]] || return 0
+	local arg target current curdir libad finish keepdir
+	local curdir=$(pwd)
+	for arg
+	do
+		case "${arg}" in
+		--target=*) target=${arg#*=} ;;
+		--current=*) current=${arg#*=} ;;
+		--finish=*) finish=${arg#*=} ;;
+		--keepdir=*) keepdir=${arg#*=} ;;
+		--*) die "Invalid argument ${arg}" ;;
+		esac
+	done
+	: ${finish:=true}
+	[[ ${target} ]] || die "Missing --target"
+	[[ ${target} == /* ]] || target=${curdir}/${target}
+	[[ ${current} && ${current} != /* ]] && current=${curdir}/${current}
+	libad=$(aixdll_get_preparedir_for_lib "${target}")
+	local line status
+	local FILE MEMBER SHROBJ FLAGS
+	for arg
+	do
+		[[ ${arg} == '--'* ]] && continue
+		[[ ${arg} == /* ]] || arg=${curdir}/${arg}
+
+		while IFS= read line
+		do
+			[[ ${line} == *SHROBJ=* ]] || continue
+			eval "${line}"
+			${SHROBJ} || continue
+			mkdir -p "${libad}" || die "Cannot create '${libad}'"
+			pushd "${libad}" >/dev/null || die "Cannot cd to ${libad}"
+			/usr/ccs/bin/ar -X32_64 -x "${FILE}" "${MEMBER}"
+			status=$?
+			if [[ ${status} -ne 0 ]]; then
+				popd >/dev/null || die "Cannot cd back from ${libad}"
+				rmdir "${libad}" >&/dev/null
+				die "Cannot extract '${MEMBER}' of '${FILE}'"
+			fi
+			if [[ ${arg} != "${current}" ]]; then
+				[[ ${FLAGS} == *" LOADONLY "* ]] ||
+				/usr/ccs/bin/strip -e "./${MEMBER}" ||
+				die "Cannot set flag LOADONLY for ${MEMBER}"
+			else
+				[[ ${FLAGS} != *" LOADONLY "* ]] ||
+				/usr/ccs/bin/strip -E "./${MEMBER}" ||
+				die "Cannot drop flag LOADONLY from ${MEMBER}"
+			fi
+			popd >/dev/null || die "Cannot cd back from ${libad}"
+		done <<-EOF
+			$(aixdll_query "${arg}" FILE MEMBER SHROBJ FLAGS)
+		EOF
+		:
+	done
+	${finish} || return 0
+	aixdll_finish_merge --keepdir=${keepdir} "${libad}"
+}
+
+aixdll_help() {
+	cat <<EOF
+Known actions:
+	--query
+	--find-unprepared
+	--find-prepared
+	--is-prepared
+	--prepare-for-merge
+	--finish-merge
+	--merge-runtime
+EOF
+}
+
+aixdll_main() {
+	: ${ACTION:=help}
+	while [[ ${1:+set} ]]
+	do
+		case ${1} in
+		--help | \
+		--query | \
+		--find-unprepared | \
+		--find-prepared | \
+		--is-prepared | \
+		--prepare-for-merge | \
+		--finish-merge | \
+		--merge-runtime )
+			ACTION=${1#--}
+			;;
+		--debug) set -x ;;
+		*) break ;;
+		esac
+		shift
+	done
+
+	aixdll_${ACTION//-/_} "$@"
+}
+
+aixdll_main "$@"
+
+exit $?


Property changes on: trunk/aix-miscutils/aixdll/aixdll
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/aix-miscutils/configure.ac
===================================================================
--- trunk/aix-miscutils/configure.ac	2008-04-21 09:39:21 UTC (rev 1625)
+++ trunk/aix-miscutils/configure.ac	2008-04-21 12:08:44 UTC (rev 1626)
@@ -9,5 +9,5 @@
 AC_PREREQ(2.52)
 AC_CANONICAL_HOST
 AM_INIT_AUTOMAKE
-AC_CONFIG_FILES(./Makefile ldd/Makefile)
+AC_CONFIG_FILES(./Makefile ldd/Makefile aixdll/Makefile)
 AC_OUTPUT

Modified: trunk/aix-miscutils/ldd/ldd
===================================================================
--- trunk/aix-miscutils/ldd/ldd	2008-04-21 09:39:21 UTC (rev 1625)
+++ trunk/aix-miscutils/ldd/ldd	2008-04-21 12:08:44 UTC (rev 1626)
@@ -11,7 +11,6 @@
 declare -i PATHmin=0 BASEmin=0 MEMBERmin=0
 
 declare -i PATHcol=0 BASEcol=0 MEMBERcol=0
-declare -i MAXCOL=0
 
 declare -r NOTFOUND=" => not found"
 

-- 
gentoo-commits@l.g.o mailing list