[Fontconfig] fontconfig: Branch 'master' - 23 commits

[Behdad Esfahbod]

On 13-01-02 06:40 PM, Raimund Steger wrote:
> Hi,
> just tried building the new head.

Thanks.

> Behdad Esfahbod wrote:
>> diff --git a/src/fcatomic.h b/src/fcatomic.h
>> [...]
>> +#define FC_ATOMIC_INT_NIL 1 /* Warn that fallback implementation is in use. */
>> +typedef volatile int fc_atomic_int_t;
>> +#define fc_atomic_int_add(AI, V)    (((AI) += (V)) - (V))
>> +
>> +#define fc_atomic_ptr_get(P)        ((void *) *(P))
>> +#define fc_atomic_ptr_cmpexch(P,O,N)    (* (void * volatile *) (P) == (void
>> *) (O) ? (* (void * volatile *) (P) = (void *) (N), true) : false)
>> +
>> +
>> +#else /* FC_NO_MT */
>> +
>> +typedef int fc_atomic_int_t;
>> +#define fc_atomic_int_add(AI, V)    (((AI) += (V)) - (V))
>> +
>> +#define fc_atomic_ptr_get(P)        ((void *) *(P))
>> +#define fc_atomic_ptr_cmpexch(P,O,N)    (* (void **) (P) == (void *) (O) ?
>> (* (void **) (P) = (void *) (N), true) : false)
> 
> These give me problems with Sun Studio and older GCC (3.4.3) on Solaris x86
> and SPARC, which ./configure does not define HAVE_INTEL_ATOMIC_PRIMITIVES for:

Right.  Will replace with FcTrue, FcFalse.



>> [...]
>> diff --git a/src/Makefile.am b/src/Makefile.am
>> index dc082b7..57c34a2 100644
>> [...]
>> +fcobjshash.gperf: fcobjshash.gperf.h fcobjs.h
>> +    $(AM_V_GEN) $(CPP) -I$(top_srcdir) $< | $(GREP) '^[^#]' | awk ' \
>> +    /CUT_OUT_BEGIN/ { no_write=1; next; }; \
>> +    /CUT_OUT_END/ { no_write=0; next; }; \
>> +    { if (!no_write) print; next; }; \
>> +    ' - > $@.tmp && \
>> +    mv -f $@.tmp $@
> 
> Sun Studio CPP seems to insert whitespace in a different way than GCC's CPP.

Ouch!


> ...maybe we could tuck in an additional sed to remove the whitespace, like:

Will do.


> Also, 'make distclean'/'make clean' don't seem to remove src/fcobjshash.gperf.

That's by design, since those files are in EXTRA_DIST.  Tarball users won't
have to deal with gperf.

> Will do some more testing in the next couple of days.

Thanks again.  Your testing and input is much appreciated.

behdad


> Raimund
> 
> 

-- 
behdad
http://behdad.org/