[git.ipfire.org] IPFire 3.x development tree branch, master, updated. f9c2b4ea5bdf38660598e5671fc24fed2ad159b3

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. f9c2b4ea5bdf38660598e5671fc24fed2ad159b3

[git]

[-- Attachment #1: Type: text/plain, Size: 2013 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  f9c2b4ea5bdf38660598e5671fc24fed2ad159b3 (commit)
       via  5b1af63a91641212b6c7934c9778d2891b4e50e5 (commit)
      from  91d1c8a9207f9c436611e019f6fb6bb40e2ea3b4 (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 f9c2b4ea5bdf38660598e5671fc24fed2ad159b3
Merge: 5b1af63 91d1c8a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Feb 20 22:51:19 2013 +0100

    Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

commit 5b1af63a91641212b6c7934c9778d2891b4e50e5
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Wed Feb 20 21:50:30 2013 +0100

    icu: Fix build on armv7hl.

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

Summary of changes:
 icu/icu.nm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Difference in files:
diff --git a/icu/icu.nm b/icu/icu.nm
index 9693bb1..b40cbf0 100644
--- a/icu/icu.nm
+++ b/icu/icu.nm
@@ -8,7 +8,7 @@ version    = %{ver_major}.%{ver_minor}.%{ver_plevel}
 ver_major  = 50
 ver_minor  = 1
 ver_plevel = 2
-release    = 1
+release    = 2
 
 groups     = Development/Tools
 url        = http://www.icu-project.org
@@ -30,6 +30,10 @@ build
 		--with-data-packaging=library \
 		--disable-samples
 
+	prepare_cmds
+		sed -i 's|-nodefaultlibs -nostdlib||' config/mh-linux
+	end
+
 	configure_cmds
 		# There is no source/doc/html/search/ directory
 		sed -i '/^\s\+\$(INSTALL_DATA) \$(docsrchfiles) \$(DESTDIR)\$(docdir)\/\$(docsubsrchdir)\s*$/d' Makefile


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