Page MenuHomePhabricator

remove glibc < 2.27 compat code
ClosedPublic

Authored by PiRK on Mar 27 2023, 08:15.

Details

Reviewers
Fabien
Group Reviewers
Restricted Project
Commits
rABC3c38650799b1: remove glibc < 2.27 compat code
Summary

2.27 introduced a new version of log2f and is now the oldest supported version of glibc after D13460

_divmoddi4 is a feature from GCC7 and we already enforce 8.3.

This is a partial backport of core#22930

Test Plan

ninja all check-all
gitian builds

Diff Detail

Repository
rABC Bitcoin ABC
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

@bot gitian-linux gitian-osx gitian-win

Tail of the build log:

[08:47:32] :	 [Step 1/1]  * [new tag]             phabricator/diff/38907 -> phabricator/diff/38907
[08:47:32] :	 [Step 1/1]  * [new tag]             phabricator/diff/38909 -> phabricator/diff/38909
[08:47:32] :	 [Step 1/1]  * [new tag]             phabricator/diff/8992  -> phabricator/diff/8992
[08:47:32] :	 [Step 1/1]  * [new tag]             phabricator/diff/8993  -> phabricator/diff/8993
[08:47:32] :	 [Step 1/1]  * [new branch]          master                 -> master
[08:47:32] :	 [Step 1/1] --- Building for bullseye amd64 ---
[08:47:32] :	 [Step 1/1] Stopping target if it is up
[08:47:32] :	 [Step 1/1] Error response from daemon: No such container: gitian-target
[08:47:32] :	 [Step 1/1] Error: No such container: gitian-target
[08:47:32] :	 [Step 1/1] Making a new image copy
[08:47:32] :	 [Step 1/1] Starting target
[08:47:32] :	 [Step 1/1] Checking if target is up.
[08:47:32] :	 [Step 1/1] Preparing build environment
[08:47:32] :	 [Step 1/1] Updating apt-get repository (log in var/install.log)
[08:47:32] :	 [Step 1/1] Installing additional packages (log in var/install.log)
[08:47:32] :	 [Step 1/1] Upgrading system, may take a while (log in var/install.log)
[08:47:32] :	 [Step 1/1] Creating package manifest
[08:47:32] :	 [Step 1/1] Creating build script (var/build-script)
[08:47:32] :	 [Step 1/1] Running build script (log in var/build.log)
[08:47:32] :	 [Step 1/1] ./bin/gbuild:23:in `system!': failed to run on-target setarch x86_64 bash -x < var/build-script > var/build.log 2>&1 (RuntimeError)
[08:47:32] :	 [Step 1/1] 	from ./bin/gbuild:185:in `build_one_configuration'
[08:47:32] :	 [Step 1/1] 	from ./bin/gbuild:339:in `block (2 levels) in <main>'
[08:47:32] :	 [Step 1/1] 	from ./bin/gbuild:334:in `each'
[08:47:32] :	 [Step 1/1] 	from ./bin/gbuild:334:in `block in <main>'
[08:47:32] :	 [Step 1/1] 	from ./bin/gbuild:332:in `each'
[08:47:32] :	 [Step 1/1] 	from ./bin/gbuild:332:in `<main>'
[08:47:32] :	 [Step 1/1] Build gitian-linux failed with exit code 1
[08:47:32] :	 [Step 1/1] ~/infra ~/buildAgent/work/jailed-build/bitcoin-abc ~/buildAgent/work/jailed-build
[08:47:32]W:	 [Step 1/1] + RESULT=1
[08:47:32]W:	 [Step 1/1] + pushd /home/teamcity/infra
[08:47:32]W:	 [Step 1/1] + docker-compose stop apt-cache-proxy
[08:47:33]W:	 [Step 1/1] Stopping abc-apt-cache-proxy ... 
[08:47:43]W:	 [Step 1/1]  [1A [2K
[08:47:43] :	 [Step 1/1] ~/buildAgent/work/jailed-build/bitcoin-abc ~/buildAgent/work/jailed-build
[08:47:43]W:	 [Step 1/1] Stopping abc-apt-cache-proxy ...  [32mdone [0m
[08:47:43]W:	 [Step 1/1]  [1B+ popd
[08:47:43]W:	 [Step 1/1] + exit 1
[08:47:43]W:	 [Step 1/1] Process exited with code 1
[08:47:43]E:	 [Step 1/1] Process exited with code 1 (Step: Command Line)
[08:47:43] :	 [Step 1/1] Waiting for 1 service processes to complete
[08:47:43]E:	 [Step 1/1] Ant JUnit report watcher
[08:47:43]E:		 [Ant JUnit report watcher] No reports found for paths:
[08:47:43]E:		 [Ant JUnit report watcher] /home/teamcity/buildAgent/work/jailed-build/results/artifacts/junit/*.xml
[08:47:44]E:	 [Step 1/1] Step Command Line failed
[08:47:44]E: Ant JUnit report watcher
[08:47:44]E:	 [Ant JUnit report watcher] No reports found for paths:
[08:47:44]E:	 [Ant JUnit report watcher] +:results/test_bitcoin.xml
[08:47:44]E:	 [Ant JUnit report watcher] +:results/**/junit_results*.xml
[08:47:44] : Publishing internal artifacts (4s)
[08:47:49] :	 [Publishing internal artifacts] Publishing 1 file using [WebPublisher]
[08:47:49] :	 [Publishing internal artifacts] Publishing 1 file using [ArtifactsCachePublisher]
[08:47:44]W: Publishing artifacts (5s)
[08:47:44] :	 [Publishing artifacts] Collecting files to publish: [+:results/**/junit_results*.xml, +:bitcoin-abc/abc-ci-builds/gitian-linux/gitian-results => gitian-linux.tar.gz]
[08:47:44]W:	 [Publishing artifacts] Artifacts path 'results/**/junit_results*.xml' not found
[08:47:44] :	 [Publishing artifacts] Creating archive gitian-linux.tar.gz
[08:47:44] :		 [Creating archive gitian-linux.tar.gz] Creating /home/teamcity/buildAgent/temp/buildTmp/TarPreprocessor291919359575773488/gitian-linux.tar.gz
[08:47:44] :		 [Creating archive gitian-linux.tar.gz] Archive was created, file size 1.15 MB (1211405 bytes)
[08:47:49] :	 [Publishing artifacts] Publishing 1 file using [WebPublisher]: bitcoin-abc/abc-ci-builds/gitian-linux/gitian-results => gitian-linux.tar.gz
[08:47:49] :	 [Publishing artifacts] Publishing 1 file using [ArtifactsCachePublisher]: bitcoin-abc/abc-ci-builds/gitian-linux/gitian-results => gitian-linux.tar.gz
[08:47:49] : Build finished

add back #include <cstdarg> (needed for va_list...)

Tail of the build log:

[09:58:24] :	 [Step 1/1]  * [new tag]             phabricator/diff/38900 -> phabricator/diff/38900
[09:58:24] :	 [Step 1/1]  * [new tag]             phabricator/diff/38907 -> phabricator/diff/38907
[09:58:24] :	 [Step 1/1]  * [new tag]             phabricator/diff/38909 -> phabricator/diff/38909
[09:58:24] :	 [Step 1/1]  * [new tag]             phabricator/diff/38910 -> phabricator/diff/38910
[09:58:24] :	 [Step 1/1]  * [new tag]             phabricator/diff/8992  -> phabricator/diff/8992
[09:58:24] :	 [Step 1/1]  * [new tag]             phabricator/diff/8993  -> phabricator/diff/8993
[09:58:24] :	 [Step 1/1]  * [new branch]          master                 -> master
[09:58:24] :	 [Step 1/1] --- Building for bullseye amd64 ---
[09:58:24] :	 [Step 1/1] Stopping target if it is up
[09:58:24] :	 [Step 1/1] Making a new image copy
[09:58:24] :	 [Step 1/1] Starting target
[09:58:24] :	 [Step 1/1] Checking if target is up.
[09:58:24] :	 [Step 1/1] Preparing build environment
[09:58:24] :	 [Step 1/1] Updating apt-get repository (log in var/install.log)
[09:58:24] :	 [Step 1/1] Installing additional packages (log in var/install.log)
[09:58:24] :	 [Step 1/1] Upgrading system, may take a while (log in var/install.log)
[09:58:24] :	 [Step 1/1] Creating package manifest
[09:58:24] :	 [Step 1/1] Creating build script (var/build-script)
[09:58:24] :	 [Step 1/1] Running build script (log in var/build.log)
[09:58:24] :	 [Step 1/1] ./bin/gbuild:23:in `system!': failed to run on-target setarch x86_64 bash -x < var/build-script > var/build.log 2>&1 (RuntimeError)
[09:58:24] :	 [Step 1/1] 	from ./bin/gbuild:185:in `build_one_configuration'
[09:58:24] :	 [Step 1/1] 	from ./bin/gbuild:339:in `block (2 levels) in <main>'
[09:58:24] :	 [Step 1/1] 	from ./bin/gbuild:334:in `each'
[09:58:24] :	 [Step 1/1] 	from ./bin/gbuild:334:in `block in <main>'
[09:58:24] :	 [Step 1/1] 	from ./bin/gbuild:332:in `each'
[09:58:24] :	 [Step 1/1] 	from ./bin/gbuild:332:in `<main>'
[09:58:24] :	 [Step 1/1] Build gitian-linux failed with exit code 1
[09:58:24]W:	 [Step 1/1] + RESULT=1
[09:58:24]W:	 [Step 1/1] + pushd /home/teamcity/infra
[09:58:24]W:	 [Step 1/1] + docker-compose stop apt-cache-proxy
[09:58:24] :	 [Step 1/1] ~/infra ~/buildAgent/work/jailed-build/bitcoin-abc ~/buildAgent/work/jailed-build
[09:58:25]W:	 [Step 1/1] Stopping abc-apt-cache-proxy ... 
[09:58:36] :	 [Step 1/1] ~/buildAgent/work/jailed-build/bitcoin-abc ~/buildAgent/work/jailed-build
[09:58:36]W:	 [Step 1/1]  [1A [2K
[09:58:36]W:	 [Step 1/1] Stopping abc-apt-cache-proxy ...  [32mdone [0m
[09:58:36]W:	 [Step 1/1]  [1B+ popd
[09:58:36]W:	 [Step 1/1] + exit 1
[09:58:36]W:	 [Step 1/1] Process exited with code 1
[09:58:36]E:	 [Step 1/1] Process exited with code 1 (Step: Command Line)
[09:58:36] :	 [Step 1/1] Waiting for 1 service processes to complete
[09:58:36]E:	 [Step 1/1] Ant JUnit report watcher
[09:58:36]E:		 [Ant JUnit report watcher] No reports found for paths:
[09:58:36]E:		 [Ant JUnit report watcher] /home/teamcity/buildAgent/work/jailed-build/results/artifacts/junit/*.xml
[09:58:36]E:	 [Step 1/1] Step Command Line failed
[09:58:37]E: Ant JUnit report watcher
[09:58:37]E:	 [Ant JUnit report watcher] No reports found for paths:
[09:58:37]E:	 [Ant JUnit report watcher] +:results/test_bitcoin.xml
[09:58:37]E:	 [Ant JUnit report watcher] +:results/**/junit_results*.xml
[09:58:37] : Publishing internal artifacts (2s)
[09:58:39] :	 [Publishing internal artifacts] Publishing 1 file using [WebPublisher]
[09:58:39] :	 [Publishing internal artifacts] Publishing 1 file using [ArtifactsCachePublisher]
[09:58:37]W: Publishing artifacts (2s)
[09:58:37] :	 [Publishing artifacts] Collecting files to publish: [+:results/**/junit_results*.xml, +:bitcoin-abc/abc-ci-builds/gitian-linux/gitian-results => gitian-linux.tar.gz]
[09:58:37]W:	 [Publishing artifacts] Artifacts path 'results/**/junit_results*.xml' not found
[09:58:37] :	 [Publishing artifacts] Creating archive gitian-linux.tar.gz
[09:58:37] :		 [Creating archive gitian-linux.tar.gz] Creating /home/teamcity/buildAgent/temp/buildTmp/TarPreprocessor2463294602819573434/gitian-linux.tar.gz
[09:58:37] :		 [Creating archive gitian-linux.tar.gz] Archive was created, file size 1.15 MB (1206785 bytes)
[09:58:39] :	 [Publishing artifacts] Publishing 1 file using [WebPublisher]: bitcoin-abc/abc-ci-builds/gitian-linux/gitian-results => gitian-linux.tar.gz
[09:58:39] :	 [Publishing artifacts] Publishing 1 file using [ArtifactsCachePublisher]: bitcoin-abc/abc-ci-builds/gitian-linux/gitian-results => gitian-linux.tar.gz
[09:58:39] : Build finished

remove the corresponding --wrap linker flags

@bot gitian-linux gitian-osx gitian-win

PiRK published this revision for review.Mar 27 2023, 12:03
Fabien edited the summary of this revision. (Show Details)
This revision is now accepted and ready to land.Mar 27 2023, 14:08
This revision was automatically updated to reflect the committed changes.