[prev in list] [next in list] [prev in thread] [next in thread] 

List:       rpm-devel
Subject:    Re: [CVS] RPM: rpm/ CHANGES rpm/lib/ rpmrc.c
From:       Jeff Johnson <n3npq () mac ! com>
Date:       2009-02-15 12:51:33
Message-ID: 48CE2339-EC6A-4A27-9135-29AC67A06C75 () mac ! com
[Download RAW message or body]

Put the libcpuinfo development under a #ifdef please. I'd suggest

	#define SUPPORT_LIBCPUINFO

AutoFu tests for HAVE_CPUINFO_H assume released code, which
just isn't close to being the case for your libcuinfo library yet.

See the end of "system.h" for several other wild implementations,
like AR payloads, that are no place close to being useful yet, or
perhaps ever.

I also question the usefulness of linking -lcpuinfo. You really
need to write up what is intended, not just whack in the code.

73 de Jeff


On Feb 14, 2009, at 7:31 PM, Per �yvind Karlsen wrote:

>  RPM Package Manager, CVS Repository
>  http://rpm5.org/cvs/
>   
> ____________________________________________________________________________
>
>  Server: rpm5.org                         Name:   Per �yvind Karlsen
>  Root:   /v/rpm/cvs                       Email:  pkarlsen@rpm5.org
>  Module: rpm                              Date:   15-Feb-2009 01:31:37
>  Branch: HEAD                             Handle: 2009021500313601
>
>  Modified files:
>    rpm                     CHANGES
>    rpm/lib                 rpmrc.c
>
>  Log:
>    add initial support for detecting automatically detecting  
> architecture through
>    libcpuinfo. (more work needed!)
>
>  Summary:
>    Revision    Changes     Path
>    1.2774      +2  -0      rpm/CHANGES
>    2.250       +92 -0      rpm/lib/rpmrc.c
>   
> ____________________________________________________________________________
>
>  patch -p0 <<'@@ .'
>  Index: rpm/CHANGES
>   
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
>  $ cvs diff -u -r1.2773 -r1.2774 CHANGES
>  --- rpm/CHANGES	11 Feb 2009 16:59:28 -0000	1.2773
>  +++ rpm/CHANGES	15 Feb 2009 00:31:36 -0000	1.2774
>  @@ -1,5 +1,7 @@
>
>   5.2a2 -> 5.2a3:
>  +    - proyvind: add initial support for detecting automatically  
> detecting
>  +	architecture through libcpuinfo.
>       - jbj: stub-in /usr/lib/rpm/helpers/makeshlibs proof-of-concept.
>       - proyvind: add %mips & %mipsx macros for mips archictecture.
>       - jbj: add rpmdsNSType() to -lrpm loader map.
>  @@ .
>  patch -p0 <<'@@ .'
>  Index: rpm/lib/rpmrc.c
>   
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
>  $ cvs diff -u -r2.249 -r2.250 rpmrc.c
>  --- rpm/lib/rpmrc.c	9 Nov 2008 13:58:16 -0000	2.249
>  +++ rpm/lib/rpmrc.c	15 Feb 2009 00:31:37 -0000	2.250
>  @@ -8,6 +8,10 @@
>   #define __power_pc() 0
>   #endif
>
>  +#if defined(HAVE_CPUINFO_H)
>  +#include <cpuinfo.h>
>  +#endif
>  +
>   #define	_RPMIOB_INTERNAL	/* XXX for rpmiobSlurp */
>   #include <rpmio.h>
>   #include <rpmcb.h>
>  @@ -498,6 +502,92 @@
>   }
>   /*@=onlytrans@*/
>
>  +#if defined(HAVE_CPUINFO_H)
>  +static rpmRC rpmCpuinfo(void)
>  +{
>  +    rpmRC rc = RPMRC_FAIL;
>  +    static struct utsname un;
>  +    const char *cpu;
>  +    miRE mi_re = NULL;
>  +    int mi_nre = 0;
>  +    int xx;
>  +    CVOG_t cvog = NULL;
>  +    uname(&un);
>  +    cpuinfo_t *cip = cpuinfo_new();
>  +
>  +    xx = mireAppend(RPMMIRE_REGEX, 0, "noarch", NULL, &mi_re,  
> &mi_nre);
>  +
>  +#if defined(__i386__) || defined(__x86_64__)
>  +    if(cpuinfo_has_feature(cip, CPUINFO_FEATURE_X86))
>  +	xx = mireAppend(RPMMIRE_REGEX, 0, "i386", NULL, &mi_re, &mi_nre);
>  +    if(cpuinfo_has_feature(cip, CPUINFO_FEATURE_X86_AC))
>  +	xx = mireAppend(RPMMIRE_REGEX, 0, "i486", NULL, &mi_re, &mi_nre);
>  +    if(cpuinfo_has_feature(cip, CPUINFO_FEATURE_X86_TSC))
>  +	xx = mireAppend(RPMMIRE_REGEX, 0, "i586", NULL, &mi_re, &mi_nre);
>  +    if(cpuinfo_get_vendor(cip) == CPUINFO_VENDOR_NSC)
>  +	xx = mireAppend(RPMMIRE_REGEX, 0, "geode", NULL, &mi_re, &mi_nre);
>  +    if(cpuinfo_has_feature(cip, CPUINFO_FEATURE_X86_CMOV))
>  +	xx = mireAppend(RPMMIRE_REGEX, 0, "i686", NULL, &mi_re, &mi_nre);
>  +	if(cpuinfo_has_feature(cip, CPUINFO_FEATURE_X86_MMX))
>  +	    xx = mireAppend(RPMMIRE_REGEX, 0, "pentium2", NULL, &mi_re,  
> &mi_nre);
>  +    if(cpuinfo_get_vendor(cip) == CPUINFO_VENDOR_AMD &&  
> cpuinfo_get_vendor(cip) == CPUINFO_FEATURE_X86_3DNOW_PLUS)
>  +	xx = mireAppend(RPMMIRE_REGEX, 0, "athlon", NULL, &mi_re, &mi_nre);
>  +    if(cpuinfo_has_feature(cip, CPUINFO_FEATURE_X86_SSE))
>  +	xx = mireAppend(RPMMIRE_REGEX, 0, "pentium3", NULL, &mi_re,  
> &mi_nre);
>  +    if(cpuinfo_has_feature(cip, CPUINFO_FEATURE_X86_SSE2))
>  +	xx = mireAppend(RPMMIRE_REGEX, 0, "pentium4", NULL, &mi_re,  
> &mi_nre);
>  +    if(cpuinfo_has_feature(cip, CPUINFO_FEATURE_64BIT) &&  
> strcmp(un.machine, "x86_64") == 0)
>  +	xx = mireAppend(RPMMIRE_REGEX, 0, "x86_64", NULL, &mi_re, &mi_nre);
>  +#endif
>  +
>  +#if defined(__powerpc__)
>  +    if(cpuinfo_has_feature(cip, CPUINFO_FEATURE_PPC))
>  +	xx = mireAppend(RPMMIRE_REGEX, 0, "ppc", NULL, &mi_re, &mi_nre);
>  +	if(cpuinfo_has_feature(cip, CPUINFO_FEATURE_64BIT) &&  
> strcmp(un.machine, "ppc64") == 0)
>  +	    xx = mireAppend(RPMMIRE_REGEX, 0, "ppc64", NULL, &mi_re,  
> &mi_nre);
>  +#endif
>  +
>  +#if defined(__ia64__)
>  +    if(cpuinfo_has_feature(cip, CPUINFO_FEATURE_IA64))
>  +	xx = mireAppend(RPMMIRE_REGEX, 0, "ia64", NULL, &mi_re, &mi_nre);
>  +#endif
>  +
>  +#if defined(__mips__)
>  +#if defined(__MIPSEL__)
>  +#define mips32 "mipsel"
>  +#define mips64 "mips64el"
>  +#elif define(__MIPSEB__)
>  +#define mips32 "mips"
>  +#define mips64 "mips64"
>  +#endif
>  +    if(cpuinfo_has_feature(cip, CPUINFO_FEATURE_MIPS)) {
>  +	xx = mireAppend(RPMMIRE_REGEX, 0, mips32, NULL, &mi_re, &mi_nre);
>  +	if(cpuinfo_has_feature(cip, CPUINFO_FEATURE_64BIT) &&  
> strcmp(un.machine, "mips64") == 0)
>  +	    xx = mireAppend(RPMMIRE_REGEX, 0, mips64, NULL, &mi_re,  
> &mi_nre);
>  +#endif
>  +
>  +    cpuinfo_destroy(cip);
>  +
>  +    cpu = mi_re[mi_nre-1].pattern;
>  +    if(cpu != NULL)
>  +    {
>  +	if (!parseCVOG(cpu, &cvog) && cvog != NULL) {
>  +	    addMacro(NULL, "_host_cpu", NULL, cvog->cpu, -1);
>  +	    addMacro(NULL, "_host_vendor", NULL, cvog->vendor, -1);
>  +	    addMacro(NULL, "_host_os", NULL, cvog->os, -1);
>  +	}
>  +	rc = RPMRC_OK;
>  +	if (rc == RPMRC_OK) {
>  +	    platpat = mireFreeAll(platpat, nplatpat);
>  +	    platpat = mi_re;
>  +	    nplatpat = mi_nre;
>  +	}
>  +
>  +    }
>  +    return rc;
>  +}
>  +#endif
>  +
>   /*@-onlytrans@*/	/* XXX miRE array, not refcounted. */
>   int rpmPlatformScore(const char * platform, void * mi_re, int  
> mi_nre)
>   {
>  @@ -602,6 +692,8 @@
>   	if (cp == NULL || cp[0] == '\0')
>   	    cp = _platform;
>   	if (rpmPlatform(cp) == RPMRC_OK) {
>  +#elif defined(HAVE_CPUINFO_H)
>  +	if (rpmPlatform(_platform) == RPMRC_OK || rpmCpuinfo() ==  
> RPMRC_OK) {
>   #else
>   	if (rpmPlatform(_platform) == RPMRC_OK) {
>   #endif
>  @@ .
> ______________________________________________________________________
> RPM Package Manager                                    http://rpm5.org
> CVS Sources Repository                                rpm-cvs@rpm5.org


["smime.p7s" (smime.p7s)]

0�	*�H��

 �0�

10	+0�	*�H��


 ��0��0� 
�r
�k� ��0
	*�H��


0|10	UDE10U
TC TrustCenter GmbH1%0#UTC TrustCenter Class 1 L1 CA1(0&UTC TrustCenter \
Class 1 L1 CA VI0 081202135405Z
091203135405Z0B10	UUS10UJeff Johnson10	*�H��

	

n3npq@mac.com0�
"0
	*�H��



�
0�

�

Ҭ��1�4�B��~�:*;�˄�r���x���%I��"���^~����2�2��Wń�9�i,���#O))~SC��	`� \
˨������ŕ1i��!�~I5S��)���R���&�Ϥ(�t���uIA��Ј�TO�b�߁���>����f���N���
*5Q�<���1��Rn&��,f�`iR
!�����S~���W���Uz��sB� \
��SN
g�>O�x��>�ɐ���{���F�Mк�

��
�0�
�0��+


��0��0Q+
0�Eh \
ttp://www.trustcenter.de/certservices/cacerts/tc_class1_L1_CA_VI.crt02+
0
�&http \
://ocsp.VI.tcclass1.trustcenter.de0U#0�N�����jk�J�ɻd�K&�0U

�00JU \
C0A0?	*�,



0200+

$http://www.trustcenter.de/guidelines0U

��0U�DL�荺e�9�=�7N�&d?�0TUM0K0I \
G E�Chttp://crl.VI.tcclass1.trustcenter.de/crl/v2/tc_class1_L1_CA_VI.crl03U%,0*+
+
+

 +

�70U0�
n3npq@mac.com0
	*�H��


��c�3�#5@+Nwc��<~3mJ \
2��݉}�ds����OM3��/���cC���åt(:�ӌ��m�x�H�#F?&N^�?��6c"��*-7lu`+x��|��W \
��ʕ��nbg���ҮV���4�H�0��0�8 
��
b��n�rd0 	*�H��


0��10	UDE10UHamburg10UHamburg1:08U
1TC TrustCenter for Security in Data Networks GmbH1"0 UTC TrustCenter Class 1 \
CA1)0'	*�H�� 
	
certificate@trustcenter.de0
080718113854Z
101231225959Z0|10	UDE10U
TC TrustCenter GmbH1%0#UTC TrustCenter Class 1 L1 CA1(0&UTC TrustCenter \
Class 1 L1 CA VI0��0 	*�H��



��0�����?N��~�������ݤ㰾(��ݙ�uLα����lK�
%8H���
�������~uH@MNC�m]��9�����X�q
K1~��_���݄����V�f�k(�Ѣ�z��aW�0�0'
@�

��0�0��+


��00L+
0�@http://www.trustcenter.de/certservices/ \
cacerts/tc_class_1_ca.crt0/+
0
�#http://ocsp.tcclass1.trustcenter.de0U

�0

�0JU \
C0A0?	*�,



0200+

$http://www.trustcenter.de/guidelines0U

�
�0UN�����jk�J�ɻd�K&�0��U��0��0�� \
�� �؆;http://crl.tcclass1.trustcenter.de/crl/v2/tc_class_1_ca.crl���ldap://www.trustc \
enter.de/CN=TC%20TrustCenter%20Class%201%20CA,O=TC%20TrustCenter%20AG,ou=rootcerts,dc=trustcenter,dc=de?certificateRevocationList?base?0
 	*�H��


��n��g��,���<H[<K��B���������*8���ُ˰y���}��e�-p���T-�
���)���:m�nz��q�/��eJ̄t�Z�մ�w"D˴W\&8�
k���T.W��Ǝ|W[�3��0�(0� \

�0 	*�H��


0y10U
Root CA10Uhttp://www.cacert.org1"0 UCA Cert Signing \
Authority1!0	*�H�� 
	
support@cacert.org0
070806160927Z
090805160927Z0810UCAcert WoT User10	*�H��

	

n3npq@mac.com0�
"0
	*�H��



�
0�

�

��M��Ǽ�~ar�qC�?j(������Ѝ���.=��
�ܐ[m4��7囵{������H�ǰm�g���k�׼=Fl��F�َ^ \
c9h��ٕ/,��fOcY;i�k��"X���FS	�)�����֟W�:Z���#A�q��W:�_�rIqc�&��Z���Z���A����K���BH
 �o��Y_x��(V���������!zd	AH��DJ���Ad��G�*Q��X�V�r��:�tpM

���0��0U

�00V	`�H
��B

 IGTo get your own certificate for FREE head over to \
http://www.CAcert.org0@U%907+
+
 +

�7

+

�7
	`�H
��B
02+


&0$0"+
0
�http://ocsp.cacert.org0U0�
n3npq@mac.com0
	*�H��


�
�BmC�2�G�$��+��`��?�kdC�
�o��߫'i�Ƭ��'��9\q45�9x��O��S@B=�� \
4�9�ێ�0أ�Z�-��n!�Hrλ�y)gP�mcFk����r�z��G�r1�d3�)��g�"��L�Z��\�b���k�R&h�@[������%����|�����%�@�h�t'�?�Нc�]y4�
J���


�m�
!�ϵ[�4��QB������}bK_���gD�,	��?
w�G���:U�\��X�C\!���}�i�)���7��%7����u�f�mW��]�-���x�|��̭��Q�ć�H�x�N�F%3�z3r����R��>~�c͛y��2��������GL<�n�#����K/�
  �(��_Q���7��n�fr�Ce���j��T \
q$,7��6�I��C�m�@�C�@)H���4{�\Z���X̢T@n�iQ�����jc�N��'�.i���.� +(a
=F(>��O1�B0�>

0��0|10	UDE10U
TC TrustCenter GmbH1%0#UTC TrustCenter Class 1 L1 CA1(0&UTC TrustCenter \
Class 1 L1 CA VI�r
�k� ��0	+ �
�0	*�H�� 
	1	*�H��


0	*�H��

	1
090215125134Z0#	*�H��

	1�(��(:#S[�˖5���0��	+

�71��0��0y10U
Root CA10Uhttp://www.cacert.org1"0 UCA Cert Signing \
Authority1!0	*�H�� 
	
support@cacert.org�0��*�H��

	1�� ��0y10U
Root CA10Uhttp://www.cacert.org1"0 UCA Cert Signing \
Authority1!0	*�H�� 
	
support@cacert.org�0
	*�H��



�
;�	�������R��-j
 D ~L���T[z?�6g�az5���I���+
�����Oս0�V�y!�F� \
7a%:��"y�ݗVm�/�(\���'���oz��۩��c���/� \
/��Z���GS���Cmj����N����o���v�i���2�ur��	�{WHa�o4��n� \
�Tm.nR-�Q������oĤk�u�� ����m@�d�Ϙ?!��e����j^�z.�I6�	�����3$����C��� \
Wy�


______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
Developer Communication List                        rpm-devel@rpm5.org

[prev in list] [next in list] [prev in thread] [next in thread]