aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGwenolé Beauchesne <gbeauchesne@mandriva.org>2006-12-01 14:45:40 +0000
committerGwenolé Beauchesne <gbeauchesne@mandriva.org>2006-12-01 14:45:40 +0000
commit80c02e2b25eff090764b4c18998757c146702be0 (patch)
tree100aad008b8937206b143aebcf5fc43b4711fb83
parentc6481f0da3590f743e0e948e2dfe202140057225 (diff)
downloadrpm-setup-80c02e2b25eff090764b4c18998757c146702be0.tar
rpm-setup-80c02e2b25eff090764b4c18998757c146702be0.tar.gz
rpm-setup-80c02e2b25eff090764b4c18998757c146702be0.tar.bz2
rpm-setup-80c02e2b25eff090764b4c18998757c146702be0.tar.xz
rpm-setup-80c02e2b25eff090764b4c18998757c146702be0.zip
Introduce ppc32 optflags.
-rw-r--r--configure.ac4
-rw-r--r--make_macrosfiles.sh.in2
-rw-r--r--rpmrc.in3
3 files changed, 5 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index ae07d1d..80a0a87 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
# $Id$
AC_PREREQ(2.59)
-AC_INIT(rpm-mandriva-setup, 1.31, nanardon@mandriva.org)
+AC_INIT(rpm-mandriva-setup, 1.33, nanardon@mandriva.org)
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE(1.9)
AC_CONFIG_SRCDIR
@@ -26,7 +26,7 @@ case "${target_cpu}" in
RPMALLARCH="ppc"
;;
ppc64|powerpc64)
- RPMALLARCH="ppc ppc64"
+ RPMALLARCH="ppc ppc32 ppc64"
;;
sparc|sparcv9)
RPMALLARCH="sparc"
diff --git a/make_macrosfiles.sh.in b/make_macrosfiles.sh.in
index 7955fd3..05be025 100644
--- a/make_macrosfiles.sh.in
+++ b/make_macrosfiles.sh.in
@@ -29,7 +29,7 @@ case $ARCH in
CANONARCH=sparc64
LIB=lib64
;;
- ppc|powerpc)
+ ppc|powerpc|ppc32)
MULTILIBNO=1
CANONARCH=ppc
;;
diff --git a/rpmrc.in b/rpmrc.in
index 2066801..710ef7a 100644
--- a/rpmrc.in
+++ b/rpmrc.in
@@ -33,7 +33,8 @@ optflags: m68k %{__common_cflags} -fomit-frame-pointer
optflags: ppc %{__common_cflags} -fsigned-char -mcpu=750 -mtune=7450
optflags: ppciseries %{__common_cflags} -fsigned-char
optflags: ppcpseries %{__common_cflags} -fsigned-char
-optflags: ppc64 %{__common_cflags} -fsigned-char -mcpu=power4 -mtune=cell
+optflags: ppc32 %{__common_cflags} -m32 -fsigned-char -mcpu=power4 -mtune=cell
+optflags: ppc64 %{__common_cflags} -m64 -fsigned-char -mcpu=power4 -mtune=cell
optflags: parisc %{__common_cflags} -mpa-risc-1-0
optflags: hppa1.0 %{__common_cflags} -mpa-risc-1-0