Attachment #602 for bug #5259

View | Details | Raw Unified | Return to bug 5259
Collapse All | Expand All

Lines 35-41 Link Here

(-)rpm-4_0-4.0.4-orig/installplatform (-1 / +1 lines)
35	ln -s ${arch}-${VENDOR}-${OS} ${DESTDIR}/${pkglibdir}/noarch-${OS}	35	ln -s ${arch}-${VENDOR}-${OS} ${DESTDIR}/${pkglibdir}/noarch-${OS}
36		36
37	case "$arch" in	37	case "$arch" in
38	i[3456]86\|k6\|athlon\|pentium4) SUBSTS='s_$i[3456]86\\|k6\\|athlon\\|pentium4$_i386_ s_$i[3456]86\\|k6\\|athlon\\|pentium4$_i486_ s_$i[3456]86\\|k6\\|athlon\\|pentium4$_i586_ s_$i[3456]86\\|k6\\|athlon\\|pentium4$_i686_ s_$i[3456]86\\|k6\\|athlon\\|pentium4$_k6_ s_$i[3456]86\\|k6\\|athlon\\|pentium4$_athlon_ s_$i[3456]86\\|k6\\|athlon\\|pentium4$_pentium4_' ;;	38	i[3456]86\|k6\|athlon\|pentium4) SUBSTS='s_$i[3456]86\\|k6\\|athlon\\|athlonxp\\|pentium4$_i386_ s_$i[3456]86\\|k6\\|athlon\\|athlonxp\\|pentium4$_i486_ s_$i[3456]86\\|k6\\|athlon\\|athlonxp\\|pentium4$_i586_ s_$i[3456]86\\|k6\\|athlon\\|athlonxp\\|pentium4$_i686_ s_$i[3456]86\\|k6\\|athlon\\|athlonxp\\|pentium4$_k6_ s_$i[3456]86\\|k6\\|athlon\\|athlonxp\\|pentium4$_athlon_ s_$i[3456]86\\|k6\\|athlon\\|athlonxp\\|pentium4$_athlonxp_ s_$i[3456]86\\|k6\\|athlon\\|athlonxp\\|pentium4$_pentium4_' ;;
39	alpha*) SUBSTS='s_alpha_alpha_ s_alpha_alphaev5_ s_alpha_alphaev56_ s_alpha_alphapca56_ s_alpha_alphaev6_ s_alpha_alphaev67_' ;;	39	alpha*) SUBSTS='s_alpha_alpha_ s_alpha_alphaev5_ s_alpha_alphaev56_ s_alpha_alphapca56_ s_alpha_alphaev6_ s_alpha_alphaev67_' ;;
40	sparc*) SUBSTS='s_sparc$64\\|v9$_sparc_ s_sparc64_sparcv9_;s_sparc$[^v]\\|$$_sparcv9\1_ s_sparcv9_sparc64_;s_sparc$[^6]\\|$$_sparc64\1_' ;;	40	sparc*) SUBSTS='s_sparc$64\\|v9$_sparc_ s_sparc64_sparcv9_;s_sparc$[^v]\\|$$_sparcv9\1_ s_sparcv9_sparc64_;s_sparc$[^6]\\|$$_sparc64\1_' ;;
41	powerpc\|ppc) SUBSTS='s_ppc64_ppc_ s_ppc$[^6]\\|$$_ppc64\1_' ;;	41	powerpc\|ppc) SUBSTS='s_ppc64_ppc_ s_ppc$[^6]\\|$$_ppc64\1_' ;;

Lines 1045-1050 Link Here

(-)rpm-4_0-4.0.4-orig/lib/rpmrc.c (+3 lines)
1045	close( fd );	1045	close( fd );
1046		1046
1047	if ( strstr( buffer, "AMD" ) ) {	1047	if ( strstr( buffer, "AMD" ) ) {
		1048	if ( strstr( buffer, "Athlon(tm) XP" ) )
		1049	return "athlonxp";
		1050
1048	if ( strstr( buffer, "Athlon" ) \|\| strstr( buffer, "Duron" ) )	1051	if ( strstr( buffer, "Athlon" ) \|\| strstr( buffer, "Duron" ) )
1049	return "athlon";	1052	return "athlon";
1050		1053

Lines 813-819 Link Here

(-)rpm-4_0-4.0.4-orig/macros.in (-1 / +1 lines)
813	# conditionals.	813	# conditionals.
814	#	814	#
815	%intel i386 i486 i586 i686 i786 i886 i986 pentium4	815	%intel i386 i486 i586 i686 i786 i886 i986 pentium4
816	%amd k6 athlon	816	%amd k6 athlon athlonxp
817	%ix86 %intel %amd	817	%ix86 %intel %amd
818		818
819	#------------------------------------------------------------------------	819	#------------------------------------------------------------------------

Lines 141-146 Link Here

(-)rpm-4_0-4.0.4-orig/Makefile.am (+1 lines)
141	$(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/i586 ;\	141	$(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/i586 ;\
142	$(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/i686 ;\	142	$(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/i686 ;\
143	$(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/athlon ;\	143	$(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/athlon ;\
		144	$(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/athlonxp ;\
144	$(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/pentium4 ;;\	145	$(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/pentium4 ;;\
145	alpha*) $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/alpha ;\	146	alpha*) $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/alpha ;\
146	$(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/alphaev6 ;;\	147	$(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/alphaev6 ;;\




optflags: i686 %optflags_default -march=i686
optflags: k6 %optflags_default -march=k6
optflags: athlon %optflags_default -march=athlon
optflags: athlonxp %optflags_default -march=athlon-xp -mcpu=athlon-xp -msse -m3dnow -mmmx -mfpmath=sse
optflags: pentium4 %optflags_default -march=pentium4
optflags: ia64 %optflags_default


# Canonical arch names and numbers

arch_canon:	pentium4:	pentium4	1
arch_canon:	athlonxp:	athlonxp	1
arch_canon:	athlon:	athlon	1
arch_canon:	i686:	i686	1
arch_canon:	k6:	k6	1

buildarchtranslate: ia64: ia64

buildarchtranslate: pentium4: pentium4
buildarchtranslate: athlonxp: athlonxp
buildarchtranslate: athlon: athlon
buildarchtranslate: i686: i686
buildarchtranslate: k6: k6

arch_compat: alpha: axp noarch

arch_compat: pentium4: i686
arch_compat: athlonxp: athlon
arch_compat: athlon: i686 k6
arch_compat: i686: i586
arch_compat: k6: i586

buildarch_compat: ia64: noarch

buildarch_compat: pentium4: i686
buildarch_compat: athlonxp: athlon
buildarch_compat: athlon: i686 k6
buildarch_compat: i686: i586
buildarch_compat: k6: i586

Lines 355-363 Link Here

(-)rpm-4_0-4.0.4-orig/rpm.spec.in (-1 / +2 lines)
355	%attr(0644, @RPMUSER@, @RPMGROUP@) %{__prefix}/lib/rpm/rpmpopt*	355	%attr(0644, @RPMUSER@, @RPMGROUP@) %{__prefix}/lib/rpm/rpmpopt*
356	%attr(0644, @RPMUSER@, @RPMGROUP@) %{__prefix}/lib/rpm/rpmrc	356	%attr(0644, @RPMUSER@, @RPMGROUP@) %{__prefix}/lib/rpm/rpmrc
357		357
358	%ifarch i386 i486 i586 i686 athlon pentium4	358	%ifarch i386 i486 i586 i686 athlon athlonxp pentium4
359	%attr(-, @RPMUSER@, @RPMGROUP@) %{__prefix}/lib/rpm/i[3456]86*	359	%attr(-, @RPMUSER@, @RPMGROUP@) %{__prefix}/lib/rpm/i[3456]86*
360	%attr(-, @RPMUSER@, @RPMGROUP@) %{__prefix}/lib/rpm/athlon*	360	%attr(-, @RPMUSER@, @RPMGROUP@) %{__prefix}/lib/rpm/athlon*
		361	%attr(-, @RPMUSER@, @RPMGROUP@) %{__prefix}/lib/rpm/athlonxp*
361	%attr(-, @RPMUSER@, @RPMGROUP@) %{__prefix}/lib/rpm/pentium4*	362	%attr(-, @RPMUSER@, @RPMGROUP@) %{__prefix}/lib/rpm/pentium4*
362	%endif	363	%endif
363	%ifarch alpha alphaev5 alphaev56 alphapca56 alphaev6 alphaev67	364	%ifarch alpha alphaev5 alphaev56 alphapca56 alphaev6 alphaev67

Return to bug 5259

Lines 17-22 Link Here

(-)rpm-4_0-4.0.4-orig/rpmrc.in (+5 lines)
17	optflags: i686 %optflags_default -march=i686	17	optflags: i686 %optflags_default -march=i686
18	optflags: k6 %optflags_default -march=k6	18	optflags: k6 %optflags_default -march=k6
19	optflags: athlon %optflags_default -march=athlon	19	optflags: athlon %optflags_default -march=athlon
		20	optflags: athlonxp %optflags_default -march=athlon-xp -mcpu=athlon-xp -msse -m3dnow -mmmx -mfpmath=sse
20	optflags: pentium4 %optflags_default -march=pentium4	21	optflags: pentium4 %optflags_default -march=pentium4
21	optflags: ia64 %optflags_default	22	optflags: ia64 %optflags_default
22		23
Lines 69-74 Link Here
69	# Canonical arch names and numbers	70	# Canonical arch names and numbers
70		71
71	arch_canon: pentium4: pentium4 1	72	arch_canon: pentium4: pentium4 1
		73	arch_canon: athlonxp: athlonxp 1
72	arch_canon: athlon: athlon 1	74	arch_canon: athlon: athlon 1
73	arch_canon: i686: i686 1	75	arch_canon: i686: i686 1
74	arch_canon: k6: k6 1	76	arch_canon: k6: k6 1
Lines 167-172 Link Here
167	buildarchtranslate: ia64: ia64	169	buildarchtranslate: ia64: ia64
168		170
169	buildarchtranslate: pentium4: pentium4	171	buildarchtranslate: pentium4: pentium4
		172	buildarchtranslate: athlonxp: athlonxp
170	buildarchtranslate: athlon: athlon	173	buildarchtranslate: athlon: athlon
171	buildarchtranslate: i686: i686	174	buildarchtranslate: i686: i686
172	buildarchtranslate: k6: k6	175	buildarchtranslate: k6: k6
Lines 214-219 Link Here
214	arch_compat: alpha: axp noarch	217	arch_compat: alpha: axp noarch
215		218
216	arch_compat: pentium4: i686	219	arch_compat: pentium4: i686
		220	arch_compat: athlonxp: athlon
217	arch_compat: athlon: i686 k6	221	arch_compat: athlon: i686 k6
218	arch_compat: i686: i586	222	arch_compat: i686: i586
219	arch_compat: k6: i586	223	arch_compat: k6: i586
Lines 302-307 Link Here
302	buildarch_compat: ia64: noarch	306	buildarch_compat: ia64: noarch
303		307
304	buildarch_compat: pentium4: i686	308	buildarch_compat: pentium4: i686
		309	buildarch_compat: athlonxp: athlon
305	buildarch_compat: athlon: i686 k6	310	buildarch_compat: athlon: i686 k6
306	buildarch_compat: i686: i586	311	buildarch_compat: i686: i586
307	buildarch_compat: k6: i586	312	buildarch_compat: k6: i586