This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".

The branch, master has been updated via c0fae77d43e91f4404e0a3acc30e675c809d221a (commit) via 50abc9526ae96751499db323f84801f9868c5ad9 (commit) from 2e0c9c147800fe6a10e9bdc3e35f65766f7af90e (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit c0fae77d43e91f4404e0a3acc30e675c809d221a Merge: 50abc95 2e0c9c1 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Mar 3 13:19:46 2012 +0100

Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

commit 50abc9526ae96751499db323f84801f9868c5ad9 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Mar 2 23:50:56 2012 +0100

icecream: Fix build on x86_64.

-----------------------------------------------------------------------

Summary of changes: icecream/icecream.nm | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-)

Difference in files: diff --git a/icecream/icecream.nm b/icecream/icecream.nm index d41e4e0..9c63e61 100644 --- a/icecream/icecream.nm +++ b/icecream/icecream.nm @@ -5,7 +5,7 @@

name = icecream version = 0.9.7 -release = 2 +release = 3

maintainer = Michael Tremer michael.tremer@ipfire.org groups = Development/Compilers @@ -47,17 +47,15 @@ build end

install_cmds - ICECREAM_TARGET_PLATFORM=$(echo %{DISTRO_MACHINE} | sed -e "s/-gnu//g") - - mkdir -pv %{BUILDROOT}/usr/lib/icecc/bin + mkdir -pv %{BUILDROOT}%{libdir}/icecc/bin for i in gcc g++ cc c++; do - ln -svf ../../../bin/icecc %{BUILDROOT}/usr/lib/icecc/bin/${i} - ln -svf ../../../bin/icecc %{BUILDROOT}/usr/lib/icecc/bin/%{ICECREAM_TARGET_PLATFORM}-${i} + ln -svf ../../../bin/icecc %{BUILDROOT}%{libdir}/icecc/bin/${i} + ln -svf ../../../bin/icecc %{BUILDROOT}%{libdir}/icecc/bin/%{DISTRO_BUILDTARGET}-${i} done - sed -e 's|^#!.*|#!/bin/bash|' -i %{BUILDROOT}/usr/lib/icecc/icecc-create-env + sed -e 's|^#!.*|#!/bin/bash|' -i %{BUILDROOT}%{libdir}/icecc/icecc-create-env

mkdir -pv %{BUILDROOT}/etc/profile.d - sed -e "s|@LIBDIR@|/usr/lib|g" \ + sed -e "s|@LIBDIR@|%{libdir}|g" \ < %{DIR_SOURCE}/icecream.sh > %{BUILDROOT}/etc/profile.d/icecream.sh

# create default working dir

hooks/post-receive -- IPFire 3.x development tree