[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. f7d695e3ce4a83aab6e63834baa66705a0665976
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 f7d695e3ce4a83aab6e63834baa66705a0665976 (commit) via a045948db063c8916440d3d2878c1a38c6cd8fd0 (commit) via 633a04be361d57fbf98ca8f71489e9630f25c66f (commit) via ccbbe72b99cc25eec776657368bcaf1bba9fc272 (commit) via 14e1f87b140d9bcef2d901ca3a8490ad096f89fe (commit) via e01b6c5b0b54da116921222e6eb4f4cde1b9b553 (commit) via 4d553b0a1e9a4346ca5a0f3cafc508f01ea8a770 (commit) via d99da9f5d22d70273cff89d01021f7fc40323d6b (commit) via 42925db45f41574e669dbba6c2f3de51f989226a (commit) via 2321bb11a2e36b2851f2613556b645ccaf9c8f5c (commit) via b83b4a1e7b8373381c3ed04a680ff23b9e130f74 (commit) via 1a4ec61bf53a8bc7ee1741a95b1a05941175875f (commit) from 80fdbbcd52ad5ac44316b879d82758d436c36f56 (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 f7d695e3ce4a83aab6e63834baa66705a0665976 Merge: a045948 80fdbbc Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Feb 12 21:22:52 2011 +0100
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
commit a045948db063c8916440d3d2878c1a38c6cd8fd0 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Feb 12 18:14:14 2011 +0100
Revert "build-essentials: Fix processing of user entered dependencies."
This reverts commit ccbbe72b99cc25eec776657368bcaf1bba9fc272.
commit 633a04be361d57fbf98ca8f71489e9630f25c66f Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Feb 12 16:44:27 2011 +0100
iana-etc: This package has no architecture.
commit ccbbe72b99cc25eec776657368bcaf1bba9fc272 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Feb 11 14:44:12 2011 +0100
build-essentials: Fix processing of user entered dependencies.
commit 14e1f87b140d9bcef2d901ca3a8490ad096f89fe Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Feb 7 16:17:59 2011 +0100
build-essentials: Build fix and set arch to noarch.
commit e01b6c5b0b54da116921222e6eb4f4cde1b9b553 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Feb 7 16:17:11 2011 +0100
texinfo: Build fix.
commit 4d553b0a1e9a4346ca5a0f3cafc508f01ea8a770 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Feb 7 16:16:31 2011 +0100
binutils: Add --host, --build and --target.
commit d99da9f5d22d70273cff89d01021f7fc40323d6b Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Feb 7 16:16:08 2011 +0100
ppl: Build fix.
Requires a C++ compiler to be compiled.
commit 42925db45f41574e669dbba6c2f3de51f989226a Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Feb 7 16:15:34 2011 +0100
naoki: Pass --build and --host to configure.
commit 2321bb11a2e36b2851f2613556b645ccaf9c8f5c Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Feb 7 16:08:07 2011 +0100
libnfsidmap: Build fix.
Requires a C++ compiler to build.
commit b83b4a1e7b8373381c3ed04a680ff23b9e130f74 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Feb 7 16:07:17 2011 +0100
attr: Build fix (libtool).
commit 1a4ec61bf53a8bc7ee1741a95b1a05941175875f Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Feb 7 16:06:54 2011 +0100
acl: Buildfix (libtool).
-----------------------------------------------------------------------
Summary of changes: pkgs/Constants | 4 +++- pkgs/core/acl/acl.nm | 2 ++ pkgs/core/attr/attr.nm | 2 ++ pkgs/core/binutils/binutils.nm | 9 +++++---- pkgs/core/build-essentials/build-essentials.nm | 14 +++++++------- pkgs/core/iana-etc/iana-etc.nm | 1 + pkgs/core/libnfsidmap/libnfsidmap.nm | 2 ++ pkgs/core/ppl/ppl.nm | 2 +- pkgs/core/texinfo/texinfo.nm | 15 ++------------- 9 files changed, 25 insertions(+), 26 deletions(-)
Difference in files: diff --git a/pkgs/Constants b/pkgs/Constants index c6b634b..d8bedf2 100644 --- a/pkgs/Constants +++ b/pkgs/Constants @@ -41,7 +41,9 @@ export CXXFLAGS
# Options that get passed to configure by default CONFIGURE_OPTIONS = \ - --prefix=/usr + --prefix=/usr \ + --build=$(TARGET) \ + --host=$(TARGET)
# For compatibility with pakfire3 DISTRO_MACHINE=$(TARGET) diff --git a/pkgs/core/acl/acl.nm b/pkgs/core/acl/acl.nm index 8ba2e31..697e007 100644 --- a/pkgs/core/acl/acl.nm +++ b/pkgs/core/acl/acl.nm @@ -53,6 +53,8 @@ CONFIGURE_OPTIONS += \ --disable-static \ --mandir=/usr/share/man
+STAGE_BUILD_TARGETS += LIBTOOL="libtool --tag=CC" + define STAGE_INSTALL_CMDS -mkdir -pv $(BUILDROOT)/{,usr/}lib $(BUILDROOT)/usr/include/{acl,sys} install -v -m0755 $(DIR_APP)/libacl/.libs/libacl.so.1.2.0 $(BUILDROOT)/lib diff --git a/pkgs/core/attr/attr.nm b/pkgs/core/attr/attr.nm index 94f217a..3cc2474 100644 --- a/pkgs/core/attr/attr.nm +++ b/pkgs/core/attr/attr.nm @@ -53,6 +53,8 @@ CONFIGURE_OPTIONS += \ --enable-shared \ --mandir=/usr/share/man
+STAGE_BUILD_TARGETS += LIBTOOL="libtool --tag=CC" + define STAGE_INSTALL_CMDS -mkdir -pv $(BUILDROOT)/{,usr/}lib install -v -m0755 $(DIR_APP)/libattr/.libs/libattr.so.1.1.0 $(BUILDROOT)/lib diff --git a/pkgs/core/binutils/binutils.nm b/pkgs/core/binutils/binutils.nm index 8391fa2..77b4930 100644 --- a/pkgs/core/binutils/binutils.nm +++ b/pkgs/core/binutils/binutils.nm @@ -43,10 +43,6 @@ PKG_BUILD_DEPS+= dejagnu texinfo zlib-devel
PKG_TARBALL += $(THISAPP).tar.bz2
-############################################################################### -# Installation Details -############################################################################### - define STAGE_PREPARE_CMDS -mkdir -pv $(DIR_SRC)/binutils-build
@@ -56,9 +52,14 @@ define STAGE_PREPARE_CMDS cd $(DIR_APP) && sed -e '/^INFO/s/standards.info //' -i etc/Makefile.in endef
+BINUTILS_TARGET_PLATFORM = $(subst -gnu,,$(DISTRO_MACHINE)) + define STAGE_BUILD cd $(DIR_SRC)/binutils-build && \ ../$(THISAPP)/configure \ + --host=$(BINUTILS_TARGET_PLATFORM) \ + --build=$(BINUTILS_TARGET_PLATFORM) \ + --target=$(BINUTILS_TARGET_PLATFORM) \ --prefix=/usr \ --mandir=/usr/share/man \ --enable-shared \ diff --git a/pkgs/core/build-essentials/build-essentials.nm b/pkgs/core/build-essentials/build-essentials.nm index a1d2d60..9ea5643 100644 --- a/pkgs/core/build-essentials/build-essentials.nm +++ b/pkgs/core/build-essentials/build-essentials.nm @@ -26,8 +26,8 @@ include $(PKGROOT)/Include
PKG_NAME = build-essentials PKG_VER = $(DISTRO_VERSION) -PKG_REL = 2 -#PKG_ARCH = noarch +PKG_REL = 4 +PKG_ARCH = noarch
PKG_MAINTAINER = Michael Tremer michael.tremer@ipfire.org PKG_GROUP = Development/Tools @@ -52,15 +52,15 @@ define STAGE_INSTALL -mkdir -pv $(BUILDROOT)/usr/lib/buildsystem{,-tools} -mkdir -pv $(BUILDROOT)/usr/lib/quality-agent
- cp -vf buildsystem/* $(BUILDROOT)/usr/lib/buildsystem - cp -vf buildsystem-tools/* $(BUILDROOT)/usr/lib/buildsystem-tools + cp -vf $(DIR_SOURCE)/buildsystem/* $(BUILDROOT)/usr/lib/buildsystem + cp -vf $(DIR_SOURCE)/buildsystem-tools/* $(BUILDROOT)/usr/lib/buildsystem-tools
- cp -vf quality-agent/quality-agent $(BUILDROOT)/usr/sbin/ - cp -vrf quality-agent/quality-agent.d/* \ + cp -vf $(DIR_SOURCE)/quality-agent/quality-agent $(BUILDROOT)/usr/sbin/ + cp -vrf $(DIR_SOURCE)/quality-agent/quality-agent.d/* \ $(BUILDROOT)/usr/lib/quality-agent/
-mkdir -pv $(BUILDROOT)/etc/profile.d - cp -vf buildsystem.sh $(BUILDROOT)/etc/profile.d/ + cp -vf $(DIR_SOURCE)/buildsystem.sh $(BUILDROOT)/etc/profile.d/
# Create symlink to chroot-shell ln -svf ../lib/buildsystem-tools/chroot-shell \ diff --git a/pkgs/core/iana-etc/iana-etc.nm b/pkgs/core/iana-etc/iana-etc.nm index 05604c8..86654f7 100644 --- a/pkgs/core/iana-etc/iana-etc.nm +++ b/pkgs/core/iana-etc/iana-etc.nm @@ -27,6 +27,7 @@ include $(PKGROOT)/Include PKG_NAME = iana-etc PKG_VER = 2.30 PKG_REL = 0 +PKG_ARCH = noarch
PKG_MAINTAINER = PKG_GROUP = Networking/Tools diff --git a/pkgs/core/libnfsidmap/libnfsidmap.nm b/pkgs/core/libnfsidmap/libnfsidmap.nm index 80fdb79..3a31d7f 100644 --- a/pkgs/core/libnfsidmap/libnfsidmap.nm +++ b/pkgs/core/libnfsidmap/libnfsidmap.nm @@ -34,6 +34,8 @@ PKG_URL = http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/ PKG_LICENSE = BSD PKG_SUMMARY = Library to help mapping id's, mainly for NFSv4.
+PKG_BUILD_DEPS+= gcc-c++ + define PKG_DESCRIPTION libnfsidmap provides functions to map between NFSv4 names \ (which are of the form user@domain) and local uid's and gid's. diff --git a/pkgs/core/ppl/ppl.nm b/pkgs/core/ppl/ppl.nm index 28c03eb..eac4af9 100644 --- a/pkgs/core/ppl/ppl.nm +++ b/pkgs/core/ppl/ppl.nm @@ -34,7 +34,7 @@ PKG_URL = http://www.cs.unipr.it/ppl/ PKG_LICENSE = GPLv3+ PKG_SUMMARY = The Parma Polyhedra Library: a library of numerical abstractions.
-PKG_BUILD_DEPS+= autoconf automake gmp-devel m4 +PKG_BUILD_DEPS+= autoconf automake gcc-c++ gmp-devel m4
define PKG_DESCRIPTION The Parma Polyhedra Library (PPL) is a library for the manipulation of \ diff --git a/pkgs/core/texinfo/texinfo.nm b/pkgs/core/texinfo/texinfo.nm index efc8110..7f2b102 100644 --- a/pkgs/core/texinfo/texinfo.nm +++ b/pkgs/core/texinfo/texinfo.nm @@ -34,7 +34,7 @@ PKG_URL = http://www.gnu.org/software/texinfo/ PKG_LICENSE = GPLv3 PKG_SUMMARY = Tools needed to create Texinfo format documentation files.
-PKG_DEPS += ncurses +PKG_BUILD_DEPS+= ncurses-devel
define PKG_DESCRIPTION Texinfo is a documentation system that can produce both online \ @@ -46,18 +46,7 @@ PKG_TARBALL = $(THISAPP).tar.gz
DIR_APP = $(DIR_SRC)/$(PKG_NAME)-4.13
-############################################################################### -# Installation Details -############################################################################### - -define STAGE_BUILD - cd $(DIR_APP) && \ - LDFLAGS="-lncursesw" \ - ./configure \ - --prefix=/usr - - cd $(DIR_APP) && make $(PARALLELISMFLAGS) -endef +export LDFLAGS = -lncursesw
define STAGE_TEST cd $(DIR_APP) && make check
hooks/post-receive -- IPFire 3.x development tree
-
git＠ipfire.org