mirror of
				https://github.com/bitcoin/bitcoin.git
				synced 2024-05-17 23:56:39 +00:00 
			
		
		
		
	Remove Windows 32 bit build
This commit is contained in:
		
							parent
							
								
									12aa2ac988
								
							
						
					
					
						commit
						faf666f814
					
				
							
								
								
									
										10
									
								
								.travis.yml
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								.travis.yml
									
									
									
									
									
								
							| @ -97,16 +97,6 @@ jobs: | ||||
|         # This could be removed once the ABI change warning does not show up by default | ||||
|         BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports CXXFLAGS=-Wno-psabi" | ||||
| 
 | ||||
|     - stage: test | ||||
|       name: 'Win32  [GOAL: deploy]  [no gui or functional tests]' | ||||
|       env: >- | ||||
|         HOST=i686-w64-mingw32 | ||||
|         DPKG_ADD_ARCH="i386" | ||||
|         PACKAGES="python3 nsis g++-mingw-w64-i686 wine-binfmt wine32" | ||||
|         RUN_FUNCTIONAL_TESTS=false | ||||
|         GOAL="deploy" | ||||
|         BITCOIN_CONFIG="--enable-reduce-exports --disable-gui-tests" | ||||
| 
 | ||||
|     - stage: test | ||||
|       name: 'Win64  [GOAL: deploy]  [no gui or functional tests]' | ||||
|       env: >- | ||||
|  | ||||
| @ -29,10 +29,6 @@ DOCKER_EXEC () { | ||||
|   docker exec $DOCKER_ID bash -c "cd $PWD && $*" | ||||
| } | ||||
| 
 | ||||
| if [ -n "$DPKG_ADD_ARCH" ]; then | ||||
|   DOCKER_EXEC dpkg --add-architecture "$DPKG_ADD_ARCH" | ||||
| fi | ||||
| 
 | ||||
| travis_retry DOCKER_EXEC apt-get update | ||||
| travis_retry DOCKER_EXEC apt-get install --no-install-recommends --no-upgrade -qq $PACKAGES $DOCKER_PACKAGES | ||||
| 
 | ||||
|  | ||||
| @ -43,18 +43,6 @@ class TestSecurityChecks(unittest.TestCase): | ||||
|         self.assertEqual(call_security_check(cc, source, executable, ['-Wl,-znoexecstack','-fstack-protector-all','-Wl,-zrelro','-Wl,-z,now','-pie','-fPIE']), | ||||
|                 (0, '')) | ||||
| 
 | ||||
|     def test_32bit_PE(self): | ||||
|         source = 'test1.c' | ||||
|         executable = 'test1.exe' | ||||
|         cc = 'i686-w64-mingw32-gcc' | ||||
|         write_testcode(source) | ||||
| 
 | ||||
|         self.assertEqual(call_security_check(cc, source, executable, ['-Wl,--no-nxcompat','-Wl,--no-dynamicbase']), | ||||
|                 (1, executable+': failed DYNAMIC_BASE NX')) | ||||
|         self.assertEqual(call_security_check(cc, source, executable, ['-Wl,--nxcompat','-Wl,--no-dynamicbase']), | ||||
|                 (1, executable+': failed DYNAMIC_BASE')) | ||||
|         self.assertEqual(call_security_check(cc, source, executable, ['-Wl,--nxcompat','-Wl,--dynamicbase']), | ||||
|                 (0, '')) | ||||
|     def test_64bit_PE(self): | ||||
|         source = 'test1.c' | ||||
|         executable = 'test1.exe' | ||||
|  | ||||
| @ -31,7 +31,7 @@ script: | | ||||
|   set -e -o pipefail | ||||
| 
 | ||||
|   WRAP_DIR=$HOME/wrapped | ||||
|   HOSTS="i686-w64-mingw32 x86_64-w64-mingw32" | ||||
|   HOSTS="x86_64-w64-mingw32" | ||||
|   CONFIGFLAGS="--enable-reduce-exports --disable-bench --disable-gui-tests" | ||||
|   FAKETIME_HOST_PROGS="ar ranlib nm windres strip objcopy" | ||||
|   FAKETIME_PROGS="date makensis zip" | ||||
| @ -179,6 +179,4 @@ script: | | ||||
|   cp $OUTDIR/bitcoin-*setup-unsigned.exe unsigned/ | ||||
|   find . | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-win-unsigned.tar.gz | ||||
|   mv ${OUTDIR}/${DISTNAME}-x86_64-*-debug.zip ${OUTDIR}/${DISTNAME}-win64-debug.zip | ||||
|   mv ${OUTDIR}/${DISTNAME}-i686-*-debug.zip ${OUTDIR}/${DISTNAME}-win32-debug.zip | ||||
|   mv ${OUTDIR}/${DISTNAME}-x86_64-*.zip ${OUTDIR}/${DISTNAME}-win64.zip | ||||
|   mv ${OUTDIR}/${DISTNAME}-i686-*.zip ${OUTDIR}/${DISTNAME}-win32.zip | ||||
|  | ||||
| @ -20,7 +20,6 @@ created. To use it for Bitcoin: | ||||
| 
 | ||||
| Common `host-platform-triplets` for cross compilation are: | ||||
| 
 | ||||
| - `i686-w64-mingw32` for Win32 | ||||
| - `x86_64-w64-mingw32` for Win64 | ||||
| - `x86_64-apple-darwin14` for macOS | ||||
| - `arm-linux-gnueabihf` for Linux ARM 32 bit | ||||
|  | ||||
| @ -102,30 +102,6 @@ Build using: | ||||
|     CONFIG_SITE=$PWD/depends/x86_64-w64-mingw32/share/config.site ./configure --prefix=/ | ||||
|     make | ||||
| 
 | ||||
| ## Building for 32-bit Windows | ||||
| 
 | ||||
| To build executables for Windows 32-bit, install the following dependencies: | ||||
| 
 | ||||
|     sudo apt install g++-mingw-w64-i686 mingw-w64-i686-dev | ||||
| 
 | ||||
| For Ubuntu Bionic 18.04 and Windows Subsystem for Linux <sup>[1](#footnote1)</sup>: | ||||
| 
 | ||||
|     sudo update-alternatives --config i686-w64-mingw32-g++  # Set the default mingw32 g++ compiler option to posix. | ||||
| 
 | ||||
| Note that for WSL the Bitcoin Core source path MUST be somewhere in the default mount file system, for | ||||
| example /usr/src/bitcoin, AND not under /mnt/d/. If this is not the case the dependency autoconf scripts will fail. | ||||
| This means you cannot use a directory that located directly on the host Windows file system to perform the build. | ||||
| 
 | ||||
| Build using: | ||||
| 
 | ||||
|     PATH=$(echo "$PATH" | sed -e 's/:\/mnt.*//g') # strip out problematic Windows %PATH% imported var | ||||
|     cd depends | ||||
|     make HOST=i686-w64-mingw32 | ||||
|     cd .. | ||||
|     ./autogen.sh # not required when building from tarball | ||||
|     CONFIG_SITE=$PWD/depends/i686-w64-mingw32/share/config.site ./configure --prefix=/ | ||||
|     make | ||||
| 
 | ||||
| ## Depends system | ||||
| 
 | ||||
| For further documentation on the depends system see [README.md](../depends/README.md) in the depends directory. | ||||
|  | ||||
| @ -250,8 +250,6 @@ bitcoin-${VERSION}-x86_64-linux-gnu.tar.gz | ||||
| bitcoin-${VERSION}-osx64.tar.gz | ||||
| bitcoin-${VERSION}-osx.dmg | ||||
| bitcoin-${VERSION}.tar.gz | ||||
| bitcoin-${VERSION}-win32-setup.exe | ||||
| bitcoin-${VERSION}-win32.zip | ||||
| bitcoin-${VERSION}-win64-setup.exe | ||||
| bitcoin-${VERSION}-win64.zip | ||||
| ``` | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user