diff -u binutils-2.16.1cvs20060413/debian/patches/00list binutils-2.16.1cvs20060413/debian/patches/00list --- binutils-2.16.1cvs20060413/debian/patches/00list +++ binutils-2.16.1cvs20060413/debian/patches/00list @@ -8,0 +9 @@ +124_multiarch diff -u binutils-2.16.1cvs20060413/debian/changelog binutils-2.16.1cvs20060413/debian/changelog --- binutils-2.16.1cvs20060413/debian/changelog +++ binutils-2.16.1cvs20060413/debian/changelog @@ -1,3 +1,10 @@ +binutils (2.16.1cvs20060413-1.1) unstable; urgency=low + + * Non-Maintainer upload + * Add multiarch dirs to search path (Closes: #369064) + + -- Goswin von Brederlow <[EMAIL PROTECTED]> Wed, 21 Jun 2006 00:45:01 +0200 + binutils (2.16.1cvs20060413-1) unstable; urgency=low * New upstream CVS snapshot. only in patch2: unchanged: --- binutils-2.16.1cvs20060413.orig/debian/patches/124_multiarch.dpatch +++ binutils-2.16.1cvs20060413/debian/patches/124_multiarch.dpatch @@ -0,0 +1,38 @@ +#!/bin/sh -e +## 124_multiarch.dpatch +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Description: Add multiarch directories to the search paths. +## DP: Author: Tollef Fog Heen <[EMAIL PROTECTED]> +## DP: Upstream status: Debian specific + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + [EMAIL PROTECTED]@ +--- binutils/ld/genscripts.sh ++++ binutils/ld/genscripts.sh +@@ -191,7 +191,7 @@ + esac + fi + +-LIB_SEARCH_DIRS=`echo ${LIB_PATH} | sed -e 's/:/ /g' -e 's/\([^ ][^ ]*\)/SEARCH_DIR(\\"\1\\");/g'` ++LIB_SEARCH_DIRS=`echo ${LIB_PATH} | sed -e 's/:/ /g' -e 's/\([^ ][^ ]*\)/SEARCH_DIR(\\"\1\\");SEARCH_DIR(\\"\1\\/'${TOOL_LIB}'");/g'` + + # We need it for testsuite. + set $EMULATION_LIBPATH
-- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]