Skip to content
This repository has been archived by the owner on Sep 1, 2023. It is now read-only.

Revert "Revert "use POSIX version of esrerror_r"" #54

Merged
merged 2 commits into from Apr 8, 2014

Conversation

breznak
Copy link
Member

@breznak breznak commented Apr 4, 2014

This reverts commit ecd6ba7.

Because it introduced problems on OSX
Use strerror only, simplify

Should fix #53

This reverts commit ecd6ba7.

Conflicts:
	os/FStream.cpp

Because it introduced problems on OSX
Use strerror only, simplify
@breznak
Copy link
Member Author

breznak commented Apr 4, 2014

@rhyolight please test when u have time..

@rhyolight
Copy link
Member

@breznak doing now...

@breznak
Copy link
Member Author

breznak commented Apr 4, 2014

@rhyolight
Copy link
Member

Yeah I saw that as soon as I commented 😊

@breznak
Copy link
Member Author

breznak commented Apr 4, 2014

looks like travis is not eager to check this for us.. :/

@rhyolight
Copy link
Member

@breznak There is a problem. In subsequent commits on nupic.core, files were moved into a src directory. We can merge this, but we still won't be able to fix the nupic build for OS X, because the merge with be at the tip of master, and nupic is not compatible with that until numenta/nupic-legacy#751 merges. So if this passes, we can merge it, and we might say it fixes #53, but it will not fix the nupic build for OS X.

@breznak
Copy link
Member Author

breznak commented Apr 4, 2014

@rhyolight Right, I see.. But what should we do? It has to be fixed in nupic.core and that file does not exist here anymore. That is the problem of being out-of-sync :/

I can try some git magic with time..but im not sure

@rhyolight
Copy link
Member

The only thing I think will work is to revert numenta/nupic-legacy#768 so nupic points to https://github.com/numenta/nupic.core/tree/3ecc06a2e0b175a74381330d64a4ab803b71863d once again.

@rhyolight
Copy link
Member

Or we can just accept the fact that nupic@master won't build with OS X until numenta/nupic-legacy#751 is merged.

@rhyolight
Copy link
Member

Ok, if #56 passes and we merge it, we can then merge master into this PR and I will retry.

@fergalbyrne
Copy link
Member

I'd accept a short downtime on OSX build to get it sorted. Can't have 100% uptime when you're performing brain surgery.—
Sent from Mailbox for iPhone

On Fri, Apr 4, 2014 at 9:19 PM, Matthew Taylor notifications@github.com
wrote:

Ok, if #56 passes and we merge it, we can then merge master into this PR and I will retry.

Reply to this email directly or view it on GitHub:
#54 (comment)

@david-ragazzi
Copy link
Contributor

Hi @rhyolight , merge this when possible, please..

rhyolight added a commit that referenced this pull request Apr 8, 2014
Revert "Revert "use POSIX version of esrerror_r""
@rhyolight rhyolight merged commit f67dc8b into numenta:master Apr 8, 2014
@rhyolight rhyolight added this to the Sprint 19 milestone Apr 8, 2014
@breznak breznak deleted the fix_OSX_fstream branch September 18, 2014 20:49
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Build fails building FStream.cpp.o in OS X 10.9.2
4 participants