Re: [PATCH] Make utilites buildable on modern Linux distro (RHEL-7).
Bryce Harrington <[email protected]>
| Newsgroups | gmane.comp.lib.cairo |
|---|---|
| Message-ID | <[email protected]> |
On Tue, Feb 24, 2015 at 01:18:09AM -0800, Bryce Harrington wrote: > On Fri, Feb 20, 2015 at 04:38:00PM +0100, Matěj Cepl wrote: > > Signed-off-by: Matěj Cepl <[email protected]> > > --- > > Makefile | 4 ++-- > > csi-trace.c | 1 + > > 2 files changed, 3 insertions(+), 2 deletions(-) > > > > diff --git a/Makefile b/Makefile > > index e8f8b6b..22d7396 100644 > > --- a/Makefile > > +++ b/Makefile > > @@ -12,9 +12,9 @@ benchmarks: $(QUICK_LZMA:.lzma=.trace) > > lzma -cd $< | ./csi-bind > $@ > > > > csi-bind: csi-bind.c > > - $(CC) $(CFLAGS) $(shell pkg-config cairo --cflags) $^ $(shell pkg-config cairo --libs) -lcairo-script-interpreter -o $@ > > + $(CC) $(CFLAGS) $(shell pkg-config cairo pixman-1 --cflags) $^ $(shell pkg-config cairo pixman-1 --libs) -lcairo-script-interpreter -o $@ > > csi-trace: csi-trace.c > > - $(CC) $(CFLAGS) $(shell pkg-config cairo --cflags) $^ $(shell pkg-config cairo --libs) -lcairo-script-interpreter -o $@ > > + $(CC) $(CFLAGS) $(shell pkg-config cairo pixman-1 --cflags) $^ $(shell pkg-config cairo pixman-1 --libs) -lm -lcairo-script-interpreter -o $@ > > > > ########################################################## > > # Some targets to make and upload a snapshot of the traces > > diff --git a/csi-trace.c b/csi-trace.c > > index ea4f1e9..0e6a05b 100644 > > --- a/csi-trace.c > > +++ b/csi-trace.c > > @@ -3,6 +3,7 @@ > > > > #include <stdio.h> > > #include <stdlib.h> > > +#include <string.h> > > #include <math.h> > > #include <setjmp.h> > > #include <time.h> > > -- > > 1.8.3.1 > > LGTM, so: > > Reviewed-by: Bryce Harrington <[email protected]> > > If no one raises issues, I can land this patch. Alrighty, applied: 147fbe4..0a3b59b master -> master Personally for cairo-trace, I think csi-trace and csi-bind should be used from the master trunk instead of having their own copies. They're already starting to diverge a bit. Then cairo-trace could become a data-only repository and not need a build system at all, which would be nice. I think a new filetype would need to be established for the compressed traces, though. Bryce -- cairo mailing list [email protected] http://lists.cairographics.org/mailman/listinfo/cairo