Right, or use the "leave unchanged" merge option which is the same as a null-merge. I did that already with the other branches. It's really nice to have those things cleanly set up so that stuff simply flows with the go. K
> -----Original Message----- > From: [email protected] [mailto:stackless- > [email protected]] On Behalf Of Richard Tew > Sent: 4. apríl 2014 06:50 > To: The Stackless Python Mailing List > Subject: Re: [Stackless] MacOS build error and merges > > Null merge done, for what it's worth. > > BTW, if you're merging and the file is configure, please do not merge it. > > Merging this file is just propagating garbage. Whomever does a release > should regenerate it from 'configure.in' or whatever. > > Cheers, > Richard. > > On 4/3/14, Kristján Valur Jónsson <[email protected]> wrote: > > I've fixed this and 2.7-slp now compiles on mac. > > I also grafted this change to 3.2 and merged from there to 3.3 and 3.4 > > (-slp) > > > > However: > > 1) I didn't merge to default-slp. Richard, there is something strange > > there, you did a merge from default-slp to 3.4-slp which is odd > > (usually we merge up, not down) If I merge from 3.4-slp to > > default-slp (the normal way to propagate changes up-version), a lot of stuff > gets merged along with it. > > Could you please set these two branches up for a clean merge? I'd > > rather have you do it since you set them up and should know them. If > > they are in the correct state currently, then a null merge should do it. > > 2) Same for 2.8-slp, I didn't merge from 2.7-slp for the same reason. > > I leave that to Christian to do since he is in charge of that branch. > > > > K > > > >> -----Original Message----- > >> From: [email protected] [mailto:stackless- > >> [email protected]] On Behalf Of Kristján Valur Jónsson > >> Sent: 2. apríl 2014 22:44 > >> To: The Stackless Python Mailing List > >> Subject: Re: [Stackless] MacOS build error > >> > >> Hi. > >> I'll give this a go tomorrow. Hopefully it is a simple fix. > >> I have found that the clang compiler does warn a lot :) K > >> > >> -----Original Message----- > >> From: [email protected] [mailto:stackless- > >> [email protected]] On Behalf Of Hervé Coatanhay > >> Sent: 2. apríl 2014 14:20 > >> To: The Stackless Python Mailing List > >> Subject: [Stackless] MacOS build error > >> > >> Hi all, > >> > >> I was looking how to build MacOS installer and I encountered an error > >> during compilation. > >> MacOSX 10.9 > >> Apple LLVM version 5.1 (clang-503.0.38) (based on LLVM 3.4svn) > >> Target: x86_64-apple-darwin13.1.0 > >> Thread model: posix > >> > >> -- > >> > >> gcc -c -fno-strict-aliasing -DSTACKLESS_FRHACK=0 -g -O2 -DNDEBUG -g - > >> fwrapv -O3 -Wall -Wstrict-prototypes -I. -IInclude -I./Include > >> -I./Stackless -DPy_BUILD_CORE -o Stackless/module/channelobject.o > >> Stackless/module/channelobject.c > >> > >> Stackless/module/channelobject.c:627:8: warning: type specifier > >> missing, defaults to 'int' [-Wimplicit-int] > >> > >> static > CHANNEL_SEND_EXCEPTION_HEAD(impl_channel_send_exception); > >> > >> ~~~~~~ ^ > >> > >> Stackless/module/channelobject.c:627:36: error: a parameter list > >> without types is only allowed in a function definition > >> > >> static > CHANNEL_SEND_EXCEPTION_HEAD(impl_channel_send_exception); > >> > >> ^ > >> > >> 1 warning and 1 error generated. > >> > >> make: *** [Stackless/module/channelobject.o] Error 1 > >> > >> -- > >> > >> This issue affects 2.7-slp branch and 276r3 export archive. Did > >> anyone build one of these versions on MacOSX ? I manage to build from > >> v2.7.5-slp tag. > >> > >> To me it looks like the problematic commit is > >> http://hg.python.org/stackless/rev/2915b436c673 about FlexType > removal. > >> Does anyone can reproduce this ? > >> > >> Cheers, > >> Hervé > >> > >> _______________________________________________ > >> Stackless mailing list > >> [email protected] > >> http://www.stackless.com/mailman/listinfo/stackless > >> _______________________________________________ > >> Stackless mailing list > >> [email protected] > >> http://www.stackless.com/mailman/listinfo/stackless > > _______________________________________________ > > Stackless mailing list > > [email protected] > > http://www.stackless.com/mailman/listinfo/stackless > > _______________________________________________ > Stackless mailing list > [email protected] > http://www.stackless.com/mailman/listinfo/stackless _______________________________________________ Stackless mailing list [email protected] http://www.stackless.com/mailman/listinfo/stackless
