From 03a7755fb1846fadcb54ab2d730fc18b1fd2ba44 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 16 Jun 2013 19:29:07 +0200 Subject: [PATCH] Adjust recipes for binutils and gcc to changes in HaikuPorter --- sys-devel/binutils/binutils-2.17_130421.recipe | 2 +- sys-devel/gcc/gcc-2.95.3_130425.recipe | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys-devel/binutils/binutils-2.17_130421.recipe b/sys-devel/binutils/binutils-2.17_130421.recipe index 46eddae6e..faf2d48f6 100644 --- a/sys-devel/binutils/binutils-2.17_130421.recipe +++ b/sys-devel/binutils/binutils-2.17_130421.recipe @@ -50,7 +50,7 @@ SOURCE_DIR="$portVersionedName" SOURCE_EXPORT_SUBDIR="legacy/binutils" BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL -binutilsDir=$(pwd)/legacy/binutils +binutilsDir=$(pwd) relativeArchInstallDir="develop/tools/${portVersionedName}" archInstallDir="$prefix/$relativeArchInstallDir" binutilsObjectsDir=$binutilsDir/../binutils-obj diff --git a/sys-devel/gcc/gcc-2.95.3_130425.recipe b/sys-devel/gcc/gcc-2.95.3_130425.recipe index fa559fb61..6d9064cca 100644 --- a/sys-devel/gcc/gcc-2.95.3_130425.recipe +++ b/sys-devel/gcc/gcc-2.95.3_130425.recipe @@ -7,7 +7,7 @@ LICENSE=" " COPYRIGHT="1988-2000 Free Software Foundation, Inc." SRC_URI=" - git+file://$portBaseDir/../binutils/work-2.17_130421/sources/binutils-2.17_130421#a57415355d72c2f0aa2afd1c374c9f7f9fc7f045 + git+file://$portBaseDir/../binutils/work-2.17_130421/download/BuildtoolsPM.git#a57415355d72c2f0aa2afd1c374c9f7f9fc7f045 git+git://github.com/haiku/BuildtoolsPM.git#a57415355d72c2f0aa2afd1c374c9f7f9fc7f045 " REVISION="2" @@ -48,7 +48,7 @@ SOURCE_DIR="$portVersionedName" SOURCE_EXPORT_SUBDIR="legacy/gcc" BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL -gccDir=$(pwd)/legacy/gcc +gccDir=$(pwd) gccDate=$(echo $portVersion | sed 's,.*_,,') relativeGccInstallDir="develop/tools/gcc-2.95.3_${gccDate}" gccInstallDir="$prefix/$relativeGccInstallDir"