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

Update submodules #4105

Merged
merged 3 commits into from Aug 23, 2018
Merged

Conversation

anonimal
Copy link
Contributor

@anonimal anonimal commented Jul 6, 2018

Resolves #3990.

@anonimal
Copy link
Contributor Author

anonimal commented Jul 6, 2018

Win64 build fails with:

[ 90%] Linking CXX executable ../../bin/monero-wallet-rpc.exe
make[3]: Leaving directory '/home/vagrant/slave/monero-static-win64/build/build/release'
make[2]: Leaving directory '/home/vagrant/slave/monero-static-win64/build/build/release'
make[1]: Leaving directory '/home/vagrant/slave/monero-static-win64/build/build/release'
../../external/unbound/libunbound.a(net_help.c.obj):net_help.c:(.text+0x1668): undefined reference to `__imp_CertOpenStore'
../../external/unbound/libunbound.a(net_help.c.obj):net_help.c:(.text+0x168c): undefined reference to `__imp_CertEnumCertificatesInStore'
../../external/unbound/libunbound.a(net_help.c.obj):net_help.c:(.text+0x18da): undefined reference to `__imp_CertCloseStore'
collect2.exe: error: ld returned 1 exit status
make[3]: *** [src/wallet/CMakeFiles/wallet_rpc_server.dir/build.make:133: bin/monero-wallet-rpc.exe] Error 1
make[2]: *** [CMakeFiles/Makefile2:2282: src/wallet/CMakeFiles/wallet_rpc_server.dir/all] Error 2
make[1]: *** [Makefile:129: all] Error 2
make: *** [Makefile:119: release-static-win64] Error 2

@MaxXor
Copy link
Contributor

MaxXor commented Jul 7, 2018

Why do you use the latest RapidJson from master instead of stable version?

@jagerman
Copy link
Contributor

jagerman commented Jul 8, 2018

Win64 build fails with: [snip]

Apparently with the newest unbound there is a need to link crypt32. You could hack that into the MINGW-specific EXTRA_LIBRARIES in the root CMakeLists.txt to get the compilation to work, but that doesn't seem like the right place.

@anonimal
Copy link
Contributor Author

Why do you use the latest RapidJson from master instead of stable version?

@MaxXor please do your "due diligence"

8a6c081
https://github.com/Tencent/rapidjson/releases
Tencent/rapidjson#1282
Tencent/rapidjson#1265

You could hack that into the MINGW-specific EXTRA_LIBRARIES in the root CMakeLists.txt to get the compilation to work, but that doesn't seem like the right place.

Thanks @jagerman. CMakeLists.txt will most certainly be the right place as that's the exact reason why we have a monero branch to work with. You can PR to https://github.com/monero-project/unbound/tree/monero or I'll get to it before monero 0.12.4.0.

Copy link
Collaborator

@moneromooo-monero moneromooo-monero left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did not review the changes to the trees, but I checked unbound and miniupnpc are moved to a merge commit signed by fluffypony, and rapidjson is moved to a commit which exists in the upstream Tencent tree.

@luigi1111 luigi1111 merged commit 4e409be into monero-project:master Aug 23, 2018
luigi1111 added a commit that referenced this pull request Aug 23, 2018
e2311db Build: bump rapidjson to 129d19b
78a6690 Build: bump unbound to 1.7.3
4e409be Build: bump miniupnp to 2.1
@anonimal
Copy link
Contributor Author

anonimal commented Sep 6, 2018

@luigi1111 was this resolved though?... #4105 (comment)

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.

None yet

5 participants