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 133191284063ceedbb37ccb6e904675362038392 (commit) via 4cfe90a40dea694a9af05d0fc79c16fe1bd6d0c9 (commit) via 84c1f287f014cff3ec88d88eee918213948056cc (commit) via a764253110d4201bc164e4a6ad90ae08214292c3 (commit) from c93f54147fef4a95b74d17e74a7c2b86755f65ef (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 133191284063ceedbb37ccb6e904675362038392 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Dec 19 00:15:18 2011 +0100
gcc: Fix linking against libgcc on ARM.
The shared version of libgcc (libgcc_s) does not provide all symbols and so we need to the static version as well. That is done by a simple linker script.
commit 4cfe90a40dea694a9af05d0fc79c16fe1bd6d0c9 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Dec 19 00:12:54 2011 +0100
acl: Fix requirement of devel package.
commit 84c1f287f014cff3ec88d88eee918213948056cc Merge: a764253 c93f541 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Dec 18 23:31:33 2011 +0100
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
commit a764253110d4201bc164e4a6ad90ae08214292c3 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Dec 18 23:12:57 2011 +0100
attr: Create some aliases for the packages.
Sometimes, it got weird with the automatic depenidencies.
-----------------------------------------------------------------------
Summary of changes: acl/acl.nm | 6 +++++- attr/attr.nm | 9 ++++++--- gcc/gcc.nm | 18 ++++++++++++++++-- 3 files changed, 27 insertions(+), 6 deletions(-)
Difference in files: diff --git a/acl/acl.nm b/acl/acl.nm index 069b963..5538828 100644 --- a/acl/acl.nm +++ b/acl/acl.nm @@ -5,7 +5,7 @@
name = acl version = 2.2.47 -release = 1 +release = 2
groups = System/Filesystems url = http://oss.sgi.com/projects/xfs/ @@ -54,6 +54,10 @@ packages
package libacl-devel template DEVEL + + # Overwrite default dependency because the + # libs are in a subpackage. + requires = libacl=%{thisver} end
package %{name}-debuginfo diff --git a/attr/attr.nm b/attr/attr.nm index 9a6a8de..03565ef 100644 --- a/attr/attr.nm +++ b/attr/attr.nm @@ -5,7 +5,7 @@
name = attr version = 2.4.43 -release = 1 +release = 2
groups = System/Filesystems url = http://oss.sgi.com/projects/xfs/ @@ -45,15 +45,18 @@ end
packages package lib%{name} + provides += attr=%{thisver} end
package lib%{name}-devel template DEVEL + + provides += attr-devel=%{thisver} end
- package %{name}-debuginfo + package lib%{name}-debuginfo template DEBUGINFO
- provides += libattr-debuginfo + provides += attr-debuginfo end end diff --git a/gcc/gcc.nm b/gcc/gcc.nm index 575cd89..c650b71 100644 --- a/gcc/gcc.nm +++ b/gcc/gcc.nm @@ -8,7 +8,7 @@ build_cloog_ppl = 1
name = gcc version = 4.6.2 -release = 4 +release = 6
maintainer = Michael Tremer michael.tremer@ipfire.org groups = Development/Compilers @@ -221,7 +221,21 @@ build
# Move libgcc_s to /lib mv -vf %{BUILDROOT}/usr/lib/libgcc_s.so.1 %{BUILDROOT}/lib/ - ln -svf ../../lib/libgcc_s.so.1 %{BUILDROOT}/usr/lib/libgcc_s.so + case "%{DISTRO_ARCH}" in + arm*) + rm -f ${FULLPATH}/libgcc_s.so %{BUILDROOT}/usr/lib/libgcc_s.so + cat <<EOF >${FULLPATH}/libgcc_s.so + /* GNU ld script + Use the shared library, but some functions are only in + the static library, so try that secondarily. */ + OUTPUT_FORMAT(elf32-littlearm) + GROUP ( /lib/libgcc_s.so.1 libgcc.a ) + EOF + ;; + *) + ln -svf ../../lib/libgcc_s.so.1 ${FULLPATH}/libgcc_s.so + ;; + esac
# Remove some GNU debugger stuff. rm -vf %{BUILDROOT}/usr/lib/lib*.py
hooks/post-receive -- IPFire 3.x development tree