aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2011-02-05 17:35:59 +0000
committerThomas Backlund <tmb@mageia.org>2011-02-05 17:35:59 +0000
commitaa4202c018ed6a24fce6927581a351af047122d0 (patch)
tree0e51f9598f662363a76e16209dcadce499287c33
parent84204cf2ae2bad9c3fcea2fe4a334ea8d1e1475a (diff)
merge rpmrc from rpm-manbo-setup1.116
-rw-r--r--NEWS6
-rw-r--r--configure.ac2
-rw-r--r--rpmrc.in28
3 files changed, 29 insertions, 7 deletions
diff --git a/NEWS b/NEWS
index 76de8d0..1fc94bf 100644
--- a/NEWS
+++ b/NEWS
@@ -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
diff --git a/configure.ac b/configure.ac
index 7e9fe1b..716da39 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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@mageia.org)
+AC_INIT(rpm-mageia-setup, 1.116, tmb@mageia.org)
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE(1.9 -Wno-portability)
AC_CONFIG_SRCDIR
diff --git a/rpmrc.in b/rpmrc.in
index 5e21d93..236c649 100644
--- a/rpmrc.in
+++ b/rpmrc.in
@@ -46,12 +46,23 @@ optflags: hppa1.1 %{__common_cflags} -mpa-risc-1-0
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: 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: 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 -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
@@ -88,6 +99,11 @@ buildarchtranslate: i486: i486
buildarchtranslate: i386: i386
buildarchtranslate: i386: i386
+buildarchtranslate: armv5tel armv5tl
+buildarchtranslate: armv7l armv5tl
+buildarchtranslate: armv5t armv5t
+buildarchtranslate: armv7 armv5t
+
#############################################################
# Architecture compatibility