Attachment #601 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) SUBSTS='s_$i[3456]86\\|k6\\|athlon$_i386_ s_$i[3456]86\\|k6\\|athlon$_i486_ s_$i[3456]86\\|k6\\|athlon$_i586_ s_$i[3456]86\\|k6\\|athlon$_i686_ s_$i[3456]86\\|k6\\|athlon$_k6_ s_$i[3456]86\\|k6\\|athlon$_athlon_' ;;	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_' ;;
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_' ;;




}
#endif

static const char *checkCPU( void )
{
	int	fd = open( "/proc/cpuinfo", O_RDONLY );
	if ( !fd )

		read( fd, buffer, sizeof buffer - 1 );
		close( fd );

		if ( strstr( buffer, "AMD" ) ) {
			if ( strstr( buffer, "Athlon" ) || strstr( buffer, "Duron" ) )
				return "athlon";

			if ( strstr( buffer, "K6" ) )
				return "k6";
		}

		if ( strstr( buffer, "Intel" ) ) {
			if ( strstr( buffer, "Pentium(R) 4" ) || strstr( buffer, "Intel(R) Xeon(TM)" ) || strstr( buffer, "Intel(R) XEON(TM)" ) )
				return "pentium4";
		}

		return 0;
	}


	if ( !strcmp( un.machine, "i586" ) || !strcmp( un.machine, "i686" ) )
	{
		const char *cpu = checkCPU();
		if ( cpu )
			strcpy( un.machine, cpu );
	}

#	endif

Lines 812-818 Link Here

(-)rpm-4_0-4.0.4-orig/macros.in (-1 / +1 lines)
812	# rpm can use regular expressions against target platforms in macro	812	# rpm can use regular expressions against target platforms in macro
813	# conditionals.	813	# conditionals.
814	#	814	#
815	%intel i386 i486 i586 i686 i786 i886 i986	815	%intel i386 i486 i586 i686 i786 i886 i986 pentium4
816	%amd k6 athlon	816	%amd k6 athlon
817	%ix86 %intel %amd	817	%ix86 %intel %amd
818		818

Lines 140-146 Link Here

(-)rpm-4_0-4.0.4-orig/Makefile.am (-1 / +2 lines)
140	$(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/i486 ;\	140	$(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/i486 ;\
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/pentium4 ;;\
144	alpha*) $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/alpha ;\	145	alpha*) $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/alpha ;\
145	$(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/alphaev6 ;;\	146	$(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/alphaev6 ;;\
146	sparc*) $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/sparc ;\	147	sparc*) $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/sparc ;\




optflags: i686 %optflags_default -march=i686
optflags: k6 %optflags_default -march=k6
optflags: athlon %optflags_default -march=athlon
optflags: pentium4 %optflags_default -march=pentium4
optflags: ia64 %optflags_default

# XXX Please note that -mieee has been added in rpm-3.0.5.

#############################################################
# Canonical arch names and numbers

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


buildarchtranslate: ia64: ia64

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

arch_compat: alphaev5: alpha
arch_compat: alpha: axp noarch

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


buildarch_compat: ia64: noarch

buildarch_compat: pentium4: i686
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	358	%ifarch i386 i486 i586 i686 athlon 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/pentium4*
361	%endif	362	%endif
362	%ifarch alpha alphaev5 alphaev56 alphapca56 alphaev6 alphaev67	363	%ifarch alpha alphaev5 alphaev56 alphapca56 alphaev6 alphaev67
363	%attr(-, @RPMUSER@, @RPMGROUP@) %{__prefix}/lib/rpm/alpha*	364	%attr(-, @RPMUSER@, @RPMGROUP@) %{__prefix}/lib/rpm/alpha*

Return to bug 5259

Lines 1031-1037 Link Here

(-)rpm-4_0-4.0.4-orig/lib/rpmrc.c (-10 / +14 lines)
1031	}	1031	}
1032	#endif	1032	#endif
1033		1033
1034	static const char *checkAMD( void )	1034	static const char *checkCPU( void )
1035	{	1035	{
1036	int fd = open( "/proc/cpuinfo", O_RDONLY );	1036	int fd = open( "/proc/cpuinfo", O_RDONLY );
1037	if ( !fd )	1037	if ( !fd )
Lines 1044-1057 Link Here
1044	read( fd, buffer, sizeof buffer - 1 );	1044	read( fd, buffer, sizeof buffer - 1 );
1045	close( fd );	1045	close( fd );
1046		1046
1047	if ( !strstr( buffer, "AMD" ) )	1047	if ( strstr( buffer, "AMD" ) ) {
1048	return 0;	1048	if ( strstr( buffer, "Athlon" ) \|\| strstr( buffer, "Duron" ) )
		1049	return "athlon";
1049		1050
1050	if ( strstr( buffer, "Athlon" ) \|\| strstr( buffer, "Duron" ) )	1051	if ( strstr( buffer, "K6" ) )
1051	return "athlon";	1052	return "k6";
		1053	}
1052		1054
1053	if ( strstr( buffer, "K6" ) )	1055	if ( strstr( buffer, "Intel" ) ) {
1054	return "k6";	1056	if ( strstr( buffer, "Pentium(R) 4" ) \|\| strstr( buffer, "Intel(R) Xeon(TM)" ) \|\| strstr( buffer, "Intel(R) XEON(TM)" ) )
		1057	return "pentium4";
		1058	}
1055		1059
1056	return 0;	1060	return 0;
1057	}	1061	}
Lines 1290-1298 Link Here
1290		1294
1291	if ( !strcmp( un.machine, "i586" ) \|\| !strcmp( un.machine, "i686" ) )	1295	if ( !strcmp( un.machine, "i586" ) \|\| !strcmp( un.machine, "i686" ) )
1292	{	1296	{
1293	const char *amd = checkAMD();	1297	const char *cpu = checkCPU();
1294	if ( amd )	1298	if ( cpu )
1295	strcpy( un.machine, amd );	1299	strcpy( un.machine, cpu );
1296	}	1300	}
1297		1301
1298	# endif	1302	# endif

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: pentium4 %optflags_default -march=pentium4
20	optflags: ia64 %optflags_default	21	optflags: ia64 %optflags_default
21		22
22	# XXX Please note that -mieee has been added in rpm-3.0.5.	23	# XXX Please note that -mieee has been added in rpm-3.0.5.
Lines 67-72 Link Here
67	#############################################################	68	#############################################################
68	# Canonical arch names and numbers	69	# Canonical arch names and numbers
69		70
		71	arch_canon: pentium4: pentium4 1
70	arch_canon: athlon: athlon 1	72	arch_canon: athlon: athlon 1
71	arch_canon: i686: i686 1	73	arch_canon: i686: i686 1
72	arch_canon: k6: k6 1	74	arch_canon: k6: k6 1
Lines 164-169 Link Here
164		166
165	buildarchtranslate: ia64: ia64	167	buildarchtranslate: ia64: ia64
166		168
		169	buildarchtranslate: pentium4: pentium4
167	buildarchtranslate: athlon: athlon	170	buildarchtranslate: athlon: athlon
168	buildarchtranslate: i686: i686	171	buildarchtranslate: i686: i686
169	buildarchtranslate: k6: k6	172	buildarchtranslate: k6: k6
Lines 210-215 Link Here
210	arch_compat: alphaev5: alpha	213	arch_compat: alphaev5: alpha
211	arch_compat: alpha: axp noarch	214	arch_compat: alpha: axp noarch
212		215
		216	arch_compat: pentium4: i686
213	arch_compat: athlon: i686 k6	217	arch_compat: athlon: i686 k6
214	arch_compat: i686: i586	218	arch_compat: i686: i586
215	arch_compat: k6: i586	219	arch_compat: k6: i586
Lines 297-302 Link Here
297		301
298	buildarch_compat: ia64: noarch	302	buildarch_compat: ia64: noarch
299		303
		304	buildarch_compat: pentium4: i686
300	buildarch_compat: athlon: i686 k6	305	buildarch_compat: athlon: i686 k6
301	buildarch_compat: i686: i586	306	buildarch_compat: i686: i586
302	buildarch_compat: k6: i586	307	buildarch_compat: k6: i586