Em Wed, Dec 16, 2015 at 07:09:53PM -0600, Josh Poimboeuf escreveu: > On Wed, Dec 16, 2015 at 09:57:41PM -0300, Arnaldo Carvalho de Melo wrote: > > Em Tue, Dec 15, 2015 at 09:39:38AM -0600, Josh Poimboeuf escreveu: > > > For the files that will be moved to the subcmd library, remove all their > > > perf-specific includes and duplicate any needed functionality. > > > > Breaks rhel6.7 building: > > > > > > > > +typedef uint64_t u64; > > > + > > > > > > [acme@sandy linux]$ cat /etc/redhat-release > > Red Hat Enterprise Linux Server release 6.7 (Santiago) > > > > CC /tmp/build/perf/parse-options.o > > parse-options.c:15: error: redefinition of typedef ‘u64’ > > /home/acme/git/linux/tools/include/linux/types.h:28: note: previous > > declaration of ‘u64’ was here > > mv: cannot stat `/tmp/build/perf/.parse-options.o.tmp': No such file or > > directory > > make[3]: *** [/tmp/build/perf/parse-options.o] Error 1 > > make[2]: *** [/tmp/build/perf/libsubcmd-in.o] Error 2 > > make[1]: *** [/tmp/build/perf/libsubcmd.a] Error 2 > > make[1]: *** Waiting for unfinished jobs.... > > MKDIR /tmp/build/perf/util/ > > Does this fix it?
Yes, and it continues to build on fedora 21. - Arnaldo > ---8<--- > > diff --git a/tools/lib/subcmd/parse-options.c > b/tools/lib/subcmd/parse-options.c > index f424027..981bb44 100644 > --- a/tools/lib/subcmd/parse-options.c > +++ b/tools/lib/subcmd/parse-options.c > @@ -1,4 +1,5 @@ > #include <linux/compiler.h> > +#include <linux/types.h> > #include <stdio.h> > #include <stdlib.h> > #include <stdint.h> > @@ -12,8 +13,6 @@ > #define OPT_SHORT 1 > #define OPT_UNSET 2 > > -typedef uint64_t u64; > - > char *error_buf; > > static int opterror(const struct option *opt, const char *reason, int flags) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
