Page MenuHomePhabricator

[CMAKE] Improve FindMiniUPnPc
ClosedPublic

Authored by Fabien on Mar 9 2020, 13:15.

Details

Summary

This creates an imported target on the model of D5339 and sets the
minimum version to 1.5.
Older versions might be supported as well but net.cpp has code to
handle 1.5 at least, and it is old enough (2011).

Test Plan
ninja check

Run the Gitian builds.

Diff Detail

Repository
rABC Bitcoin ABC
Branch
cmake_find_miniupnpc
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 9771
Build 17421: Default Diff Build & Tests
Build 17420: arc lint + arc unit

Event Timeline

Snippet of first build failure:

[13:25:48] :	 [Step 1/1] (Reading database ... 70%
[13:25:48] :	 [Step 1/1] (Reading database ... 75%
[13:25:48] :	 [Step 1/1] (Reading database ... 80%
[13:25:48] :	 [Step 1/1] (Reading database ... 85%
[13:25:48] :	 [Step 1/1] (Reading database ... 90%
[13:25:48] :	 [Step 1/1] (Reading database ... 95%
[13:25:48] :	 [Step 1/1] (Reading database ... 100%
[13:25:48] :	 [Step 1/1] (Reading database ... 17687 files and directories currently installed.)
[13:25:48] :	 [Step 1/1] Removing rsyslog (8.1901.0-1) ...
[13:25:48] :	 [Step 1/1] invoke-rc.d: could not determine current runlevel
[13:25:48] :	 [Step 1/1] Stopping enhanced syslogd: rsyslogd already stopped.
[13:25:48] :	 [Step 1/1] (Reading database ... 
[13:25:48] :	 [Step 1/1] (Reading database ... 5%
[13:25:48] :	 [Step 1/1] (Reading database ... 10%
[13:25:48] :	 [Step 1/1] (Reading database ... 15%
[13:25:48] :	 [Step 1/1] (Reading database ... 20%
[13:25:48] :	 [Step 1/1] (Reading database ... 25%
[13:25:48] :	 [Step 1/1] (Reading database ... 30%
[13:25:48] :	 [Step 1/1] (Reading database ... 35%
[13:25:48] :	 [Step 1/1] (Reading database ... 40%
[13:25:48] :	 [Step 1/1] (Reading database ... 45%
[13:25:48] :	 [Step 1/1] (Reading database ... 50%
[13:25:48] :	 [Step 1/1] (Reading database ... 55%
[13:25:48] :	 [Step 1/1] (Reading database ... 60%
[13:25:48] :	 [Step 1/1] (Reading database ... 65%
[13:25:48] :	 [Step 1/1] (Reading database ... 70%
[13:25:48] :	 [Step 1/1] (Reading database ... 75%
[13:25:48] :	 [Step 1/1] (Reading database ... 80%
[13:25:48] :	 [Step 1/1] (Reading database ... 85%
[13:25:48] :	 [Step 1/1] (Reading database ... 90%
[13:25:48] :	 [Step 1/1] (Reading database ... 95%
[13:25:48] :	 [Step 1/1] (Reading database ... 100%
[13:25:48] :	 [Step 1/1] (Reading database ... 17629 files and directories currently installed.)
[13:25:48] :	 [Step 1/1] Purging configuration files for rsyslog (8.1901.0-1) ...
[13:25:48] :	 [Step 1/1] Processing triggers for systemd (241-7~deb10u1) ...
[13:25:48] :	 [Step 1/1] Adding 'local diversion of /sbin/initctl to /sbin/initctl.distrib'
[13:25:48] :	 [Step 1/1] Adding 'local diversion of /usr/bin/ischroot to /usr/bin/ischroot.distrib'
[13:25:48]W:	 [Step 1/1] dpkg-divert: warning: diverting file '/usr/bin/ischroot' from an Essential package with rename is dangerous, use --no-rename
[13:25:48] :	 [Step 1/1] Adding 'local diversion of /usr/sbin/policy-rc.d to /usr/sbin/policy-rc.d.distrib'
[13:25:49] :	 [Step 1/1] Starting target
[13:25:49] :	 [Step 1/1] Checking if target is up
[13:25:49] :	 [Step 1/1] Preparing build environment
[13:25:53] :	 [Step 1/1] Updating apt-get repository (log in var/install.log)
[13:25:57] :	 [Step 1/1] Installing additional packages (log in var/install.log)
[13:26:56] :	 [Step 1/1] Upgrading system, may take a while (log in var/install.log)
[13:27:04] :	 [Step 1/1] Creating package manifest
[13:27:08] :	 [Step 1/1] Creating build script (var/build-script)
[13:27:09] :	 [Step 1/1] Running build script (log in var/build.log)
[13:27:46]W:	 [Step 1/1] ./bin/gbuild:21:in `system!': failed to run on-target setarch x86_64 bash -x < var/build-script > var/build.log 2>&1 (RuntimeError)
[13:27:46]W:	 [Step 1/1] 	from ./bin/gbuild:167:in `build_one_configuration'
[13:27:46]W:	 [Step 1/1] 	from ./bin/gbuild:318:in `block (2 levels) in <main>'
[13:27:46]W:	 [Step 1/1] 	from ./bin/gbuild:313:in `each'
[13:27:46]W:	 [Step 1/1] 	from ./bin/gbuild:313:in `block in <main>'
[13:27:46]W:	 [Step 1/1] 	from ./bin/gbuild:311:in `each'
[13:27:46]W:	 [Step 1/1] 	from ./bin/gbuild:311:in `<main>'
[13:27:46]W:	 [Step 1/1] ++ move_log
[13:27:46]W:	 [Step 1/1] ++ mv var/install.log /home/teamcity/buildAgent/work/c4a5708f2bae7929/gitian-results/
[13:27:46]W:	 [Step 1/1] ++ mv var/build.log /home/teamcity/buildAgent/work/c4a5708f2bae7929/gitian-results/
[13:27:46]W:	 [Step 1/1] Process exited with code 1
[13:27:46]E:	 [Step 1/1] Process exited with code 1 (Step: Command Line)

Rebase on top of D5448 to make the windows gitian build happy.

Add minimum version to dependencies.md

This revision is now accepted and ready to land.Mar 9 2020, 16:14
This revision was automatically updated to reflect the committed changes.