Version bump, and fix bug 201006.

Package-Manager: portage-2.1.4

5 files changed, 280 insertions, 6 deletions

diff --git a/dev-libs/klibc/ChangeLog b/dev-libs/klibc/ChangeLog
index 4a04eb0f792e..69a4cce8f92c 100644
--- a/dev-libs/klibc/ChangeLog
+++ b/dev-libs/klibc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/klibc
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/ChangeLog,v 1.53 2007/12/21 15:07:36 nixnut Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/ChangeLog,v 1.54 2008/01/15 08:16:05 robbat2 Exp $
+
+*klibc-1.5.8 (15 Jan 2008)
+
+  15 Jan 2008; Robin H. Johnson <robbat2@gentoo.org>
+  +files/klibc-1.5.7-strip-fix-dash-s.patch, +klibc-1.5.8.ebuild:
+  Version bump, and fix bug 201006.
 
   21 Dec 2007; nixnut <nixnut@gentoo.org> klibc-1.5.7-r2.ebuild:
   Stable on ppc wrt bug 195443
diff --git a/dev-libs/klibc/Manifest b/dev-libs/klibc/Manifest
index a5c7c2faa354..4c08cfcbf178 100644
--- a/dev-libs/klibc/Manifest
+++ b/dev-libs/klibc/Manifest
@@ -42,6 +42,10 @@ AUX klibc-1.5-sigaction.patch 928 RMD160 00d04da5dfdf667d2ff46491212d98047adac92
 MD5 415347d1c3413ce8079bac62bdaceef7 files/klibc-1.5-sigaction.patch 928
 RMD160 00d04da5dfdf667d2ff46491212d98047adac925 files/klibc-1.5-sigaction.patch 928
 SHA256 bd50f00b36fb4425c6921224bde5862c05fa6271c984bfadd94284cf3f5973e5 files/klibc-1.5-sigaction.patch 928
+AUX klibc-1.5.7-strip-fix-dash-s.patch 420 RMD160 8dae7b8452fe5328c276fc192cad171d64cce245 SHA1 29acc727bd721259067e73399b6e6516ffdf95c0 SHA256 971cadc28aa362ff76ebfee8187bb6986afb4f3425b70b7200d1aa1c6fd746e7
+MD5 c8fc7fee04e18cb8c68a14e2182290a2 files/klibc-1.5.7-strip-fix-dash-s.patch 420
+RMD160 8dae7b8452fe5328c276fc192cad171d64cce245 files/klibc-1.5.7-strip-fix-dash-s.patch 420
+SHA256 971cadc28aa362ff76ebfee8187bb6986afb4f3425b70b7200d1aa1c6fd746e7 files/klibc-1.5.7-strip-fix-dash-s.patch 420
 AUX klibc.m4 3619 RMD160 aee79c8296f375e3614fcf5d97b21ed9e043c719 SHA1 ebe92893215e7d7ec2e44af846c6ce83e7ef7f4b SHA256 02901ef2ca8b320d77b03fab4fa9bef809c11e2e418e7da00aa2c13c4a84dd44
 MD5 790a9f0a9a74e6eac6c6c1dbde2a94b6 files/klibc.m4 3619
 RMD160 aee79c8296f375e3614fcf5d97b21ed9e043c719 files/klibc.m4 3619
@@ -51,9 +55,11 @@ DIST klibc-1.2.1.tar.bz2 451620 RMD160 d0ea3418622c008884c0efb6dee693aa03eca90d
 DIST klibc-1.4.12.tar.bz2 473002 RMD160 f10be3132faf99b2e75287c05aa5d1d12c58ebcf SHA1 e61fc2bc3ebebcb60e1e24096f8496d46d977049 SHA256 78f7330e156080809c82dce6d3461ed1f8a547db58bc99c162253c71f3865e89
 DIST klibc-1.4.13.tar.bz2 473178 RMD160 659f2b0f443547587f7eca46a01ce3b7a264f14c SHA1 36bf42f6225c522c4a930d217550ccf1b9178f60 SHA256 54d45fa13cf50cc0dfd7f960046e152e74cb80f150f816d4587cc7a140ea1d72
 DIST klibc-1.5.7.tar.bz2 490790 RMD160 664448f24b6335502f40bc74a4c3f4291c6e1295 SHA1 a0f1955b1c8aac20955ee8668189f71025850fcb SHA256 d5298ba2b1f575ff058e652a6cdf753f11c2fa6efa943b1318d0874b9b03e068
+DIST klibc-1.5.8.tar.bz2 490132 RMD160 870bf1df35c05c2fbac7b1623c2250bed1b39e92 SHA1 db0beb7bf00a97e2ab0ab48f13f1aaea3e402ffe SHA256 b010fd9ea4624f4abc62a0ec93cecae9e9f0a7f856dd678da3fc61cc1d59ca0d
 DIST klibc-1.5.tar.bz2 487483 RMD160 9329426693c39eca2c357987bfa37656570b9d35 SHA1 254444bcc3f42855ec69b3a2497d5e6162e2fe2f SHA256 27000ba4bc73a5977502b27d7036df24dd6ab94a1c33b8f5d6d54ba62772f0c7
 DIST linux-2.6.23.tar.bz2 45488158 RMD160 755690e80751d5de86d260fe05c6eeadde116c4e SHA1 3a186adf13e44415796ab6381aa8979b16a5d5ca SHA256 d4e67c0935ffb2a4158234bff92cc791b83177866009fc9b2214104e0038dbdb
 DIST patch-2.6.24-rc2.bz2 9161681 RMD160 738119066eb1b91ac6e4db299dd81e469412f019 SHA1 b9a44371004907b87f17d8db52afb17a22669f96 SHA256 c316760b5489af874cfc0fdba4b0d9aacf597abeb94a871a6fbaf9876b7e4fd6
+DIST patch-2.6.24-rc7.bz2 9658462 RMD160 18cba35c94c0923b71a64798ad06946b4afc23d2 SHA1 4edc59937ca4157c3ee542f6a0ff204acfa8e7d1 SHA256 dbd8403cc9ad11afb51b8050d6cbda97caec87d1b07c80266b1e4b1f437268a3
 EBUILD klibc-1.1.ebuild 4163 RMD160 3bdee15ca33572451ff609634cf178ac3019f6e2 SHA1 7a63688d69a3802da9198c6d7821d0909cbaeb0a SHA256 d28076cc05974dc7c5ef32d9e771d1ce13c9dd7d6cfec98567e3d4724b8d8915
 MD5 e1fe5abcd5347639bb35993d9c05f699 klibc-1.1.ebuild 4163
 RMD160 3bdee15ca33572451ff609634cf178ac3019f6e2 klibc-1.1.ebuild 4163
@@ -86,14 +92,18 @@ EBUILD klibc-1.5.7.ebuild 5707 RMD160 1f5337af7e0085e0ca023c38d985b76a1c7349b9 S
 MD5 af73fd2e0c5587f3927d2228b648aeb7 klibc-1.5.7.ebuild 5707
 RMD160 1f5337af7e0085e0ca023c38d985b76a1c7349b9 klibc-1.5.7.ebuild 5707
 SHA256 4664cccdf2f37b75bddf8c9e651470a5e0e26e8dc3478f09237a40f17f4d8f20 klibc-1.5.7.ebuild 5707
+EBUILD klibc-1.5.8.ebuild 6923 RMD160 1c3e1fb25e798832bd6bc33ad0c7786e964960ae SHA1 ec3007c37ce9067ce4d1b018514a67b49d3ee9d6 SHA256 06b5e44890205ef44da7f555e7a6f4b84bc5e8bd88aba7ddad4bbfb543182d8f
+MD5 aa70d10758d6fd0b591aa0d37a7b1e51 klibc-1.5.8.ebuild 6923
+RMD160 1c3e1fb25e798832bd6bc33ad0c7786e964960ae klibc-1.5.8.ebuild 6923
+SHA256 06b5e44890205ef44da7f555e7a6f4b84bc5e8bd88aba7ddad4bbfb543182d8f klibc-1.5.8.ebuild 6923
 EBUILD klibc-1.5.ebuild 5765 RMD160 c81daa87ba892d53e20f6aa6b18296477ebd3338 SHA1 24ac5bd1edc8e8853354c82de3b523bd7de5f133 SHA256 fbbf0bded7141336b6769ab9c2d9b5f7b2880ef87b592f095ddbcd9a438f32c7
 MD5 381a1225c216a2371ed83610d2e28d00 klibc-1.5.ebuild 5765
 RMD160 c81daa87ba892d53e20f6aa6b18296477ebd3338 klibc-1.5.ebuild 5765
 SHA256 fbbf0bded7141336b6769ab9c2d9b5f7b2880ef87b592f095ddbcd9a438f32c7 klibc-1.5.ebuild 5765
-MISC ChangeLog 9140 RMD160 2105eda04888c346a7ebbcf3cae4fe0859cb7cbb SHA1 3b367ef6a0cb5a7b87a01fb4e484cb3cc47b002c SHA256 a18451d6ed05b1e82d1c5b82054860ce8585cb41dcefb302b389f39f1db80fa8
-MD5 dbe9ab0dd8ee20d6a6312ef4af6f35ef ChangeLog 9140
-RMD160 2105eda04888c346a7ebbcf3cae4fe0859cb7cbb ChangeLog 9140
-SHA256 a18451d6ed05b1e82d1c5b82054860ce8585cb41dcefb302b389f39f1db80fa8 ChangeLog 9140
+MISC ChangeLog 9325 RMD160 8897dfafc420e2f80a6025b12e68adb8754ca897 SHA1 ae6ab109612a435d567051d28f3897a5078a6b34 SHA256 7a7fb13bdead11018f82152eaf7625006f70b421abd22fbbcb704c34b842af62
+MD5 92dcd153e3cbae1ada963f7246265bd7 ChangeLog 9325
+RMD160 8897dfafc420e2f80a6025b12e68adb8754ca897 ChangeLog 9325
+SHA256 7a7fb13bdead11018f82152eaf7625006f70b421abd22fbbcb704c34b842af62 ChangeLog 9325
 MISC metadata.xml 166 RMD160 42fd2b8820fe5c74ccd8bda2141e90fa1b3802d8 SHA1 dd2e6ea8806cfa18885ac2f0dee3e6aceee06fd0 SHA256 8a8cfc597620bb23a385c7d463e7eeab947d58038f7739a58d24fb37fdd0a83f
 MD5 ff2140a8d0a2aac189c948cdbe6fc230 metadata.xml 166
 RMD160 42fd2b8820fe5c74ccd8bda2141e90fa1b3802d8 metadata.xml 166
@@ -125,3 +135,6 @@ SHA256 b4a0e3a4ca4f12d48ea26ded0ec99bf436df33c285535c2f8ed93439247f73a1 files/di
 MD5 4e9c421023498ce9f5c4979ea00c0e85 files/digest-klibc-1.5.7-r2 729
 RMD160 ad8e40b27d4f0530cb1f384d801567861c8cec2a files/digest-klibc-1.5.7-r2 729
 SHA256 fa47a30819aa42e33106b0bfd018da3705530d90cc51d596df745e7b94867108 files/digest-klibc-1.5.7-r2 729
+MD5 836e83980c20bd9d41a1325e177578c9 files/digest-klibc-1.5.8 729
+RMD160 dce3684d1f28bbf894f6d2eff2e9ef17f0e82fb4 files/digest-klibc-1.5.8 729
+SHA256 98feb03c5ad6fb969c330e9c2159b67b6f44187e385ba804aa6110d2e52cd63e files/digest-klibc-1.5.8 729
diff --git a/dev-libs/klibc/files/digest-klibc-1.5.8 b/dev-libs/klibc/files/digest-klibc-1.5.8
new file mode 100644
index 000000000000..1cef2753ba1c
--- /dev/null
+++ b/dev-libs/klibc/files/digest-klibc-1.5.8
@@ -0,0 +1,9 @@
+MD5 20f33e4a1b1a3fab754335d66b930f9c klibc-1.5.8.tar.bz2 490132
+RMD160 870bf1df35c05c2fbac7b1623c2250bed1b39e92 klibc-1.5.8.tar.bz2 490132
+SHA256 b010fd9ea4624f4abc62a0ec93cecae9e9f0a7f856dd678da3fc61cc1d59ca0d klibc-1.5.8.tar.bz2 490132
+MD5 2cc2fd4d521dc5d7cfce0d8a9d1b3472 linux-2.6.23.tar.bz2 45488158
+RMD160 755690e80751d5de86d260fe05c6eeadde116c4e linux-2.6.23.tar.bz2 45488158
+SHA256 d4e67c0935ffb2a4158234bff92cc791b83177866009fc9b2214104e0038dbdb linux-2.6.23.tar.bz2 45488158
+MD5 0fdbfe1cf8df154e8efdb8b7907498b7 patch-2.6.24-rc7.bz2 9658462
+RMD160 18cba35c94c0923b71a64798ad06946b4afc23d2 patch-2.6.24-rc7.bz2 9658462
+SHA256 dbd8403cc9ad11afb51b8050d6cbda97caec87d1b07c80266b1e4b1f437268a3 patch-2.6.24-rc7.bz2 9658462
diff --git a/dev-libs/klibc/files/klibc-1.5.7-strip-fix-dash-s.patch b/dev-libs/klibc/files/klibc-1.5.7-strip-fix-dash-s.patch
new file mode 100644
index 000000000000..94a0caee2526
--- /dev/null
+++ b/dev-libs/klibc/files/klibc-1.5.7-strip-fix-dash-s.patch
@@ -0,0 +1,12 @@
+diff -Naurp klibc-1.5.7-orig/klcc/klcc.in klibc-1.5.7/klcc/klcc.in
+--- klibc-1.5.7-orig/klcc/klcc.in	2007-12-03 01:17:26.000000000 +0100
++++ klibc-1.5.7/klcc/klcc.in	2007-12-03 01:18:39.000000000 +0100
+@@ -259,7 +259,7 @@ if ( $operation ne '' ) {
+     unlink(@rmobjs);
+ 
+     if ( $strip && !$rv ) {
+-	$rv = mysystem($STRIP, @STRIPFLAGS, $output);
++	$rv = mysystem($STRIP, @STRIPFLAGS, $output || 'a.out');
+     }
+ }
+ 
diff --git a/dev-libs/klibc/klibc-1.5.8.ebuild b/dev-libs/klibc/klibc-1.5.8.ebuild
new file mode 100644
index 000000000000..d3ae15e76e6f
--- /dev/null
+++ b/dev-libs/klibc/klibc-1.5.8.ebuild
@@ -0,0 +1,234 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/klibc-1.5.8.ebuild,v 1.1 2008/01/15 08:16:05 robbat2 Exp $
+
+# Robin H. Johnson <robbat2@gentoo.org>, 12 Nov 2007:
+# This still needs major work.
+# But it is significently better than the previous version.
+# In that it will now build on biarch systems, such as ppc64-32ul.
+
+# NOTES:
+# ======
+# We need to bring in the kernel sources seperately
+# Because they have to be configured in a way that differs from the copy in
+# /usr/src/. The sys-kernel/linux-headers are too stripped down to use
+# unfortunetly.
+# This will be able to go away once the klibc author updates his code
+# to build again the headers provided by the kernel's 'headers_install' target.
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="A minimal libc subset for use with initramfs."
+HOMEPAGE="http://www.zytor.com/mailman/listinfo/klibc"
+KV_MAJOR="2" KV_MINOR="6" KV_SUB="23"
+OKV="${KV_MAJOR}.${KV_MINOR}.${KV_SUB}"
+PKV="${KV_MAJOR}.${KV_MINOR}.$((${KV_SUB}+1))-rc7"
+PATCH_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/patch-${PKV}.bz2"
+KERNEL_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/testing/linux-${OKV}.tar.bz2"
+SRC_URI="
+	mirror://kernel/linux/libs/klibc/${P}.tar.bz2
+	mirror://kernel/linux/libs/klibc/Testing/${P}.tar.bz2
+	${PATCH_URI}
+	${KERNEL_URI}"
+
+LICENSE="|| ( GPL-2 LGPL-2 )"
+KEYWORDS="~amd64 -mips ~ppc ~x86 ~sparc"
+SLOT="0"
+IUSE="debug n32"
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}"
+
+KS="${WORKDIR}/linux-${OKV}"
+
+# Klibc has no PT_GNU_STACK support, so scanning for execstacks is moot
+QA_EXECSTACK="*"
+# Do not strip
+RESTRICT="strip"
+
+src_unpack() {
+	unpack linux-${OKV}.tar.bz2 ${P}.tar.bz2
+	EPATCH_OPTS="-d ${KS} -p1" epatch "${DISTDIR}"/patch-${PKV}.bz2
+	cd "${S}"
+
+	# Symlink /usr/src/linux to ${S}/linux
+	ln -snf "${KS}" linux
+	#ln -snf "/usr" linux
+
+	# Build interp.o with EXTRA_KLIBCAFLAGS (.S source)
+	epatch "${FILESDIR}"/${PN}-1.4.11-interp-flags.patch
+
+	# Fixes for sparc and ppc
+	epatch "${FILESDIR}"/${PN}-1.5-sigaction.patch
+
+	# Prevent klibc from prestripping stuff
+#	epatch "${FILESDIR}"/${P}-nostrip.patch
+
+	# Fix the asm-ppc vs. asm-powerpc issue, bug #196521
+	epatch "${FILESDIR}"/${PN}-1.5-klibcasmarch.patch
+
+	# Fix usage of -s, bug #201006
+	epatch "${FILESDIR}"/klibc-1.5.7-strip-fix-dash-s.patch
+}
+
+# For a given Gentoo ARCH,
+# specify the kernel defconfig most relevant
+kernel_defconfig() {
+	a="${1:${ARCH}}"
+	# most, but not all arches have a sanely named defconfig
+	case ${a} in
+		ppc64) echo ppc64_defconfig ;;
+		ppc) echo pmac32_defconfig ;;
+		arm*|sh*) die "TODO: Your arch is not supported by the klibc ebuild. Please suggest a defconfig in a bug." ;;
+		*) echo defconfig ;;
+	esac
+}
+
+# klibc has it's own ideas of arches
+# They reflect userspace strictly.
+# This functions maps from a Gentoo ARCH, to an arch that klibc expects
+# Look at klibc-${S}/usr/klibc/arch for a list of these arches
+klibc_arch() {
+	a="${1:${ARCH}}"
+	case ${a} in
+		amd64) echo x86_64 ;;
+		mips) die 'TODO: Use the $ABI' ;;
+		x86) echo i386 ;;
+		*) echo ${a} ;;
+	esac
+}
+
+kernel_asm_arch() {
+	a="${1:${ARCH}}"
+	case ${a} in
+		# Merged arches
+		x86|amd64) echo x86 ;;
+		ppc*) echo powerpc ;;
+		# Non-merged
+		alpha|arm|ia64|m68k|mips|sh|sparc*) echo ${1} ;;
+		*) die "TODO: Update the code for your asm-ARCH symlink" ;;
+	esac
+}
+
+src_compile() {
+	local myargs
+	local myARCH="${ARCH}" myABI="${ABI}"
+	# TODO: For cross-compiling
+	# You should set ARCH and ABI here
+	CC="$(tc-getCC)"
+	HOSTCC="$(tc-getBUILD_CC)"
+	KLIBCARCH="$(klibc_arch ${ARCH})"
+	KLIBCASMARCH="$(kernel_asm_arch ${ARCH})"
+	libdir="$(get_libdir)"
+	# This should be the defconfig corresponding to your userspace!
+	# NOT your kernel. PPC64-32ul would choose 'ppc' for example.
+	defconfig=$(kernel_defconfig ${ARCH})
+	unset ABI ARCH # Unset these, because they interfere
+	unset KBUILD_OUTPUT # we are using a private copy
+
+	cd "${KS}"
+	emake ${defconfig} || die "No defconfig"
+	emake prepare || die "Failed to prepare kernel sources for header usage"
+
+	cd "${S}"
+
+	use debug && myargs="${myargs} V=1"
+
+	emake \
+		EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \
+		EXTRA_KLIBCLDFLAGS="-z,noexecstack" \
+		HOSTCC="${HOSTCC}" CC="${CC}" \
+		INSTALLDIR="/usr/${libdir}/klibc" \
+		KLIBCARCH=${KLIBCARCH} \
+		KLIBCASMARCH=${KLIBCASMARCH} \
+		SHLIBDIR="/${libdir}" \
+		libdir="/usr/${libdir}" \
+		mandir="/usr/share/man" \
+		${myargs} || die "Compile failed!"
+
+		#SHLIBDIR="/${libdir}" \
+
+	ARCH="${myARCH}" ABI="${myABI}"
+}
+
+src_install() {
+	local myargs
+	local myARCH="${ARCH}" myABI="${ABI}"
+	# TODO: For cross-compiling
+	# You should set ARCH and ABI here
+	CC="$(tc-getCC)"
+	HOSTCC="$(tc-getBUILD_CC)"
+	KLIBCARCH="$(klibc_arch ${ARCH})"
+	KLIBCASMARCH="$(kernel_asm_arch ${ARCH})"
+	libdir="$(get_libdir)"
+	# This should be the defconfig corresponding to your userspace!
+	# NOT your kernel. PPC64-32ul would choose 'ppc' for example.
+	defconfig=$(kernel_defconfig ${ARCH})
+
+	use debug && myargs="${myargs} V=1"
+
+	local klibc_prefix
+	if tc-is-cross-compiler ; then
+		klibc_prefix=$("${S}/klcc/${KLIBCARCH}-klcc" -print-klibc-prefix)
+	else
+		klibc_prefix=$("${S}/klcc/klcc" -print-klibc-prefix)
+	fi
+
+	unset ABI ARCH # Unset these, because they interfere
+	unset KBUILD_OUTPUT # we are using a private copy
+
+	emake \
+		EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \
+		EXTRA_KLIBCLDFLAGS="-z,noexecstack" \
+		HOSTCC="${HOSTCC}" CC="${CC}" \
+		INSTALLDIR="/usr/${libdir}/klibc" \
+		INSTALLROOT="${D}" \
+		KLIBCARCH=${KLIBCARCH} \
+		KLIBCASMARCH=${KLIBCASMARCH} \
+		SHLIBDIR="/${libdir}" \
+		libdir="/usr/${libdir}" \
+		mandir="/usr/share/man" \
+		${myargs} \
+		install || die "Install failed!"
+
+		#SHLIBDIR="/${libdir}" \
+
+	# klibc doesn't support prelinking, so we need to mask it
+	cat > "${T}/70klibc" <<-EOF
+		PRELINK_PATH_MASK="/usr/${libdir}/klibc"
+	EOF
+
+	doenvd "${T}"/70klibc
+
+	# Fix the permissions (bug #178053) on /usr/${libdir}/klibc/include
+	# Actually I have no idea, why the includes have those weird-ass permissions
+	# on a particular system, might be due to inherited permissions from parent
+	# directory
+	find "${D}"/usr/${libdir}/klibc/include | xargs chmod o+rX
+
+	# Hardlinks becoming copies
+	for x in gunzip zcat ; do
+		rm -f "${D}/${klibc_prefix}/bin/${x}"
+		dosym gzip "${klibc_prefix}/bin/${x}"
+	done
+
+	# Restore now, so we can use the tc- functions
+	ARCH="${myARCH}" ABI="${myABI}"
+	if ! tc-is-cross-compiler ; then
+		cd "${S}"
+		insinto /usr/share/aclocal
+		doins contrib/klibc.m4
+
+		dodoc README usr/klibc/CAVEATS usr/klibc/README
+		newdoc usr/klibc/arch/README README.klibc.arch
+		docinto dash; newdoc usr/dash/README.klibc README
+		docinto gzip; dodoc usr/gzip/README
+	fi
+
+	# Fix up the symlink
+	# Mainly for merged arches
+	linkname="${D}/usr/${libdir}/klibc/include/asm"
+	if [ -L "${linkname}" ] && [ ! -e "${linkname}" ] ; then
+		ln -snf asm-${KLIBCASMARCH} "${linkname}"
+	fi
+}