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

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 6112 bytes --]

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  6fba020e47df686e32a65d715753cca2b80fca7b (commit)
       via  e0e5b1d5ed2b88103539e38bbc34826f21c09a37 (commit)
       via  3bece6206488447110617096b354c6bd65467fb8 (commit)
      from  1262a2912640dfc79e54f3f90d92006bc12ea270 (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 6fba020e47df686e32a65d715753cca2b80fca7b
Author: Kim Barthel <kbarthel(a)ipfire.org>
Date:   Mon Jul 16 21:09:05 2012 +0200

    libidn: updated to 1.25
    
    Fixes Bug #10139.

commit e0e5b1d5ed2b88103539e38bbc34826f21c09a37
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Jul 17 11:32:53 2012 +0200

    gcc: Change runtime linker on armv7hl to ld-linux-armhf.so.3.
    
    Fixes #10177.

commit 3bece6206488447110617096b354c6bd65467fb8
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Jul 17 11:31:31 2012 +0200

    glibc: Provide ld-linux.so.3(GLIBC_PRIVATE) on armv7hl.
    
    This is needed because of the transition to the new runtime
    linker name.

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

Summary of changes:
 gcc/gcc.nm                              |    5 ++-
 gcc/patches/gcc-4.7-arm-hfp-ldso.patch0 |   52 +++++++++++++++++++++++++++++++
 glibc/glibc.nm                          |    3 +-
 libidn/libidn.nm                        |    4 +-
 4 files changed, 59 insertions(+), 5 deletions(-)
 create mode 100644 gcc/patches/gcc-4.7-arm-hfp-ldso.patch0

Difference in files:
diff --git a/gcc/gcc.nm b/gcc/gcc.nm
index dbd1fcb..69f6fd2 100644
--- a/gcc/gcc.nm
+++ b/gcc/gcc.nm
@@ -8,7 +8,7 @@ build_cloog_ppl = 1
 
 name       = gcc
 version    = 4.7.1
-release    = 2
+release    = 3
 
 maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
 groups     = Development/Compilers
@@ -36,7 +36,7 @@ build
 		expect
 		filesystem >= 002
 		flex
-		glibc-devel
+		glibc-devel >= 2.16
 		gmp-devel
 		libffi-devel
 		libmpc-devel
@@ -299,6 +299,7 @@ packages
 		requires
 			binutils >= %{required_binutils_version}
 			filesystem >= 002
+			glibc >= 2.16
 			glibc-devel
 			gmp-devel
 			cpp = %{thisver}
diff --git a/gcc/patches/gcc-4.7-arm-hfp-ldso.patch0 b/gcc/patches/gcc-4.7-arm-hfp-ldso.patch0
new file mode 100644
index 0000000..2f0b8c4
--- /dev/null
+++ b/gcc/patches/gcc-4.7-arm-hfp-ldso.patch0
@@ -0,0 +1,52 @@
+2012-05-01  Richard Earnshaw  <rearnsha(a)arm.com>
+
+	* arm/linux-eabi.h (GLIBC_DYNAMIC_LINKER_DEFAULT): Avoid ifdef
+	comparing enumeration values.  Update comments.
+
+2012-04-26  Michael Hope  <michael.hope(a)linaro.org>
+	    Richard Earnshaw  <rearnsha(a)arm.com>
+
+	* config/arm/linux-eabi.h (GLIBC_DYNAMIC_LINKER_SOFT_FLOAT): Define.
+	(GLIBC_DYNAMIC_LINKER_HARD_FLOAT): Define.
+	(GLIBC_DYNAMIC_LINKER_DEFAULT): Define.
+	(GLIBC_DYNAMIC_LINKER):	Redefine to use the hard float path.
+
+--- gcc/config/arm/linux-eabi.h	(revision 186858)
++++ gcc/config/arm/linux-eabi.h	(revision 187012)
+@@ -32,7 +32,8 @@
+   while (false)
+ 
+ /* We default to a soft-float ABI so that binaries can run on all
+-   target hardware.  */
++   target hardware.  If you override this to use the hard-float ABI then
++   change the setting of GLIBC_DYNAMIC_LINKER_DEFAULT as well.  */
+ #undef  TARGET_DEFAULT_FLOAT_ABI
+ #define TARGET_DEFAULT_FLOAT_ABI ARM_FLOAT_ABI_SOFT
+ 
+@@ -59,10 +60,23 @@
+ #undef  SUBTARGET_EXTRA_LINK_SPEC
+ #define SUBTARGET_EXTRA_LINK_SPEC " -m " TARGET_LINKER_EMULATION
+ 
+-/* Use ld-linux.so.3 so that it will be possible to run "classic"
+-   GNU/Linux binaries on an EABI system.  */
++/* GNU/Linux on ARM currently supports three dynamic linkers:
++   - ld-linux.so.2 - for the legacy ABI
++   - ld-linux.so.3 - for the EABI-derived soft-float ABI
++   - ld-linux-armhf.so.3 - for the EABI-derived hard-float ABI.
++   All the dynamic linkers live in /lib.
++   We default to soft-float, but this can be overridden by changing both
++   GLIBC_DYNAMIC_LINKER_DEFAULT and TARGET_DEFAULT_FLOAT_ABI.  */
++
+ #undef  GLIBC_DYNAMIC_LINKER
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.3"
++#define GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "/lib/ld-linux.so.3"
++#define GLIBC_DYNAMIC_LINKER_HARD_FLOAT "/lib/ld-linux-armhf.so.3"
++#define GLIBC_DYNAMIC_LINKER_DEFAULT GLIBC_DYNAMIC_LINKER_SOFT_FLOAT
++
++#define GLIBC_DYNAMIC_LINKER \
++   "%{mfloat-abi=hard:" GLIBC_DYNAMIC_LINKER_HARD_FLOAT "} \
++    %{mfloat-abi=soft*:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "} \
++    %{!mfloat-abi=*:" GLIBC_DYNAMIC_LINKER_DEFAULT "}"
+ 
+ /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
+    use the GNU/Linux version, not the generic BPABI version.  */
diff --git a/glibc/glibc.nm b/glibc/glibc.nm
index dd948b4..8a12d01 100644
--- a/glibc/glibc.nm
+++ b/glibc/glibc.nm
@@ -5,7 +5,7 @@
 
 name       = glibc
 version    = 2.16.0
-release    = 2
+release    = 3
 
 maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
 groups     = System/Base
@@ -249,6 +249,7 @@ packages
 		if "%{DISTRO_ARCH}" == "armv7hl"
 			provides += ld-linux.so.3
 			provides += ld-linux.so.3(GLIBC_2.4)
+			provides += ld-linux.so.3(GLIBC_PRIVATE)
 		end
 	end
 
diff --git a/libidn/libidn.nm b/libidn/libidn.nm
index f56544c..50e537d 100644
--- a/libidn/libidn.nm
+++ b/libidn/libidn.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = libidn
-version    = 1.24
-release    = 2
+version    = 1.25
+release    = 1
 
 groups     = System/Libraries
 url        = http://www.gnu.org/software/libidn/


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