Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various hacks to make this build on clang on OS X 10.11 and Boost 1.60. #2

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

nopdotcom
Copy link

Don't just blindly pull it. I have not tested this.

Don't just blindly pull it. I have not tested this.
@LittleDuke
Copy link
Owner

HFS for reals!?

On Apr 30, 2016, at 17:20, Jay Carlson [email protected] wrote:

Don't just blindly pull it. I have not tested this.

You can view, comment on, or merge this pull request online at:

#2

Commit Summary

Various hacks to make this build on clang on OS X 10.11 and Boost 1.60.
File Changes

M src/bitcoinrpc.cpp (4)
M src/net.cpp (2)
M src/qt/bitcoingui.h (2)
M src/qt/rpcconsole.cpp (2)
M src/rpcblockchain.cpp (20)
M src/rpcdump.cpp (4)
M src/rpcmining.cpp (22)
M src/rpcnet.cpp (10)
M src/rpcrawtransaction.cpp (12)
M src/rpcwallet.cpp (84)
M src/scrypt-x86_64.S (14)
M src/serialize.h (2)
Patch Links:

https://github.com/LittleDuke/2GIVE/pull/2.patch
https://github.com/LittleDuke/2GIVE/pull/2.diff

You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub

@LittleDuke
Copy link
Owner

Does this also mean you’re getting a 64-bit build to work??

-dvd

On Apr 30, 2016, at 17:20, Jay Carlson [email protected] wrote:

Don't just blindly pull it. I have not tested this.

You can view, comment on, or merge this pull request online at:

#2

Commit Summary

Various hacks to make this build on clang on OS X 10.11 and Boost 1.60.
File Changes

M src/bitcoinrpc.cpp (4)
M src/net.cpp (2)
M src/qt/bitcoingui.h (2)
M src/qt/rpcconsole.cpp (2)
M src/rpcblockchain.cpp (20)
M src/rpcdump.cpp (4)
M src/rpcmining.cpp (22)
M src/rpcnet.cpp (10)
M src/rpcrawtransaction.cpp (12)
M src/rpcwallet.cpp (84)
M src/scrypt-x86_64.S (14)
M src/serialize.h (2)
Patch Links:

https://github.com/LittleDuke/2GIVE/pull/2.patch
https://github.com/LittleDuke/2GIVE/pull/2.diff

You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub

@nopdotcom
Copy link
Author

It builds, application launches, shows splash screen, generates keys, show a $0.00 window. That’s all I know.

The most tedious problem was the return NULL being ambiguous. I changed to return what was documented as the “null” Value, Value().

$ file 2GiveCoin-Qt.app/Contents/MacOS/2GiveCoin-Qt
2GiveCoin-Qt.app/Contents/MacOS/2GiveCoin-Qt: Mach-O 64-bit x86_64 executable

@LittleDuke
Copy link
Owner

Try firing up the console and see if you can setgenerate true

I can also send you 1000 coins for SNG (low cost in case they go missing) if you send me your Give* address

-dvd

On Apr 30, 2016, at 17:32, Jay Carlson [email protected] wrote:

It builds, application launches, shows splash screen, generates keys, show a $0.00 window. That’s all I know.

The most tedious problem was the return NULL being ambiguous. I changed to return what was documented as the “null” Value, Value().

$ file 2GiveCoin-Qt.app/Contents/MacOS/2GiveCoin-Qt
2GiveCoin-Qt.app/Contents/MacOS/2GiveCoin-Qt: Mach-O 64-bit x86_64 executable

You are receiving this because you commented.
Reply to this email directly or view it on GitHub

@nopdotcom
Copy link
Author

I did setgenerate true in the console, and then getgenerate returned true.

Testing with small transactions makes sense. Try Give2V7d5Q3uru9T1i82GYQLxqpCLkdcm9

@LittleDuke
Copy link
Owner

YES?

http://xtc.inter.com:2751/block/0000071943046c9bba73990b92ee91196584f399c772ccc1322d7494490a2547

On Apr 30, 2016, at 17:47, Jay Carlson [email protected] wrote:

I did setgenerate true in the console, and then getgenerate returned true.

Testing with small transactions makes sense. Try Give2V7d5Q3uru9T1i82GYQLxqpCLkdcm9


You are receiving this because you commented.
Reply to this email directly or view it on GitHub

@nopdotcom
Copy link
Author

voila_capture 2016-04-30_06-50-55_pm copy

@LittleDuke
Copy link
Owner

BOOM BABY BOOM!

So freaking cool — 99% of the ALTS out there have to be built 32bit and with boost 1.55 — this would be a coup!

Qt 4 or 5 ??

This is worth 1M 2GIVE to me — it’s what I sent to the dev who got my cross compile environment up

How are you with IOS dev ;-)

https://github.com/voisine/breadwallet

I’ve got a friends kid who has XP with swift and ios develoment looking into forking BreadWallet to make us an IOS 2GIVE wallet

On Apr 30, 2016, at 17:51, Jay Carlson [email protected] wrote:


You are receiving this because you commented.
Reply to this email directly or view it on GitHub

@nopdotcom
Copy link
Author

It’s still Qt 4. Qt 5 was initially unhappy with me, but it’s possible that cleaning up this stuff makes it easier. I’ll take a look after dinner.

I haven’t done iOS development (shell scripts on jailbroken phones don’t count), but “how hard could it be". Swift does sound like the way to go, but I haven’t written more than hello world in it.

@LittleDuke
Copy link
Owner

It’s still Qt 4. Qt 5 was initially unhappy with me, but it’s possible that cleaning up this stuff makes it easier. I’ll take a look after dinner

I just know that we use Qt5 (and account for it in the code) on the xbuild system
I haven’t done iOS development (shell scripts on jailbroken phones don’t count), but “how hard could it be". Swift does sound like the way to go, but I haven’t written more than hello world in it

I would think that if Breadwallet can actually compile and deploy as it, its a straight skin job to re-brand and make sure it has the Scrypt support and whatever server side indexing thing needs to be in place.

I’m just as happy to outsource all of that and the Android wallet as well — but who knows?

There is a ton of stuff to work on with the whole Gift* paper wallet option and the charitable giving directory — plus build the website and message board and eventually go talk to my buddy who owns coinoutlet about adding support for the paperwallets to his BTM network…

@LittleDuke
Copy link
Owner

Okay I’ve reviewed the changes — all that NULL stuff was my change to the use of “throw runtime_err()” as a means to return RPC command help strings and shift that into the call table vRPCCommands[] directly as a next step towards externalizing the strings for future language translation options.

The main place where this comes together is in bitcoinrcp.cpp:

string CRPCTable::help(string strCommand) const

If you type ‘help' in the console plus test a few commands like 'help getblockcoun’t et al we can confirm that it didn’t break that.

I’ll do a test on my local machine make sure that the return Value(); works too and if so I’ll pull your changes in on those files.

As for the +#ifndef Q_MOC_RUN changes I’ll check those as well to make sure they do not break anything on Win32 and Linux

In src/scrypt-x86_64.S

I see the .align shift from 32 to 16 — any idea why this was necessary? Do we know if it makes any performance difference?

And finally in

src/serialize.h

The +#if 0

Is that just a short cut to completely disable / comment off the

 void insert(iterator it, std::vector<char>::const_iterator first, std::vector<char>::const_iterator last)

function...Is there some native function that this was superceding? Is this one implemented with some alternate behavior?

Assuming it doesn’t break Boost 1.55 it should be a no brainer to fold it all in — otherwise we might need a few #ifdef BOOST_VERSION tests inserted.

Otherwise — MONSTER THANKS for taking a swing at this!! As I relayed to you, the only reliable way we have had to date to build Mac wallets was to acquire a 32-bit mac running 10.6 so having a modern up to date tool chain to be able to build true 64-bit wallets would be a coup for 2GIVE and a real contribution to the ALT community!

Sync up later?

-dvd

On Apr 30, 2016, at 17:20, Jay Carlson [email protected] wrote:

Don't just blindly pull it. I have not tested this.

You can view, comment on, or merge this pull request online at:

#2

Commit Summary

Various hacks to make this build on clang on OS X 10.11 and Boost 1.60.
File Changes

M src/bitcoinrpc.cpp (4)
M src/net.cpp (2)
M src/qt/bitcoingui.h (2)
M src/qt/rpcconsole.cpp (2)
M src/rpcblockchain.cpp (20)
M src/rpcdump.cpp (4)
M src/rpcmining.cpp (22)
M src/rpcnet.cpp (10)
M src/rpcrawtransaction.cpp (12)
M src/rpcwallet.cpp (84)
M src/scrypt-x86_64.S (14)
M src/serialize.h (2)
Patch Links:

https://github.com/LittleDuke/2GIVE/pull/2.patch
https://github.com/LittleDuke/2GIVE/pull/2.diff

You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub

@LittleDuke
Copy link
Owner

I’ve folded in most of these changes by hand since I’m still getting back up to speed on GIT and PULL requests.

Have not do the align 16 yet — wanted to make sure it all still worked as is on cross build for windows

-dvd

On Apr 30, 2016, at 18:04, Jay Carlson [email protected] wrote:

It’s still Qt 4. Qt 5 was initially unhappy with me, but it’s possible that cleaning up this stuff makes it easier. I’ll take a look after dinner.

I haven’t done iOS development (shell scripts on jailbroken phones don’t count), but “how hard could it be". Swift does sound like the way to go, but I haven’t written more than hello world in it.


You are receiving this because you commented.
Reply to this email directly or view it on GitHub

@nopdotcom
Copy link
Author

I’m not much of a git pro either, as I found out when I tried to do some repeated merges.

I just did .align 16 to get it working. I don’t think it should affect the Windows build, but I’m not doing that build...

@nopdotcom
Copy link
Author

On some combination of compiler version, this counted as a duplicate declaration:

void insert(iterator it, std::vector<char>::const_iterator first, std::vector<char>::const_iterator last)

If you set it back to #if 1 you can find out if it’s still acceptable. I think this may be related to the -stdlib=c++ business.

@LittleDuke
Copy link
Owner

I’ll try it and see if it breaks mining…

On May 1, 2016, at 20:49, Jay Carlson [email protected] wrote:

I’m not much of a git pro either, as I found out when I tried to do some repeated merges.

I just did .align 16 to get it working. I don’t think it should affect the Windows build, but I’m not doing that build...


You are receiving this because you commented.
Reply to this email directly or view it on GitHub

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants