[Mageia-sysadm] [421] merge rpmrc from rpm-manbo-setup

[root at mageia.org]

Revision: 421
Author:   tmb
Date:     2011-02-05 18:35:59 +0100 (Sat, 05 Feb 2011)
Log Message:
-----------
merge rpmrc from rpm-manbo-setup

Modified Paths:
--------------
    rpm/rpm-setup/trunk/NEWS
    rpm/rpm-setup/trunk/configure.ac
    rpm/rpm-setup/trunk/rpmrc.in

Modified: rpm/rpm-setup/trunk/NEWS
===================================================================
--- rpm/rpm-setup/trunk/NEWS	2011-02-04 22:19:52 UTC (rev 420)
+++ rpm/rpm-setup/trunk/NEWS	2011-02-05 17:35:59 UTC (rev 421)
@@ -1,3 +1,9 @@
+Version 1.116 - 5 February 2011, by Thomas Backlund
+- merge rpmrc from rpm-manbo-setup
+
+Version 1.115 - 
+- initial Mageia import
+
 Version 1.114 - 9 December 2010, by Rémy Clouard
 - only add runtime dependencies in rubygems.rb
 

Modified: rpm/rpm-setup/trunk/configure.ac
===================================================================
--- rpm/rpm-setup/trunk/configure.ac	2011-02-04 22:19:52 UTC (rev 420)
+++ rpm/rpm-setup/trunk/configure.ac	2011-02-05 17:35:59 UTC (rev 421)
@@ -4,7 +4,7 @@
 # $Id: configure.ac 271266 2010-11-04 10:43:28Z fwang $
 
 AC_PREREQ(2.59)
-AC_INIT(rpm-mageia-setup, 1.115, nanardon at mageia.org)
+AC_INIT(rpm-mageia-setup, 1.116, tmb at mageia.org)
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE(1.9 -Wno-portability)
 AC_CONFIG_SRCDIR

Modified: rpm/rpm-setup/trunk/rpmrc.in
===================================================================
--- rpm/rpm-setup/trunk/rpmrc.in	2011-02-04 22:19:52 UTC (rev 420)
+++ rpm/rpm-setup/trunk/rpmrc.in	2011-02-05 17:35:59 UTC (rev 421)
@@ -46,13 +46,24 @@
 optflags: hppa1.2 %{__common_cflags} -mpa-risc-1-0
 optflags: hppa2.0 %{__common_cflags} -mpa-risc-1-0
 
-optflags: mips %{__common_cflags}
-optflags: mipsel %{__common_cflags}
+optflags: mips %{__common_cflags} -march=mips3
+optflags: mipsel %{__common_cflags} -march=mips3
+optflags: mips32el %{__common_cflags} -march=mips3 -mabi=n32
+optflags: mips64el %{__common_cflags} -march=mips3 -mabi=64
 
-optflags: armv3l %{__common_cflags} -fsigned-char -fomit-frame-pointer -march=armv3
-optflags: armv4b %{__common_cflags} -fsigned-char -fomit-frame-pointer -march=armv4
-optflags: armv4l %{__common_cflags} -fsigned-char -fomit-frame-pointer -march=armv4
+optflags: armv3l %{__common_cflags} -fsigned-char -march=armv3
+optflags: armv4b %{__common_cflags} -fsigned-char -march=armv4
+optflags: armv4l %{__common_cflags} -fsigned-char -march=armv4
+optflags: armv4t %{__common_cflags} -fsigned-char -march=armv4t
+optflags: armv5t %{__common_cflags} -fsigned-char -march=armv5t
+# Cortex A8
+optflags: armv7 %{__common_cflags} -fsigned-char -march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp
 
+optflags: armv4tl %{__common_cflags} -fsigned-char -march=armv4t
+optflags: armv5tl %{__common_cflags} -fsigned-char -march=armv5t
+# Cortex A8
+optflags: armv7l %{__common_cflags} -fsigned-char -march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp
+
 optflags: atarist %{__common_cflags} -fomit-frame-pointer
 optflags: atariste %{__common_cflags} -fomit-frame-pointer
 optflags: ataritt %{__common_cflags} -fomit-frame-pointer
@@ -88,6 +99,11 @@
 buildarchtranslate: i386: i386
 buildarchtranslate: i386: i386
 
+buildarchtranslate: armv5tel armv5tl
+buildarchtranslate: armv7l armv5tl
+buildarchtranslate: armv5t armv5t
+buildarchtranslate: armv7 armv5t
+
 #############################################################
 # Architecture compatibility
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20110205/d2166eb6/attachment.html>