* Re: [Xenomai] include guard trank/posix/pthread.h
@ 2015-06-22 9:54 Frederik Bayart
2015-06-22 10:26 ` Philippe Gerum
0 siblings, 1 reply; 12+ messages in thread
From: Frederik Bayart @ 2015-06-22 9:54 UTC (permalink / raw)
To: xenomai
On Friday, 19 June 2015, 15:07, Philippe Gerum <rpm@xenomai.org> wrote:
>On 06/19/2015 03:02 PM, Frederik Bayart wrote:
>
>
>
>
>> Hallo,
>> I noticed that both /usr/xenomai/include/trank/trank.h and /usr/xenomai/include/trank/posix/pthread.h share the same include guard (_XENOMAI_TRANK_TRANK_H).Can this be an error ? I use compile flags 'xeno-config --skin=native --cflags' and get compile errors. If I change the include guard of pthread.h to _XENOMAI_TRANK_POSIX_PTHREAD_H, the problem seems to be solved.In attachment a diff with my changes.
>> Frederik
>>
>
>Yes, the guard is definitely wrong, will fix. Thanks for pointing this out.
>
>--
>Philippe.
In the same context : to make it compile, I had to add
/usr/xenomai/include/trank/posix to
$(shell xeno-config --skin=native --cflags).
At the moment -I/usr/xenomai/include/trank -D__XENO_COMPAT__
-I/usr/xenomai/include/cobalt -I/usr/xenomai/include -D_GNU_SOURCE
-D_REENTRANT -D__COBALT__ -I/usr/xenomai/include/alchemy
is returned.
If this is the correct solution, I can prepare a patch for
xeno-config if desired.
Frederik
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [Xenomai] include guard trank/posix/pthread.h 2015-06-22 9:54 [Xenomai] include guard trank/posix/pthread.h Frederik Bayart @ 2015-06-22 10:26 ` Philippe Gerum 2015-06-22 12:48 ` Philippe Gerum 0 siblings, 1 reply; 12+ messages in thread From: Philippe Gerum @ 2015-06-22 10:26 UTC (permalink / raw) To: Frederik Bayart, xenomai On 06/22/2015 11:54 AM, Frederik Bayart wrote: > > > > On Friday, 19 June 2015, 15:07, Philippe Gerum <rpm@xenomai.org> wrote: >> On 06/19/2015 03:02 PM, Frederik Bayart wrote: >> >> >> >> >>> Hallo, >>> I noticed that both /usr/xenomai/include/trank/trank.h and /usr/xenomai/include/trank/posix/pthread.h share the same include guard (_XENOMAI_TRANK_TRANK_H).Can this be an error ? I use compile flags 'xeno-config --skin=native --cflags' and get compile errors. If I change the include guard of pthread.h to _XENOMAI_TRANK_POSIX_PTHREAD_H, the problem seems to be solved.In attachment a diff with my changes. >>> Frederik >>> >> >> Yes, the guard is definitely wrong, will fix. Thanks for pointing this out. >> >> -- >> Philippe. > > In the same context : to make it compile, I had to add > /usr/xenomai/include/trank/posix to > $(shell xeno-config --skin=native --cflags). > At the moment -I/usr/xenomai/include/trank -D__XENO_COMPAT__ > -I/usr/xenomai/include/cobalt -I/usr/xenomai/include -D_GNU_SOURCE > -D_REENTRANT -D__COBALT__ -I/usr/xenomai/include/alchemy > is returned. > > If this is the correct solution, I can prepare a patch for > xeno-config if desired. > Please do. You seem to be combining the legacy native API and the POSIX interface, which is fine, but would require --native --posix to be passed to xeno-config if so. -- Philippe. ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Xenomai] include guard trank/posix/pthread.h 2015-06-22 10:26 ` Philippe Gerum @ 2015-06-22 12:48 ` Philippe Gerum 2015-06-22 13:41 ` Frederik Bayart 0 siblings, 1 reply; 12+ messages in thread From: Philippe Gerum @ 2015-06-22 12:48 UTC (permalink / raw) To: Frederik Bayart, xenomai On 06/22/2015 12:26 PM, Philippe Gerum wrote: > On 06/22/2015 11:54 AM, Frederik Bayart wrote: >> >> >> >> On Friday, 19 June 2015, 15:07, Philippe Gerum <rpm@xenomai.org> wrote: >>> On 06/19/2015 03:02 PM, Frederik Bayart wrote: >>> >>> >>> >>> >>>> Hallo, >>>> I noticed that both /usr/xenomai/include/trank/trank.h and /usr/xenomai/include/trank/posix/pthread.h share the same include guard (_XENOMAI_TRANK_TRANK_H).Can this be an error ? I use compile flags 'xeno-config --skin=native --cflags' and get compile errors. If I change the include guard of pthread.h to _XENOMAI_TRANK_POSIX_PTHREAD_H, the problem seems to be solved.In attachment a diff with my changes. >>>> Frederik >>>> >>> >>> Yes, the guard is definitely wrong, will fix. Thanks for pointing this out. >>> >>> -- >>> Philippe. >> >> In the same context : to make it compile, I had to add >> /usr/xenomai/include/trank/posix to >> $(shell xeno-config --skin=native --cflags). >> At the moment -I/usr/xenomai/include/trank -D__XENO_COMPAT__ >> -I/usr/xenomai/include/cobalt -I/usr/xenomai/include -D_GNU_SOURCE >> -D_REENTRANT -D__COBALT__ -I/usr/xenomai/include/alchemy >> is returned. >> >> If this is the correct solution, I can prepare a patch for >> xeno-config if desired. >> > > Please do. > -rc5 is ready and I don't want to hold it for too long, so if possible, any feedback regarding this asap would be great. By default, I'll merge the patch below, which should address this issue. diff --git a/scripts/xeno-config-cobalt.in b/scripts/xeno-config-cobalt.in index c6e51d1..7b623db 100644 --- a/scripts/xeno-config-cobalt.in +++ b/scripts/xeno-config-cobalt.in @@ -198,7 +198,10 @@ if test x$do_cflags = xy; then test x$compat = xy && cflags="-I$XENO_INCLUDE_DIR/trank -D__XENO_COMPAT__ $cflags" for skin in $skin_list; do case "$skin" in - posix|cobalt|rtdm) + posix|rtdm) + test x$compat = xy && cflags="$cflags -I$XENO_INCLUDE_DIR/trank/posix" + ;; + cobalt) ;; vxworks|psos|alchemy|smokey) cflags="$cflags -I$XENO_INCLUDE_DIR/$skin" -- Philippe. ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [Xenomai] include guard trank/posix/pthread.h 2015-06-22 12:48 ` Philippe Gerum @ 2015-06-22 13:41 ` Frederik Bayart 2015-06-22 14:37 ` Frederik Bayart 2015-06-22 14:39 ` Philippe Gerum 0 siblings, 2 replies; 12+ messages in thread From: Frederik Bayart @ 2015-06-22 13:41 UTC (permalink / raw) To: xenomai >-------------------------------------------- >On Mon, 22/6/15, Philippe Gerum <rpm@xenomai.org> wrote: > > Subject: Re: [Xenomai] include guard trank/posix/pthread.h > To: "Frederik Bayart" <frederik_bayart@yahoo.co.uk>, xenomai@xenomai.org > Date: Monday, 22 June, 2015, 14:48 > > On 06/22/2015 12:26 PM, > Philippe Gerum wrote: > > On 06/22/2015 > 11:54 AM, Frederik Bayart wrote: > >> > >> > >> > >> On Friday, 19 June 2015, 15:07, > Philippe Gerum <rpm@xenomai.org> > wrote: > >>> On 06/19/2015 03:02 PM, > Frederik Bayart wrote: > >>> > >>> > >>> > >>> > >>>> > Hallo, > >>>> I noticed that both > /usr/xenomai/include/trank/trank.h and > /usr/xenomai/include/trank/posix/pthread.h share the same > include guard (_XENOMAI_TRANK_TRANK_H).Can this be an error > ? I use compile flags 'xeno-config --skin=native > --cflags' and get compile errors. If I change the > include guard of pthread.h to > _XENOMAI_TRANK_POSIX_PTHREAD_H, the problem seems to be > solved.In attachment a diff with my changes. > >>>> Frederik > >>>> > >>> > >>> Yes, > the guard is definitely wrong, will fix. Thanks for pointing > this out. > >>> > >>> -- > >>> > Philippe. > >> > >> > In the same context : to make it compile, I had to add > >> /usr/xenomai/include/trank/posix to > >> $(shell xeno-config --skin=native > --cflags). > >> At the moment > -I/usr/xenomai/include/trank -D__XENO_COMPAT__ > >> -I/usr/xenomai/include/cobalt > -I/usr/xenomai/include -D_GNU_SOURCE > >> -D_REENTRANT -D__COBALT__ > -I/usr/xenomai/include/alchemy > >> is > returned. > >> > >> > If this is the correct solution, I can prepare a patch > for > >> xeno-config if desired. > >> > > >-------------------------------------------- >On Mon, 22/6/15, Philippe Gerum <rpm@xenomai.org> wrote: > > Subject: Re: [Xenomai] include guard trank/posix/pthread.h > To: "Frederik Bayart" <frederik_bayart@yahoo.co.uk>, xenomai@xenomai.org > Date: Monday, 22 June, 2015, 14:48 > > On 06/22/2015 12:26 PM, > Philippe Gerum wrote: > > On 06/22/2015 > 11:54 AM, Frederik Bayart wrote: > >> > >> > >> > >> On Friday, 19 June 2015, 15:07, > Philippe Gerum <rpm@xenomai.org> > wrote: > >>> On 06/19/2015 03:02 PM, > Frederik Bayart wrote: > >>> > >>> > >>> > >>> > >>>> > Hallo, > >>>> I noticed that both > /usr/xenomai/include/trank/trank.h and > /usr/xenomai/include/trank/posix/pthread.h share the same > include guard (_XENOMAI_TRANK_TRANK_H).Can this be an error > ? I use compile flags 'xeno-config --skin=native > --cflags' and get compile errors. If I change the > include guard of pthread.h to > _XENOMAI_TRANK_POSIX_PTHREAD_H, the problem seems to be > solved.In attachment a diff with my changes. > >>>> Frederik > >>>> > >>> > >>> Yes, > the guard is definitely wrong, will fix. Thanks for pointing > this out. > >>> > >>> -- > >>> > Philippe. > >> > >> > In the same context : to make it compile, I had to add > >> /usr/xenomai/include/trank/posix to > >> $(shell xeno-config --skin=native > --cflags). > >> At the moment > -I/usr/xenomai/include/trank -D__XENO_COMPAT__ > >> -I/usr/xenomai/include/cobalt > -I/usr/xenomai/include -D_GNU_SOURCE > >> -D_REENTRANT -D__COBALT__ > -I/usr/xenomai/include/alchemy > >> is > returned. > >> > >> > If this is the correct solution, I can prepare a patch > for > >> xeno-config if desired. > >> > > > > Please do. > > > > -rc5 is ready and I don't > want to hold it for too long, so if possible, > any feedback regarding this asap would be > great. By default, I'll merge > the patch > below, which should address this issue. > > diff --git a/scripts/xeno-config-cobalt.in > b/scripts/xeno-config-cobalt.in > index > c6e51d1..7b623db 100644 > --- > a/scripts/xeno-config-cobalt.in > +++ > b/scripts/xeno-config-cobalt.in > @@ -198,7 > +198,10 @@ if test x$do_cflags = xy; then > > test x$compat = xy && > cflags="-I$XENO_INCLUDE_DIR/trank > -D__XENO_COMPAT__ $cflags" > for skin in $skin_list; do > case "$skin" in > - posix|cobalt|rtdm) > + posix|rtdm) > + test x$compat = xy && > cflags="$cflags > -I$XENO_INCLUDE_DIR/trank/posix" > + ;; > + > cobalt) > ;; > > vxworks|psos|alchemy|smokey) > > cflags="$cflags > -I$XENO_INCLUDE_DIR/$skin" > > -- > Philippe. > > > Please do. > > > > -rc5 is ready and I don't > want to hold it for too long, so if possible, > any feedback regarding this asap would be > great. By default, I'll merge > the patch > below, which should address this issue. > > diff --git a/scripts/xeno-config-cobalt.in > b/scripts/xeno-config-cobalt.in > index > c6e51d1..7b623db 100644 > --- > a/scripts/xeno-config-cobalt.in > +++ > b/scripts/xeno-config-cobalt.in > @@ -198,7 > +198,10 @@ if test x$do_cflags = xy; then > > test x$compat = xy && > cflags="-I$XENO_INCLUDE_DIR/trank > -D__XENO_COMPAT__ $cflags" > for skin in $skin_list; do > case "$skin" in > - posix|cobalt|rtdm) > + posix|rtdm) > + test x$compat = xy && > cflags="$cflags > -I$XENO_INCLUDE_DIR/trank/posix" > + ;; > + > cobalt) > ;; > > vxworks|psos|alchemy|smokey) > > cflags="$cflags > -I$XENO_INCLUDE_DIR/$skin" > > -- > Philippe. > Philippe, With this patch, xeno-config works with --native and --posix. Thank you for the quick fix. I noticed also that xeno-config is in 2 debian packages so that you yet an install error. I'm busy to write a mail to report this, and to fix this, but maybe this is not urgent for rc5 Regards, Frederik ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Xenomai] include guard trank/posix/pthread.h 2015-06-22 13:41 ` Frederik Bayart @ 2015-06-22 14:37 ` Frederik Bayart 2015-06-22 14:49 ` Philippe Gerum 2015-06-22 14:39 ` Philippe Gerum 1 sibling, 1 reply; 12+ messages in thread From: Frederik Bayart @ 2015-06-22 14:37 UTC (permalink / raw) To: xenomai >On Mon, 22/6/15, Frederik Bayart <frederik_bayart@yahoo.co.uk> wrote: > > Subject: Re: [Xenomai] include guard trank/posix/pthread.h > To: xenomai@xenomai.org > Date: Monday, 22 June, 2015, 15:41 > > > >-------------------------------------------- > >On Mon, 22/6/15, Philippe Gerum <rpm@xenomai.org> > wrote: > > > > Subject: > Re: [Xenomai] include guard trank/posix/pthread.h > > To: "Frederik Bayart" <frederik_bayart@yahoo.co.uk>, > xenomai@xenomai.org > > Date: Monday, 22 June, 2015, 14:48 > > > > On 06/22/2015 12:26 > PM, > > Philippe Gerum wrote: > > > On 06/22/2015 > > > 11:54 AM, Frederik Bayart wrote: > > > >> > > >> > > > >> > > >> On Friday, 19 June > 2015, 15:07, > > Philippe Gerum <rpm@xenomai.org> > > wrote: > > >>> > On 06/19/2015 03:02 PM, > > Frederik Bayart > wrote: > > >>> > > >>> > > > >>> > > >>> > > >>>> > > > Hallo, > > >>>> I noticed that > both > > /usr/xenomai/include/trank/trank.h > and > > > /usr/xenomai/include/trank/posix/pthread.h share the same > > include guard (_XENOMAI_TRANK_TRANK_H).Can > this be an error > > ? I use compile flags > 'xeno-config --skin=native > > > --cflags' and get compile errors. If I change the > > include guard of pthread.h to > > _XENOMAI_TRANK_POSIX_PTHREAD_H, the > problem seems to be > > solved.In > attachment a diff with my changes. > > > >>>> Frederik > > > >>>> > > >>> > > >>> Yes, > > the > guard is definitely wrong, will fix. Thanks for pointing > > this out. > > > >>> > > >>> -- > > >>> > > > Philippe. > > >> > > > >> > > In the same context : to make > it compile, I had to add > > >> > /usr/xenomai/include/trank/posix to > > > >> $(shell xeno-config --skin=native > > --cflags). > > >> > At the moment > > > -I/usr/xenomai/include/trank -D__XENO_COMPAT__ > > >> > -I/usr/xenomai/include/cobalt > > > -I/usr/xenomai/include -D_GNU_SOURCE > > > >> -D_REENTRANT -D__COBALT__ > > > -I/usr/xenomai/include/alchemy > > >> > is > > returned. > > > >> > > >> > > > If this is the correct solution, I can prepare a patch > > for > > >> > xeno-config if desired. > > >> > > > > >-------------------------------------------- > >On Mon, 22/6/15, Philippe Gerum <rpm@xenomai.org> > wrote: > > > > Subject: > Re: [Xenomai] include guard trank/posix/pthread.h > > To: "Frederik Bayart" <frederik_bayart@yahoo.co.uk>, > xenomai@xenomai.org > > Date: Monday, 22 June, 2015, 14:48 > > > > On 06/22/2015 12:26 > PM, > > Philippe Gerum wrote: > > > On 06/22/2015 > > > 11:54 AM, Frederik Bayart wrote: > > > >> > > >> > > > >> > > >> On Friday, 19 June > 2015, 15:07, > > Philippe Gerum <rpm@xenomai.org> > > wrote: > > >>> > On 06/19/2015 03:02 PM, > > Frederik Bayart > wrote: > > >>> > > >>> > > > >>> > > >>> > > >>>> > > > Hallo, > > >>>> I noticed that > both > > /usr/xenomai/include/trank/trank.h > and > > > /usr/xenomai/include/trank/posix/pthread.h share the same > > include guard (_XENOMAI_TRANK_TRANK_H).Can > this be an error > > ? I use compile flags > 'xeno-config --skin=native > > > --cflags' and get compile errors. If I change the > > include guard of pthread.h to > > _XENOMAI_TRANK_POSIX_PTHREAD_H, the > problem seems to be > > solved.In > attachment a diff with my changes. > > > >>>> Frederik > > > >>>> > > >>> > > >>> Yes, > > the > guard is definitely wrong, will fix. Thanks for pointing > > this out. > > > >>> > > >>> -- > > >>> > > > Philippe. > > >> > > > >> > > In the same context : to make > it compile, I had to add > > >> > /usr/xenomai/include/trank/posix to > > > >> $(shell xeno-config --skin=native > > --cflags). > > >> > At the moment > > > -I/usr/xenomai/include/trank -D__XENO_COMPAT__ > > >> > -I/usr/xenomai/include/cobalt > > > -I/usr/xenomai/include -D_GNU_SOURCE > > > >> -D_REENTRANT -D__COBALT__ > > > -I/usr/xenomai/include/alchemy > > >> > is > > returned. > > > >> > > >> > > > If this is the correct solution, I can prepare a patch > > for > > >> > xeno-config if desired. > > >> > > > > > > Please > do. > > > > > > > -rc5 is ready and I don't > > want to hold it for too long, so if > possible, > > any feedback regarding this > asap would be > > great. By default, > I'll merge > > the patch > > below, which should address this issue. > > > > diff --git > a/scripts/xeno-config-cobalt.in > > > b/scripts/xeno-config-cobalt.in > > > index > > c6e51d1..7b623db 100644 > > --- > > > a/scripts/xeno-config-cobalt.in > > +++ > > b/scripts/xeno-config-cobalt.in > > @@ -198,7 > > +198,10 @@ > if test x$do_cflags = xy; then > > > > test x$compat = xy && > > cflags="-I$XENO_INCLUDE_DIR/trank > > -D__XENO_COMPAT__ $cflags" > > for skin in $skin_list; do > > case "$skin" in > > - posix|cobalt|rtdm) > > + posix|rtdm) > > + test x$compat = xy > && > > cflags="$cflags > > -I$XENO_INCLUDE_DIR/trank/posix" > > + ;; > > + > > > cobalt) > > ;; > > > > > vxworks|psos|alchemy|smokey) > > > > > cflags="$cflags > > > -I$XENO_INCLUDE_DIR/$skin" > > > > -- > > Philippe. > > > > > Please do. > > > > > > > -rc5 is ready and I don't > > want to hold it for too long, so if > possible, > > any feedback regarding this > asap would be > > great. By default, > I'll merge > > the patch > > below, which should address this issue. > > > > diff --git > a/scripts/xeno-config-cobalt.in > > > b/scripts/xeno-config-cobalt.in > > > index > > c6e51d1..7b623db 100644 > > --- > > > a/scripts/xeno-config-cobalt.in > > +++ > > b/scripts/xeno-config-cobalt.in > > @@ -198,7 > > +198,10 @@ > if test x$do_cflags = xy; then > > > > test x$compat = xy && > > cflags="-I$XENO_INCLUDE_DIR/trank > > -D__XENO_COMPAT__ $cflags" > > for skin in $skin_list; do > > case "$skin" in > > - posix|cobalt|rtdm) > > + posix|rtdm) > > + test x$compat = xy > && > > cflags="$cflags > > -I$XENO_INCLUDE_DIR/trank/posix" > > + ;; > > + > > > cobalt) > > ;; > > > > > vxworks|psos|alchemy|smokey) > > > > > cflags="$cflags > > > -I$XENO_INCLUDE_DIR/$skin" > > > > -- > > Philippe. > > > > Philippe, > > With > this patch, xeno-config works with --native and --posix. > > Thank you for the quick > fix. > > I noticed also that > xeno-config is in 2 debian packages so that you yet an > install error. > I'm busy to write a mail > to report this, and to fix this, but maybe this is not > urgent for rc5 > > Regards, > > Frederik Philippe I haven't test the ldflags yet. I will have a look at it right now and keep you informed. I noticed that in older xenomai versions there was a dependency on libpthread_rt.so.1 but now I don't see that dependency anymore, I don't know yet whether this a problem. Frederik ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Xenomai] include guard trank/posix/pthread.h 2015-06-22 14:37 ` Frederik Bayart @ 2015-06-22 14:49 ` Philippe Gerum 2015-06-22 15:20 ` Frederik Bayart 0 siblings, 1 reply; 12+ messages in thread From: Philippe Gerum @ 2015-06-22 14:49 UTC (permalink / raw) To: Frederik Bayart, xenomai On 06/22/2015 04:37 PM, Frederik Bayart wrote: >> On Mon, 22/6/15, Frederik Bayart <frederik_bayart@yahoo.co.uk> wrote: >> >> Subject: Re: [Xenomai] include guard trank/posix/pthread.h >> To: xenomai@xenomai.org >> Date: Monday, 22 June, 2015, 15:41 >> >> >>> -------------------------------------------- >>> On Mon, 22/6/15, Philippe Gerum <rpm@xenomai.org> >> wrote: >>> >>> Subject: >> Re: [Xenomai] include guard trank/posix/pthread.h >>> To: "Frederik Bayart" <frederik_bayart@yahoo.co.uk>, >> xenomai@xenomai.org >>> Date: Monday, 22 June, 2015, 14:48 >>> >>> On 06/22/2015 12:26 >> PM, >>> Philippe Gerum wrote: >>>> On 06/22/2015 >>> >> 11:54 AM, Frederik Bayart wrote: >>> >>>> >>>>> >>> >>>> >>>>> On Friday, 19 June >> 2015, 15:07, >>> Philippe Gerum <rpm@xenomai.org> >>> wrote: >>>>>> >> On 06/19/2015 03:02 PM, >>> Frederik Bayart >> wrote: >>>>>> >>>>>> >>> >>>>> >>>>>> >>>>>>> >>> >> Hallo, >>>>>>> I noticed that >> both >>> /usr/xenomai/include/trank/trank.h >> and >>> >> /usr/xenomai/include/trank/posix/pthread.h share the same >>> include guard (_XENOMAI_TRANK_TRANK_H).Can >> this be an error >>> ? I use compile flags >> 'xeno-config --skin=native >>> >> --cflags' and get compile errors. If I change the >>> include guard of pthread.h to >>> _XENOMAI_TRANK_POSIX_PTHREAD_H, the >> problem seems to be >>> solved.In >> attachment a diff with my changes. >>> >>>>>> Frederik >>> >>>>>> >>>>>> >>>>>> Yes, >>> the >> guard is definitely wrong, will fix. Thanks for pointing >>> this out. >>> >>>>> >>>>>> -- >>>>>> >>> >> Philippe. >>>>> >>> >>>> >>> In the same context : to make >> it compile, I had to add >>>>> >> /usr/xenomai/include/trank/posix to >>> >>>> $(shell xeno-config --skin=native >>> --cflags). >>>>> >> At the moment >>> >> -I/usr/xenomai/include/trank -D__XENO_COMPAT__ >>>>> >> -I/usr/xenomai/include/cobalt >>> >> -I/usr/xenomai/include -D_GNU_SOURCE >>> >>>> -D_REENTRANT -D__COBALT__ >>> >> -I/usr/xenomai/include/alchemy >>>>> >> is >>> returned. >>> >>>> >>>>> >>> >> If this is the correct solution, I can prepare a patch >>> for >>>>> >> xeno-config if desired. >>>>> >>>> >>> -------------------------------------------- >>> On Mon, 22/6/15, Philippe Gerum <rpm@xenomai.org> >> wrote: >>> >>> Subject: >> Re: [Xenomai] include guard trank/posix/pthread.h >>> To: "Frederik Bayart" <frederik_bayart@yahoo.co.uk>, >> xenomai@xenomai.org >>> Date: Monday, 22 June, 2015, 14:48 >>> >>> On 06/22/2015 12:26 >> PM, >>> Philippe Gerum wrote: >>>> On 06/22/2015 >>> >> 11:54 AM, Frederik Bayart wrote: >>> >>>> >>>>> >>> >>>> >>>>> On Friday, 19 June >> 2015, 15:07, >>> Philippe Gerum <rpm@xenomai.org> >>> wrote: >>>>>> >> On 06/19/2015 03:02 PM, >>> Frederik Bayart >> wrote: >>>>>> >>>>>> >>> >>>>> >>>>>> >>>>>>> >>> >> Hallo, >>>>>>> I noticed that >> both >>> /usr/xenomai/include/trank/trank.h >> and >>> >> /usr/xenomai/include/trank/posix/pthread.h share the same >>> include guard (_XENOMAI_TRANK_TRANK_H).Can >> this be an error >>> ? I use compile flags >> 'xeno-config --skin=native >>> >> --cflags' and get compile errors. If I change the >>> include guard of pthread.h to >>> _XENOMAI_TRANK_POSIX_PTHREAD_H, the >> problem seems to be >>> solved.In >> attachment a diff with my changes. >>> >>>>>> Frederik >>> >>>>>> >>>>>> >>>>>> Yes, >>> the >> guard is definitely wrong, will fix. Thanks for pointing >>> this out. >>> >>>>> >>>>>> -- >>>>>> >>> >> Philippe. >>>>> >>> >>>> >>> In the same context : to make >> it compile, I had to add >>>>> >> /usr/xenomai/include/trank/posix to >>> >>>> $(shell xeno-config --skin=native >>> --cflags). >>>>> >> At the moment >>> >> -I/usr/xenomai/include/trank -D__XENO_COMPAT__ >>>>> >> -I/usr/xenomai/include/cobalt >>> >> -I/usr/xenomai/include -D_GNU_SOURCE >>> >>>> -D_REENTRANT -D__COBALT__ >>> >> -I/usr/xenomai/include/alchemy >>>>> >> is >>> returned. >>> >>>> >>>>> >>> >> If this is the correct solution, I can prepare a patch >>> for >>>>> >> xeno-config if desired. >>>>> >>>> >>>> Please >> do. >>>> >>> >>> -rc5 is ready and I don't >>> want to hold it for too long, so if >> possible, >>> any feedback regarding this >> asap would be >>> great. By default, >> I'll merge >>> the patch >>> below, which should address this issue. >>> >>> diff --git >> a/scripts/xeno-config-cobalt.in >>> >> b/scripts/xeno-config-cobalt.in >>> >> index >>> c6e51d1..7b623db 100644 >>> --- >>> >> a/scripts/xeno-config-cobalt.in >>> +++ >>> b/scripts/xeno-config-cobalt.in >>> @@ -198,7 >>> +198,10 @@ >> if test x$do_cflags = xy; then >>> >>> test x$compat = xy && >>> cflags="-I$XENO_INCLUDE_DIR/trank >>> -D__XENO_COMPAT__ $cflags" >>> for skin in $skin_list; do >>> case "$skin" in >>> - posix|cobalt|rtdm) >>> + posix|rtdm) >>> + test x$compat = xy >> && >>> cflags="$cflags >>> -I$XENO_INCLUDE_DIR/trank/posix" >>> + ;; >>> + >> >>> cobalt) >>> ;; >>> >>> >> vxworks|psos|alchemy|smokey) >>> >>> >> cflags="$cflags >>> >> -I$XENO_INCLUDE_DIR/$skin" >>> >>> -- >>> Philippe. >>> >>>> Please do. >>>> >>> >>> -rc5 is ready and I don't >>> want to hold it for too long, so if >> possible, >>> any feedback regarding this >> asap would be >>> great. By default, >> I'll merge >>> the patch >>> below, which should address this issue. >>> >>> diff --git >> a/scripts/xeno-config-cobalt.in >>> >> b/scripts/xeno-config-cobalt.in >>> >> index >>> c6e51d1..7b623db 100644 >>> --- >>> >> a/scripts/xeno-config-cobalt.in >>> +++ >>> b/scripts/xeno-config-cobalt.in >>> @@ -198,7 >>> +198,10 @@ >> if test x$do_cflags = xy; then >>> >>> test x$compat = xy && >>> cflags="-I$XENO_INCLUDE_DIR/trank >>> -D__XENO_COMPAT__ $cflags" >>> for skin in $skin_list; do >>> case "$skin" in >>> - posix|cobalt|rtdm) >>> + posix|rtdm) >>> + test x$compat = xy >> && >>> cflags="$cflags >>> -I$XENO_INCLUDE_DIR/trank/posix" >>> + ;; >>> + >> >>> cobalt) >>> ;; >>> >>> >> vxworks|psos|alchemy|smokey) >>> >>> >> cflags="$cflags >>> >> -I$XENO_INCLUDE_DIR/$skin" >>> >>> -- >>> Philippe. >>> >> >> Philippe, >> >> With >> this patch, xeno-config works with --native and --posix. >> >> Thank you for the quick >> fix. >> >> I noticed also that >> xeno-config is in 2 debian packages so that you yet an >> install error. >> I'm busy to write a mail >> to report this, and to fix this, but maybe this is not >> urgent for rc5 >> >> Regards, >> >> Frederik > > Philippe > > I haven't test the ldflags yet. I will have a look at it right now and keep you informed. I noticed that in older xenomai versions there was a dependency on libpthread_rt.so.1 but now I don't see that dependency anymore, I don't know yet whether this a problem. > That's correct, this library is named libcobalt in xenomai 3. With the compat mode enabled, you only need -ltrank in addition to the usual deps. -- Philippe. ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Xenomai] include guard trank/posix/pthread.h 2015-06-22 14:49 ` Philippe Gerum @ 2015-06-22 15:20 ` Frederik Bayart 0 siblings, 0 replies; 12+ messages in thread From: Frederik Bayart @ 2015-06-22 15:20 UTC (permalink / raw) To: xenomai >-------------------------------------------- >On Mon, 22/6/15, Philippe Gerum <rpm@xenomai.org> wrote: > > Subject: Re: [Xenomai] include guard trank/posix/pthread.h > To: "Frederik Bayart" <frederik_bayart@yahoo.co.uk>, xenomai@xenomai.org > Date: Monday, 22 June, 2015, 16:49 > > On 06/22/2015 04:37 PM, > Frederik Bayart wrote: > >> On Mon, > 22/6/15, Frederik Bayart <frederik_bayart@yahoo.co.uk> > wrote: > >> > >> > Subject: Re: [Xenomai] include guard > trank/posix/pthread.h > >> To: xenomai@xenomai.org > >> Date: Monday, 22 June, 2015, 15:41 > >> > >> > >>> > -------------------------------------------- > >>> On Mon, 22/6/15, Philippe Gerum > <rpm@xenomai.org> > >> wrote: > >>> > >>> Subject: > >> > Re: [Xenomai] include guard trank/posix/pthread.h > >>> To: "Frederik Bayart" > <frederik_bayart@yahoo.co.uk>, > >> xenomai@xenomai.org > >>> Date: Monday, 22 June, 2015, > 14:48 > >>> > >>> On 06/22/2015 12:26 > >> PM, > >>> > Philippe Gerum wrote: > >>>> On > 06/22/2015 > >>> > >> 11:54 AM, Frederik Bayart wrote: > >>> > >>>> > >>>>> > >>> > >>>> > >>>>> On Friday, 19 June > >> 2015, 15:07, > >>> Philippe Gerum <rpm@xenomai.org> > >>> wrote: > >>>>>> > >> On 06/19/2015 03:02 PM, > >>> Frederik Bayart > >> wrote: > >>>>>> > >>>>>> > >>> > >>>>> > >>>>>> > >>>>>>> > >>> > >> Hallo, > >>>>>>> I noticed that > >> both > >>> > /usr/xenomai/include/trank/trank.h > >> > and > >>> > >> > /usr/xenomai/include/trank/posix/pthread.h share the same > >>> include guard > (_XENOMAI_TRANK_TRANK_H).Can > >> this > be an error > >>> ? I use compile > flags > >> 'xeno-config > --skin=native > >>> > >> --cflags' and get compile errors. > If I change the > >>> include guard > of pthread.h to > >>> > _XENOMAI_TRANK_POSIX_PTHREAD_H, the > >> > problem seems to be > >>> > solved.In > >> attachment a diff with my > changes. > >>> > >>>>>> Frederik > >>> > >>>>>> > >>>>>> > >>>>>> Yes, > >>> the > >> guard > is definitely wrong, will fix. Thanks for pointing > >>> this out. > >>> > >>>>> > >>>>>> -- > >>>>>> > >>> > >> > Philippe. > >>>>> > >>> > >>>> > >>> > In the same context : to make > >> it > compile, I had to add > >>>>> > >> > /usr/xenomai/include/trank/posix to > >>> > >>>> > $(shell xeno-config --skin=native > >>> --cflags). > >>>>> > >> > At the moment > >>> > >> -I/usr/xenomai/include/trank > -D__XENO_COMPAT__ > >>>>> > >> -I/usr/xenomai/include/cobalt > >>> > >> > -I/usr/xenomai/include -D_GNU_SOURCE > >>> > >>>> > -D_REENTRANT -D__COBALT__ > >>> > >> -I/usr/xenomai/include/alchemy > >>>>> > >> > is > >>> returned. > >>> > >>>> > >>>>> > >>> > >> If this > is the correct solution, I can prepare a patch > >>> for > >>>>> > >> > xeno-config if desired. > >>>>> > >>>> > >>> > -------------------------------------------- > >>> On Mon, 22/6/15, Philippe Gerum > <rpm@xenomai.org> > >> wrote: > >>> > >>> Subject: > >> > Re: [Xenomai] include guard trank/posix/pthread.h > >>> To: "Frederik Bayart" > <frederik_bayart@yahoo.co.uk>, > >> xenomai@xenomai.org > >>> Date: Monday, 22 June, 2015, > 14:48 > >>> > >>> On 06/22/2015 12:26 > >> PM, > >>> > Philippe Gerum wrote: > >>>> On > 06/22/2015 > >>> > >> 11:54 AM, Frederik Bayart wrote: > >>> > >>>> > >>>>> > >>> > >>>> > >>>>> On Friday, 19 June > >> 2015, 15:07, > >>> Philippe Gerum <rpm@xenomai.org> > >>> wrote: > >>>>>> > >> On 06/19/2015 03:02 PM, > >>> Frederik Bayart > >> wrote: > >>>>>> > >>>>>> > >>> > >>>>> > >>>>>> > >>>>>>> > >>> > >> Hallo, > >>>>>>> I noticed that > >> both > >>> > /usr/xenomai/include/trank/trank.h > >> > and > >>> > >> > /usr/xenomai/include/trank/posix/pthread.h share the same > >>> include guard > (_XENOMAI_TRANK_TRANK_H).Can > >> this > be an error > >>> ? I use compile > flags > >> 'xeno-config > --skin=native > >>> > >> --cflags' and get compile errors. > If I change the > >>> include guard > of pthread.h to > >>> > _XENOMAI_TRANK_POSIX_PTHREAD_H, the > >> > problem seems to be > >>> > solved.In > >> attachment a diff with my > changes. > >>> > >>>>>> Frederik > >>> > >>>>>> > >>>>>> > >>>>>> Yes, > >>> the > >> guard > is definitely wrong, will fix. Thanks for pointing > >>> this out. > >>> > >>>>> > >>>>>> -- > >>>>>> > >>> > >> > Philippe. > >>>>> > >>> > >>>> > >>> > In the same context : to make > >> it > compile, I had to add > >>>>> > >> > /usr/xenomai/include/trank/posix to > >>> > >>>> > $(shell xeno-config --skin=native > >>> --cflags). > >>>>> > >> > At the moment > >>> > >> -I/usr/xenomai/include/trank > -D__XENO_COMPAT__ > >>>>> > >> -I/usr/xenomai/include/cobalt > >>> > >> > -I/usr/xenomai/include -D_GNU_SOURCE > >>> > >>>> > -D_REENTRANT -D__COBALT__ > >>> > >> -I/usr/xenomai/include/alchemy > >>>>> > >> > is > >>> returned. > >>> > >>>> > >>>>> > >>> > >> If this > is the correct solution, I can prepare a patch > >>> for > >>>>> > >> > xeno-config if desired. > >>>>> > >>>> > >>>> Please > >> do. > >>>> > >>> > >>> -rc5 > is ready and I don't > >>> want > to hold it for too long, so if > >> > possible, > >>> any feedback > regarding this > >> asap would be > >>> great. By default, > >> I'll merge > >>> the patch > >>> below, which should address this > issue. > >>> > >>> diff --git > >> a/scripts/xeno-config-cobalt.in > >>> > >> > b/scripts/xeno-config-cobalt.in > >>> > >> index > >>> c6e51d1..7b623db 100644 > >>> --- > >>> > >> > a/scripts/xeno-config-cobalt.in > >>> > +++ > >>> > b/scripts/xeno-config-cobalt.in > >>> > @@ -198,7 > >>> +198,10 @@ > >> if test x$do_cflags = xy; then > >>> > >>> > test x$compat = xy && > >>> > cflags="-I$XENO_INCLUDE_DIR/trank > >>> -D__XENO_COMPAT__ $cflags" > >>> for skin in $skin_list; > do > >>> case > "$skin" in > >>> - > posix|cobalt|rtdm) > >>> + > posix|rtdm) > >>> + > test x$compat = xy > >> && > >>> cflags="$cflags > >>> > -I$XENO_INCLUDE_DIR/trank/posix" > >>> + ;; > >>> + > >> > > >>> cobalt) > >>> ;; > >>> > >>> > > >> > vxworks|psos|alchemy|smokey) > >>> > >>> > >> cflags="$cflags > >>> > >> > -I$XENO_INCLUDE_DIR/$skin" > >>> > >>> -- > > >>> Philippe. > >>> > >>>> > Please do. > >>>> > >>> > >>> -rc5 > is ready and I don't > >>> want > to hold it for too long, so if > >> > possible, > >>> any feedback > regarding this > >> asap would be > >>> great. By default, > >> I'll merge > >>> the patch > >>> below, which should address this > issue. > >>> > >>> diff --git > >> a/scripts/xeno-config-cobalt.in > >>> > >> > b/scripts/xeno-config-cobalt.in > >>> > >> index > >>> c6e51d1..7b623db 100644 > >>> --- > >>> > >> > a/scripts/xeno-config-cobalt.in > >>> > +++ > >>> > b/scripts/xeno-config-cobalt.in > >>> > @@ -198,7 > >>> +198,10 @@ > >> if test x$do_cflags = xy; then > >>> > >>> > test x$compat = xy && > >>> > cflags="-I$XENO_INCLUDE_DIR/trank > >>> -D__XENO_COMPAT__ $cflags" > >>> for skin in $skin_list; > do > >>> case > "$skin" in > >>> - > posix|cobalt|rtdm) > >>> + > posix|rtdm) > >>> + > test x$compat = xy > >> && > >>> cflags="$cflags > >>> > -I$XENO_INCLUDE_DIR/trank/posix" > >>> + ;; > >>> + > >> > > >>> cobalt) > >>> ;; > >>> > >>> > > >> > vxworks|psos|alchemy|smokey) > >>> > >>> > >> cflags="$cflags > >>> > >> > -I$XENO_INCLUDE_DIR/$skin" > >>> > >>> -- > > >>> Philippe. > >>> > >> > >> Philippe, > >> > >> With > >> this > patch, xeno-config works with --native and --posix. > >> > >> Thank you for > the quick > >> fix. > >> > >> I noticed > also that > >> xeno-config is in 2 > debian packages so that you yet an > >> > install error. > >> I'm busy to > write a mail > >> to report this, and to > fix this, but maybe this is not > >> > urgent for rc5 > >> > >> Regards, > >> > >> Frederik > > > > Philippe > > > > I haven't test the ldflags yet. I will > have a look at it right now and keep you informed. I noticed > that in older xenomai versions there was a dependency on > libpthread_rt.so.1 but now I don't see that dependency > anymore, I don't know yet whether this a problem. > > > > That's correct, this library is named > libcobalt in xenomai 3. With the > compat mode > enabled, you only need -ltrank in addition to the usual > deps. > > -- > Philippe. > Ok, libtrank is in the dependencies, server proces starts and I have several tasks. I have still some problems but I think these are on application level, not on compile and link level. So I think the xeno-config is correct now. Frederik ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Xenomai] include guard trank/posix/pthread.h 2015-06-22 13:41 ` Frederik Bayart 2015-06-22 14:37 ` Frederik Bayart @ 2015-06-22 14:39 ` Philippe Gerum 2015-06-22 15:48 ` Frederik Bayart 1 sibling, 1 reply; 12+ messages in thread From: Philippe Gerum @ 2015-06-22 14:39 UTC (permalink / raw) To: Frederik Bayart, xenomai On 06/22/2015 03:41 PM, Frederik Bayart wrote: > With this patch, xeno-config works with --native and --posix. > > Thank you for the quick fix. > > I noticed also that xeno-config is in 2 debian packages so that you yet an install error. Ok, it has to belong to the runtime one, not the development one. > I'm busy to write a mail to report this, and to fix this, but maybe this is not urgent for rc5 > I agree, this is not critical for -rc5. -- Philippe. ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Xenomai] include guard trank/posix/pthread.h 2015-06-22 14:39 ` Philippe Gerum @ 2015-06-22 15:48 ` Frederik Bayart 2015-06-22 17:53 ` Philippe Gerum 0 siblings, 1 reply; 12+ messages in thread From: Frederik Bayart @ 2015-06-22 15:48 UTC (permalink / raw) To: xenomai > >-------------------------------------------- >On Mon, 22/6/15, Philippe Gerum <rpm@xenomai.org> wrote: > > Subject: Re: [Xenomai] include guard trank/posix/pthread.h > To: "Frederik Bayart" <frederik_bayart@yahoo.co.uk>, xenomai@xenomai.org > Date: Monday, 22 June, 2015, 16:39 > > On 06/22/2015 03:41 PM, > Frederik Bayart wrote: > > > > With this patch, xeno-config works with --native and > --posix. > > > > Thank > you for the quick fix. > > > > I noticed also that xeno-config is in 2 > debian packages so that you yet an install error. > > Ok, it has to belong to the > runtime one, not the development one. > > > I'm busy to write a mail to report > this, and to fix this, but maybe this is not urgent for > rc5 > > > > I > agree, this is not critical for -rc5. > > -- > Philippe. > In 2.6, xeno-config was in libxenomai-dev If it should be now in xenomai-runtime, the patch below should fix it. Frederik --- rules.old 2015-06-22 17:41:21.192669068 +0200 +++ rules.new 2015-06-22 17:45:31.916677507 +0200 @@ -64,6 +64,9 @@ for f in $(CURDIR)/kernel/cobalt/udev/*.rules ; do \ cat $$f >> $(CURDIR)/debian/libxenomai1/etc/udev/xenomai.rules ; \ done + # xeno-config should be only in xenomai-runtime + rm -f $(CURDIR)/debian/libxenomai-dev/usr/bin/xeno-config + rm -f $(CURDIR)/debian/libxenomai-dev/usr/share/man/man1/xeno-config.1 install -m 644 debian/libxenomai1.modprobe $(CURDIR)/debian/libxenomai1/etc/modprobe.d/xenomai.conf # remove empty directory rm -rf $(CURDIR)/debian/xenomai-doc/usr/share/doc/xenomai-doc/ps ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Xenomai] include guard trank/posix/pthread.h 2015-06-22 15:48 ` Frederik Bayart @ 2015-06-22 17:53 ` Philippe Gerum 0 siblings, 0 replies; 12+ messages in thread From: Philippe Gerum @ 2015-06-22 17:53 UTC (permalink / raw) To: Frederik Bayart, xenomai On 06/22/2015 05:48 PM, Frederik Bayart wrote: > --- rules.old 2015-06-22 17:41:21.192669068 +0200 > +++ rules.new 2015-06-22 17:45:31.916677507 +0200 > @@ -64,6 +64,9 @@ > for f in $(CURDIR)/kernel/cobalt/udev/*.rules ; do \ > cat $$f >> $(CURDIR)/debian/libxenomai1/etc/udev/xenomai.rules ; \ > done > + # xeno-config should be only in xenomai-runtime > + rm -f $(CURDIR)/debian/libxenomai-dev/usr/bin/xeno-config > + rm -f $(CURDIR)/debian/libxenomai-dev/usr/share/man/man1/xeno-config.1 > install -m 644 debian/libxenomai1.modprobe $(CURDIR)/debian/libxenomai1/etc/modprobe.d/xenomai.conf > # remove empty directory > rm -rf $(CURDIR)/debian/xenomai-doc/usr/share/doc/xenomai-doc/ps Merged, thanks. -- Philippe. ^ permalink raw reply [flat|nested] 12+ messages in thread
* [Xenomai] include guard trank/posix/pthread.h @ 2015-06-19 13:02 Frederik Bayart 2015-06-19 13:07 ` Philippe Gerum 0 siblings, 1 reply; 12+ messages in thread From: Frederik Bayart @ 2015-06-19 13:02 UTC (permalink / raw) To: xenomai@xenomai.org Hallo, I noticed that both /usr/xenomai/include/trank/trank.h and /usr/xenomai/include/trank/posix/pthread.h share the same include guard (_XENOMAI_TRANK_TRANK_H).Can this be an error ? I use compile flags 'xeno-config --skin=native --cflags' and get compile errors. If I change the include guard of pthread.h to _XENOMAI_TRANK_POSIX_PTHREAD_H, the problem seems to be solved.In attachment a diff with my changes. Frederik -------------- next part -------------- A non-text attachment was scrubbed... Name: pthread.h.patch Type: text/x-diff Size: 509 bytes Desc: not available URL: <http://xenomai.org/pipermail/xenomai/attachments/20150619/2af7c747/attachment.patch> ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Xenomai] include guard trank/posix/pthread.h 2015-06-19 13:02 Frederik Bayart @ 2015-06-19 13:07 ` Philippe Gerum 0 siblings, 0 replies; 12+ messages in thread From: Philippe Gerum @ 2015-06-19 13:07 UTC (permalink / raw) To: Frederik Bayart, xenomai@xenomai.org On 06/19/2015 03:02 PM, Frederik Bayart wrote: > Hallo, > I noticed that both /usr/xenomai/include/trank/trank.h and /usr/xenomai/include/trank/posix/pthread.h share the same include guard (_XENOMAI_TRANK_TRANK_H).Can this be an error ? I use compile flags 'xeno-config --skin=native --cflags' and get compile errors. If I change the include guard of pthread.h to _XENOMAI_TRANK_POSIX_PTHREAD_H, the problem seems to be solved.In attachment a diff with my changes. > Frederik > Yes, the guard is definitely wrong, will fix. Thanks for pointing this out. -- Philippe. ^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2015-06-22 17:53 UTC | newest] Thread overview: 12+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-06-22 9:54 [Xenomai] include guard trank/posix/pthread.h Frederik Bayart 2015-06-22 10:26 ` Philippe Gerum 2015-06-22 12:48 ` Philippe Gerum 2015-06-22 13:41 ` Frederik Bayart 2015-06-22 14:37 ` Frederik Bayart 2015-06-22 14:49 ` Philippe Gerum 2015-06-22 15:20 ` Frederik Bayart 2015-06-22 14:39 ` Philippe Gerum 2015-06-22 15:48 ` Frederik Bayart 2015-06-22 17:53 ` Philippe Gerum -- strict thread matches above, loose matches on Subject: below -- 2015-06-19 13:02 Frederik Bayart 2015-06-19 13:07 ` Philippe Gerum
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.