> Ok, ignore the last message... I misunderstood that you meant getting
> all the .spec files set so the optflags settings were always passed
> down (and making sure --target i[456]86 actually worked)
>
> Sorry for my confusion :)
No problem!
Enclosed in this letter are the two patches necessary to get rpm to let
you build i586/i686. rpm.spec.patch is to be applied to rpm.spec, and
rpm-3.0.4-i686.patch should go into /usr/src/redhat/SOURCES .
Let me know if this is not an appropriate place to post small patches
like this, and I'll stop :-)
Steven Boswell
[EMAIL PROTECTED]
diff -ur rpm-3.0.4-orig/Makefile.am rpm-3.0.4/Makefile.am
--- rpm-3.0.4-orig/Makefile.am Sun Feb 27 11:00:36 2000
+++ rpm-3.0.4/Makefile.am Thu Apr 27 11:38:05 2000
@@ -70,6 +70,10 @@
@ln -s rpm/rpmpopt $(DESTDIR)/$(libdir)/rpmpopt
@$(mkinstalldirs) $(DESTDIR)/$(prefix)/src/redhat/BUILD
@case "@build_cpu@" in \
+ i386) $(mkinstalldirs) $(DESTDIR)/$(prefix)/src/redhat/RPMS/i386 ;;\
+ i486) $(mkinstalldirs) $(DESTDIR)/$(prefix)/src/redhat/RPMS/i486 ;;\
+ i586) $(mkinstalldirs) $(DESTDIR)/$(prefix)/src/redhat/RPMS/i586 ;;\
+ i686) $(mkinstalldirs) $(DESTDIR)/$(prefix)/src/redhat/RPMS/i686 ;;\
*86) $(mkinstalldirs) $(DESTDIR)/$(prefix)/src/redhat/RPMS/i386 ;;\
alpha*) $(mkinstalldirs) $(DESTDIR)/$(prefix)/src/redhat/RPMS/alpha ;;\
sparc*) $(mkinstalldirs) $(DESTDIR)/$(prefix)/src/redhat/RPMS/sparc;\
diff -ur rpm-3.0.4-orig/Makefile.in rpm-3.0.4/Makefile.in
--- rpm-3.0.4-orig/Makefile.in Wed Mar 1 09:17:05 2000
+++ rpm-3.0.4/Makefile.in Thu Apr 27 11:38:00 2000
@@ -755,6 +755,10 @@
@ln -s rpm/rpmpopt $(DESTDIR)/$(libdir)/rpmpopt
@$(mkinstalldirs) $(DESTDIR)/$(prefix)/src/redhat/BUILD
@case "@build_cpu@" in \
+ i386) $(mkinstalldirs) $(DESTDIR)/$(prefix)/src/redhat/RPMS/i386 ;;\
+ i486) $(mkinstalldirs) $(DESTDIR)/$(prefix)/src/redhat/RPMS/i486 ;;\
+ i586) $(mkinstalldirs) $(DESTDIR)/$(prefix)/src/redhat/RPMS/i586 ;;\
+ i686) $(mkinstalldirs) $(DESTDIR)/$(prefix)/src/redhat/RPMS/i686 ;;\
*86) $(mkinstalldirs) $(DESTDIR)/$(prefix)/src/redhat/RPMS/i386 ;;\
alpha*) $(mkinstalldirs) $(DESTDIR)/$(prefix)/src/redhat/RPMS/alpha ;;\
sparc*) $(mkinstalldirs) $(DESTDIR)/$(prefix)/src/redhat/RPMS/sparc;\
Only in rpm-3.0.4: blah
diff -ur rpm-3.0.4-orig/configure rpm-3.0.4/configure
--- rpm-3.0.4-orig/configure Sun Feb 27 15:24:37 2000
+++ rpm-3.0.4/configure Thu Apr 27 11:38:48 2000
@@ -8526,7 +8526,11 @@
fi
case "${build_cpu}" in
-i386|i486|i586|i686|ix86) RPMCANONARCH=i386 ;;
+i386) RPMCANONARCH=i386 ;;
+i486) RPMCANONARCH=i486 ;;
+i586) RPMCANONARCH=i586 ;;
+i686) RPMCANONARCH=i686 ;;
+ix86) RPMCANONARCH=i386 ;;
alpha*) RPMCANONARCH=alpha ;;
sparc*) RPMCANONARCH=sparc ;;
powerpc*) RPMCANONARCH=ppc ;;
diff -ur rpm-3.0.4-orig/configure.in rpm-3.0.4/configure.in
--- rpm-3.0.4-orig/configure.in Fri Feb 25 03:59:02 2000
+++ rpm-3.0.4/configure.in Thu Apr 27 11:38:56 2000
@@ -822,7 +822,11 @@
dnl Determine the canonical arch-vendor-os for the build machine
case "${build_cpu}" in
-i386|i486|i586|i686|ix86) RPMCANONARCH=i386 ;;
+i386) RPMCANONARCH=i386 ;;
+i486) RPMCANONARCH=i486 ;;
+i586) RPMCANONARCH=i586 ;;
+i686) RPMCANONARCH=i686 ;;
+ix86) RPMCANONARCH=i386 ;;
alpha*) RPMCANONARCH=alpha ;;
sparc*) RPMCANONARCH=sparc ;;
powerpc*) RPMCANONARCH=ppc ;;
diff -ur rpm-3.0.4-orig/rpmrc.in rpm-3.0.4/rpmrc.in
--- rpm-3.0.4-orig/rpmrc.in Tue Feb 29 15:22:44 2000
+++ rpm-3.0.4/rpmrc.in Thu Apr 27 11:47:31 2000
@@ -7,7 +7,11 @@
#############################################################
# Values for RPM_OPT_FLAGS for various platforms
-optflags: i386 -O2 -m486 -fno-strength-reduce
+optflags: i386 -O2
+optflags: i486 -O2 -m486 -fno-strength-reduce
+optflags: i586 -O2 -march=pentium -fno-strength-reduce
+optflags: i686 -O2 -march=pentiumpro -fno-strength-reduce
+optflags: ix86 -O2 -fno-strength-reduce
optflags: alpha -O2
optflags: sparc -O2
optflags: sparcv9 -O2 -mv8 -mtune=ultrasparc
@@ -115,12 +119,12 @@
buildarchtranslate: osfmach3_i486: i386
buildarchtranslate: osfmach3_i386: i386
-buildarchtranslate: i986: i386
-buildarchtranslate: i886: i386
-buildarchtranslate: i786: i386
-buildarchtranslate: i686: i386
-buildarchtranslate: i586: i386
-buildarchtranslate: i486: i386
+buildarchtranslate: i986: i686
+buildarchtranslate: i886: i686
+buildarchtranslate: i786: i686
+buildarchtranslate: i686: i686
+buildarchtranslate: i586: i586
+buildarchtranslate: i486: i486
buildarchtranslate: i386: i386
buildarchtranslate: osfmach3_ppc: ppc
--- SPECS/rpm.spec Wed Mar 1 09:28:37 2000
+++ /usr/local/data/rpm.spec Thu Apr 27 23:53:00 2000
@@ -5,6 +5,7 @@
Release: 0.48
Group: System Environment/Base
Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/rpm-%{version}.tar.gz
+Patch1: rpm-3.0.4-i686.patch
Copyright: GPL
Conflicts: patch < 2.5
%ifos linux
@@ -84,12 +85,13 @@
%prep
%setup -q
+%patch1 -p1
%build
CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr
-make
+CFLAGS="$RPM_OPT_FLAGS" make
%ifos linux
-make -C python
+CFLAGS="$RPM_OPT_FLAGS" make -C python
%endif
%install
