From 64295b2996bad7dfda8ac5bb2d5e6e8bc46728cb Mon Sep 17 00:00:00 2001 From: "ted.mielczarek%gmail.com" Date: Fri, 21 Dec 2007 18:39:15 +0000 Subject: [PATCH] bug 407412 - fix rebasing, seriously. r=bsmedberg git-svn-id: svn://10.0.0.236/trunk@241952 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/tools/build-environment/win32/packageit-msys.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/mozilla/tools/build-environment/win32/packageit-msys.sh b/mozilla/tools/build-environment/win32/packageit-msys.sh index 8da6bdf9db2..481708fb996 100644 --- a/mozilla/tools/build-environment/win32/packageit-msys.sh +++ b/mozilla/tools/build-environment/win32/packageit-msys.sh @@ -66,6 +66,13 @@ popd # the DLL. Since I can't figure out how to rebase just one # DLL to avoid conflicts with a set of others, we just # rebase them all! +# Some DLLs won't rebase unless they are chmod 755 +find "${MSYS_STAGEDIR}/mozilla-build/msys" -name "*.dll" | \ + xargs chmod 755 -find "${MSYS_STAGEDIR}/mozilla-build/lib" -name "*.dll" | \ +# Skip libW11.dll, since it doesn't rebase properly +find "${MSYS_STAGEDIR}/mozilla-build/msys" -name "*.dll" | \ + grep -v "libW11.dll" | \ xargs rebase -d -b 60000000 +# Now rebase msys-1.0.dll to a special place because it's finicky +rebase -b 60100000 "${MSYS_STAGEDIR}/mozilla-build/msys/bin/msys-1.0.dll"