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 f0d77f5d9dbda65c3bb3913ce8935515a01ff662 (commit) via ce9a2d4f4e13f129e9f32224af13caf13341cb54 (commit) via 918ce2ad1b6436dce258eb8c0ecf6a2bc4908de9 (commit) from e1102ce9f83d7c4f0ea5be4ad63adb58d63a228e (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 f0d77f5d9dbda65c3bb3913ce8935515a01ff662 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jul 16 16:03:14 2011 +0200
gcc: Make cloog-ppl feature optional for gcc build.
This was needed because the is a circular dependency between cloog-ppl, ppl and gcc. You cannot rebuild cloog with a recent version of ppl because an older version of ppl is needed to run gcc.
commit ce9a2d4f4e13f129e9f32224af13caf13341cb54 Merge: 918ce2a e1102ce Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jul 16 16:01:46 2011 +0200
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
commit 918ce2ad1b6436dce258eb8c0ecf6a2bc4908de9 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jul 16 16:00:36 2011 +0200
cloog: Rebuild cloog with ppl >= 0.11.2.
-----------------------------------------------------------------------
Summary of changes: pkgs/cloog/cloog.nm | 7 ++++++- pkgs/gcc/gcc.nm | 31 ++++++++++++++++++++++++------- 2 files changed, 30 insertions(+), 8 deletions(-)
Difference in files: diff --git a/pkgs/cloog/cloog.nm b/pkgs/cloog/cloog.nm index 7ac8257..1c955f2 100644 --- a/pkgs/cloog/cloog.nm +++ b/pkgs/cloog/cloog.nm @@ -34,7 +34,7 @@ PKG_URL = http://www.cloog.org PKG_LICENSE = GPLv2+ PKG_SUMMARY = The Chunky Loop Generator.
-PKG_BUILD_DEPS+= autoconf automake gmp-devel m4 ppl-devel +PKG_BUILD_DEPS+= autoconf automake gmp-devel m4 ppl-devel>=0.11.2
define PKG_DESCRIPTION CLooG is a software which generates loops for scanning Z-polyhedra. That is, \ @@ -52,6 +52,11 @@ DIR_APP = $(DIR_SRC)/$(PKG_NAME)-ppl-$(PKG_VER) CONFIGURE_OPTIONS += \ --with-ppl
+define STAGE_PREPARE_CMDS + cd $(DIR_APP) && sed -i configure \ + -e "s/ppl_minor_version=10/ppl_minor_version=11/" +endef + define STAGE_TEST cd $(DIR_APP) && make check endef diff --git a/pkgs/gcc/gcc.nm b/pkgs/gcc/gcc.nm index 74ccde3..36cf73b 100644 --- a/pkgs/gcc/gcc.nm +++ b/pkgs/gcc/gcc.nm @@ -24,9 +24,11 @@
include $(PKGROOT)/Include
+BUILD_CLOOG_PPL= 1 + PKG_NAME = gcc PKG_VER = 4.6.1 -PKG_REL = 2 +PKG_REL = 3
PKG_MAINTAINER = Michael Tremer michael.tremer@ipfire.org PKG_GROUPS = Development/Compilers @@ -41,10 +43,27 @@ endef
BINUTILS_VER = 2.21.51.0.8-1
-PKG_BUILD_DEPS+= autogen binutils>=$(BINUTILS_VER) cloog-ppl-devel dejagnu \ - elfutils-devel expect flex gmp-devel libffi-devel libmpc-devel mpfr-devel \ - ppl-devel texinfo zlib-devel -PKG_DEPS-gcc += binutils>=$(BINUTILS_VER) libgcc-devel cloog-ppl>=0.15 +PKG_BUILD_DEPS+= \ + autogen \ + binutils>=$(BINUTILS_VER) \ + dejagnu \ + elfutils-devel \ + expect \ + flex \ + gmp-devel \ + libffi-devel \ + mpc-devel \ + mpfr-devel \ + texinfo \ + zlib-devel + +PKG_DEPS-gcc += binutils>=$(BINUTILS_VER) libgcc-devel + +ifeq "$(BUILD_CLOOG_PPL)" "1" + PKG_BUILD_DEPS += cloog-ppl-devel ppl-devel + PKG_DEPS-gcc += cloog-ppl>=0.15 + CONFIGURE_ARGS += --with-cloog --with-ppl +endif
# Make the GCC target platform GCC_TARGET_PLATFORM = $(subst -gnu,,$(DISTRO_MACHINE)) @@ -219,8 +238,6 @@ define STAGE_BUILD --disable-static \ --with-system-zlib \ --with-bugurl=http://bugtracker.ipfire.org \ - --with-ppl \ - --with-cloog \ --disable-libunwind-exceptions \ --enable-gnu-unique-object \ --enable-linker-build-id \
hooks/post-receive -- IPFire 3.x development tree