[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. a0466ef3c30fd3f09c76400d1268e66079855800 - IPFire-SCM

25 Jun 2010

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  a0466ef3c30fd3f09c76400d1268e66079855800 (commit)
       via  7d3fa443a6f98afc1e15b9a4c35ef966816a01fb (commit)
       via  c3d76dc1c074f37c53105550001ee861cd45a921 (commit)
       via  b7a617a5e023d971e83574598106a35a05b6200c (commit)
       via  515dbd5d9e996ae243faab68b59d9b84b7ea109b (commit)
       via  c5ac563e850a54964ff4aae726078c3c78d6a032 (commit)
       via  d5467e6fe2d1c280181bea453cb6435ac9b72403 (commit)
       via  4f8fc736900fd1956b3b100dbb209c5ed9a448ff (commit)
       via  407dc1fd506865c7c71e4c3ba1542dcc15abb0df (commit)
      from  76deda33df494d4534f79c87e4f4d4318fcc8f14 (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 a0466ef3c30fd3f09c76400d1268e66079855800
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Jun 25 18:35:25 2010 +0200
eggdbus: Disable parallel build.
commit 7d3fa443a6f98afc1e15b9a4c35ef966816a01fb
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Thu Jun 24 10:43:16 2010 +0200
toolchain: Update mpfr version to 3.0.0.
commit c3d76dc1c074f37c53105550001ee861cd45a921
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Thu Jun 24 10:43:01 2010 +0200
naoki: Set nice level for naoki process, too.
commit b7a617a5e023d971e83574598106a35a05b6200c
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Jun 23 13:28:21 2010 +0200
udev: Update to 157.
commit 515dbd5d9e996ae243faab68b59d9b84b7ea109b
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Jun 23 12:57:42 2010 +0200
mpfr: Update to 3.0.0.
commit c5ac563e850a54964ff4aae726078c3c78d6a032
Merge: d5467e6fe2d1c280181bea453cb6435ac9b72403 4f8fc736900fd1956b3b100dbb209c5ed9a448ff
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Mon Jun 21 11:50:14 2010 +0200
Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into next
commit d5467e6fe2d1c280181bea453cb6435ac9b72403
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Mon Jun 21 11:49:56 2010 +0200
ccache: Update to 3.0.
commit 4f8fc736900fd1956b3b100dbb209c5ed9a448ff
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sun Jun 20 11:34:31 2010 +0200
python: Fix that python uses libffi from system.
commit 407dc1fd506865c7c71e4c3ba1542dcc15abb0df
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sun Jun 20 10:05:38 2010 +0200
gettext: Enable testsuite.
Runs perfectly.
-----------------------------------------------------------------------
Summary of changes:
 naoki/__init__.py                       |    3 +++
 naoki/util.py                           |    3 ---
 pkgs/core/ccache/ccache.nm              |    2 +-
 pkgs/core/eggdbus/eggdbus.nm            |    2 ++
 pkgs/core/gettext/gettext.nm            |    3 +++
 pkgs/core/mpfr/mpfr.nm                  |   19 +++----------------
 pkgs/core/python/python.nm              |   13 ++++++++-----
 pkgs/core/udev/udev.nm                  |    4 ++--
 pkgs/toolchain/gcc-static/gcc-static.nm |    6 +++---
 9 files changed, 25 insertions(+), 30 deletions(-)
Difference in files:

diff --git a/naoki/__init__.py b/naoki/__init__.py
index 3bf5704..d513cd1 100644
--- a/naoki/__init__.py
+++ b/naoki/__init__.py
@@ -36,6 +36,9 @@ class Naoki(object):
    		self.cli.help()
    		return 1
+		if config["nice_level"]:
+			os.nice(int(config["nice_level"]))
+
    	actionmap = {
    		"build" : self.call_build,
    		"toolchain" : self.call_toolchain,
diff --git a/naoki/util.py b/naoki/util.py
index b5b3427..22623ad 100644
--- a/naoki/util.py
+++ b/naoki/util.py
@@ -134,9 +134,6 @@ def do(command, shell=False, chrootPath=None, cwd=None, timeout=0, raiseExc=True
    env = kargs.get("env", None)
    preexec = ChildPreExec(personality, chrootPath, cwd)
-	if config["nice_level"]:
-		command = "nice -n %s %s" % (config["nice_level"], command)
-
    try:
    	child = None
    	if logger:
diff --git a/pkgs/core/ccache/ccache.nm b/pkgs/core/ccache/ccache.nm
index 42bafea..c9b5372 100644
--- a/pkgs/core/ccache/ccache.nm
+++ b/pkgs/core/ccache/ccache.nm
@@ -25,7 +25,7 @@
 include $(PKGROOT)/Include
PKG_NAME       = ccache
-PKG_VER        = 3.0pre1
+PKG_VER        = 3.0
 PKG_REL        = 0
PKG_MAINTAINER =
diff --git a/pkgs/core/eggdbus/eggdbus.nm b/pkgs/core/eggdbus/eggdbus.nm
index 0b237ad..ae602e8 100644
--- a/pkgs/core/eggdbus/eggdbus.nm
+++ b/pkgs/core/eggdbus/eggdbus.nm
@@ -44,3 +44,5 @@ PKG_TARBALL    = $(THISAPP).tar.gz
CONFIGURE_OPTIONS += \
    --disable-static
+
+PARALLELISMFLAGS = # off
diff --git a/pkgs/core/gettext/gettext.nm b/pkgs/core/gettext/gettext.nm
index 669f263..e073d4e 100644
--- a/pkgs/core/gettext/gettext.nm
+++ b/pkgs/core/gettext/gettext.nm
@@ -59,3 +59,6 @@ CONFIGURE_OPTIONS += \
    --enable-shared \
    --disable-rpath
+define STAGE_TEST
+	cd $(DIR_APP) && make check
+endef
diff --git a/pkgs/core/mpfr/mpfr.nm b/pkgs/core/mpfr/mpfr.nm
index 29d1eba..a272f29 100644
--- a/pkgs/core/mpfr/mpfr.nm
+++ b/pkgs/core/mpfr/mpfr.nm
@@ -25,7 +25,7 @@
 include $(PKGROOT)/Include
PKG_NAME       = mpfr
-PKG_VER        = 2.4.2
+PKG_VER        = 3.0.0
 PKG_REL        = 0
PKG_MAINTAINER =
@@ -45,7 +45,7 @@ define PKG_DESCRIPTION
    library.
 endef
-PKG_TARBALL    = $(THISAPP).tar.bz2
+PKG_TARBALL    = $(THISAPP).tar.gz
ifeq "$(MACHINE)" "x86_64"
    ABI = 64
@@ -53,20 +53,7 @@ else
    ABI = 32
 endif
-###############################################################################
-# Installation Details
-###############################################################################
-
-define STAGE_BUILD
-	cd $(DIR_APP) && \
-		mpfr_cv_working_tls=yes \
-		./configure \
-			--prefix=/usr \
-			--enable-thread-safe \
-			--disable-static
-
-	cd $(DIR_APP) && make $(PARALLELISMFLAGS)
-endef
+CONFIGURE_OPTIONS += --enable-thread-safe
define STAGE_TEST
    cd $(DIR_APP) && make check
diff --git a/pkgs/core/python/python.nm b/pkgs/core/python/python.nm
index f657257..088dad5 100644
--- a/pkgs/core/python/python.nm
+++ b/pkgs/core/python/python.nm
@@ -34,8 +34,8 @@ PKG_URL        = http://www.python.org
 PKG_LICENSE    = Python
 PKG_SUMMARY    = An interpreted, interactive, object-oriented programming language.
-PKG_BUILD_DEPS+= autoconf automake
-PKG_DEPS      += bzip2 db expat gdbm gmp libffi ncurses openssl pkg-config readline sqlite tar zlib
+PKG_BUILD_DEPS+= autoconf automake pkg-config
+PKG_DEPS      += bzip2 db expat gdbm gmp libffi ncurses openssl readline sqlite tar zlib
define PKG_DESCRIPTION
    Python is an interpreted, interactive, object-oriented programming \
@@ -47,13 +47,16 @@ endef
PKG_TARBALL    = $(THISAPP).tar.bz2
-###############################################################################
-# Installation Details
-###############################################################################
+export CFLAGS  += -D_GNU_SOURCE -fwrapv
+export CPPFLAGS = $(shell pkg-config --cflags-only-I libffi)
define STAGE_PREPARE_CMDS
    cd $(DIR_APP) && sed -e "s/#*shared*/*shared*/g" -i Modules/Setup.dist
+	# Remove embedded copies of expat, zlib and libffi
+	cd $(DIR_APP) && rm -rf Modules/{expat,zlib}
+	cd $(DIR_APP) && rm -rf Modules/_ctypes/{darwin,libffi,libffi_arm_wince,libffi_msvc,libffi_osx}
+
    cd $(DIR_APP) && autoreconf
 endef
diff --git a/pkgs/core/udev/udev.nm b/pkgs/core/udev/udev.nm
index c456ba1..c056a38 100644
--- a/pkgs/core/udev/udev.nm
+++ b/pkgs/core/udev/udev.nm
@@ -25,7 +25,7 @@
 include $(PKGROOT)/Include
PKG_NAME       = udev
-PKG_VER        = 156
+PKG_VER        = 157
 PKG_REL        = 0
PKG_MAINTAINER =
@@ -41,7 +41,7 @@ define PKG_DESCRIPTION
    sysfs and netlink.
 endef
-PKG_TARBALL    = $(THISAPP).tar.bz2
+PKG_TARBALL    = $(THISAPP).tar.gz
CONFIGURE_OPTIONS += \
    --exec-prefix="" \
diff --git a/pkgs/toolchain/gcc-static/gcc-static.nm b/pkgs/toolchain/gcc-static/gcc-static.nm
index dfd2275..0f94cd0 100644
--- a/pkgs/toolchain/gcc-static/gcc-static.nm
+++ b/pkgs/toolchain/gcc-static/gcc-static.nm
@@ -5,16 +5,16 @@ include ../../core/gcc/gcc.nm
GMP  = gmp-5.0.1
 MPC  = mpc-0.8.2
-MPFR = mpfr-2.4.2
+MPFR = mpfr-3.0.0
-PKG_OBJECTS += $(GMP).tar.bz2 $(MPC).tar.gz $(MPFR).tar.bz2
+PKG_OBJECTS += $(GMP).tar.bz2 $(MPC).tar.gz $(MPFR).tar.gz
define STAGE_PREPARE_CMDS
    -mkdir -pv $(DIR_SRC)/gcc-build
cd $(DIR_APP) && $(DO_EXTRACT) $(DIR_DL)/$(GMP).tar.bz2
    cd $(DIR_APP) && $(DO_EXTRACT) $(DIR_DL)/$(MPC).tar.gz
-	cd $(DIR_APP) && $(DO_EXTRACT) $(DIR_DL)/$(MPFR).tar.bz2
+	cd $(DIR_APP) && $(DO_EXTRACT) $(DIR_DL)/$(MPFR).tar.gz
    cd $(DIR_APP) && ln -svf $(GMP) gmp
    cd $(DIR_APP) && ln -svf $(MPC) mpc
    cd $(DIR_APP) && ln -svf $(MPFR) mpfr
hooks/post-receive
--
IPFire 3.x development tree

    