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 2.x development tree".

The branch, next has been updated via b0ad5600dbc8c059dde746101af48a3bf51b9fae (commit) via ef4580b9be728017687792405eeb315d5348eb57 (commit) via 6b3c55d4b4bed74193870a5d1fbf64485864e37f (commit) from 9f3bbb9d30a2b549f78659e3c7b9548d75467aa3 (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 b0ad5600dbc8c059dde746101af48a3bf51b9fae Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Sep 14 13:07:43 2015 +0100

ccache: Include architecture in hashing

ccache was configured to neglegt the compiler it is using which causes conflicts when using the same cache for compiling multiple architectures. Hence we include the architecture (and the toolchain version) in the hash so that a different hash will be generated.

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit ef4580b9be728017687792405eeb315d5348eb57 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Sep 14 13:07:22 2015 +0100

cyrus-imapd: Fix searching for missing header

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 6b3c55d4b4bed74193870a5d1fbf64485864e37f Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Sep 14 12:34:35 2015 +0100

cyrus-imapd: Disable build which fails on all architectures

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

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

Summary of changes: lfs/cyrus-imapd | 5 ++--- make.sh | 2 +- tools/make-functions | 19 +++++++++++-------- 3 files changed, 14 insertions(+), 12 deletions(-)

Difference in files: diff --git a/lfs/cyrus-imapd b/lfs/cyrus-imapd index c358f18..f4c855c 100644 --- a/lfs/cyrus-imapd +++ b/lfs/cyrus-imapd @@ -37,6 +37,8 @@ PAK_VER = 5

DEPS = ""

+CFLAGS += -I/usr/include/et + ############################################################################### # Top-level Rules ############################################################################### @@ -80,9 +82,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cyrus-imapd-2.2.12-autocreate-0.9.4.diff cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/cyrus-imapd-2.2.12-gcc4.patch -# cp -f /usr/include/et/com_err.h /usr/include/com_err.h - cd $(DIR_APP) && cp -vf /usr/share/automake-*/config.{guess,sub} . - cd $(DIR_APP) && autoreconf -vfi cd $(DIR_APP) && ./configure --prefix=/usr --with-service-path=/usr/lib/cyrus \ --with-cyrus-prefix=/usr/lib/cyrus --sysconfdir=/var/ipfire/cyrusimap \ --with-auth=unix --with-perl --with-sasl --with-idle=idled \ diff --git a/make.sh b/make.sh index 235964b..8554200 100755 --- a/make.sh +++ b/make.sh @@ -236,7 +236,7 @@ prepareenv() { # Run LFS static binary creation scripts one by one export CCACHE_DIR=$BASEDIR/ccache export CCACHE_COMPRESS=1 - export CCACHE_COMPILERCHECK="none" + export CCACHE_COMPILERCHECK="string:toolchain-${TOOLCHAINVER}:${TARGET_ARCH}"

# Remove pre-install list of installed files in case user erase some files before rebuild rm -f $BASEDIR/build/usr/src/lsalr 2>/dev/null diff --git a/tools/make-functions b/tools/make-functions index 68ae0a1..a94dbd7 100644 --- a/tools/make-functions +++ b/tools/make-functions @@ -456,8 +456,8 @@ entershell() { NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \ CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ CCACHE_DIR=/usr/src/ccache \ - CCACHE_COMPRESS=1 \ - CCACHE_COMPILERCHECK="none" \ + CCACHE_COMPRESS="${CCACHE_COMPRESS}" \ + CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \ KVER=$KVER \ BUILDTARGET="$BUILDTARGET" \ CROSSTARGET="${CROSSTARGET}" \ @@ -579,8 +579,9 @@ lfsmake2() { CONFIG_ROOT=$CONFIG_ROOT \ NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \ CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ - CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 \ - CCACHE_COMPILERCHECK="none" \ + CCACHE_DIR=/usr/src/ccache \ + CCACHE_COMPRESS="${CCACHE_COMPRESS}" \ + CCACHE_COMPILERCHECK="${CCACHE_COMPILERCACHE}" \ KVER=$KVER MAKETUNING=$MAKETUNING \ BUILDTARGET="$BUILDTARGET" \ CROSSTARGET="${CROSSTARGET}" \ @@ -620,8 +621,9 @@ ipfiremake() { NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \ SYSTEM_RELEASE="$SYSTEM_RELEASE" \ CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ - CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 \ - CCACHE_COMPILERCHECK="none" \ + CCACHE_DIR=/usr/src/ccache \ + CCACHE_COMPRESS="${CCACHE_COMPRESS}" \ + CCACHE_COMPILERCHECK="${CCACHE_COMPILERCACHE}" \ KVER=$KVER MAKETUNING=$MAKETUNING \ BUILDTARGET="$BUILDTARGET" \ CROSSTARGET="${CROSSTARGET}" \ @@ -659,8 +661,9 @@ ipfiredist() { CONFIG_ROOT=$CONFIG_ROOT \ NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \ CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ - CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 \ - CCACHE_COMPILERCHECK="none" \ + CCACHE_DIR=/usr/src/ccache \ + CCACHE_COMPRESS="${CCACHE_COMPRESS}" \ + CCACHE_COMPILERCHECK="${CCACHE_COMPILERCACHE}" \ KVER=$KVER \ BUILDTARGET="$BUILDTARGET" \ CROSSTARGET="${CROSSTARGET}" \

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