diff options
author | Warren Togami <wtogami@gmail.com> | 2013-09-29 20:46:26 -1000 |
---|---|---|
committer | Warren Togami <wtogami@gmail.com> | 2013-09-30 22:05:20 -1000 |
commit | 738b8598aea6aa42d253d1520234809cd7c90471 (patch) | |
tree | a5936acc5101816f4716cbc4c4f2a52f302f70b2 /contrib/gitian-descriptors/deps-win32.yml | |
parent | bb3319f296c05b986634ebcdc79727c7a0bb5977 (diff) | |
download | bitcoin-738b8598aea6aa42d253d1520234809cd7c90471.tar.xz |
Hardcode string in miniupnpcstring.h and remove wine requirement from deps-win32.yml
Credit: sipa, cfields, Luke-Jr and michagogo contributed to this fix.
Removing wine as a win32 build dep is beneficial to fixing Gitian LXC,
which would enable many more people to join in the gitian.sigs process
by being able to build with a linux VM instead of a virt capable host.
Diffstat (limited to 'contrib/gitian-descriptors/deps-win32.yml')
-rw-r--r-- | contrib/gitian-descriptors/deps-win32.yml | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/contrib/gitian-descriptors/deps-win32.yml b/contrib/gitian-descriptors/deps-win32.yml index 5129462102..7ad00fcb01 100644 --- a/contrib/gitian-descriptors/deps-win32.yml +++ b/contrib/gitian-descriptors/deps-win32.yml @@ -10,7 +10,6 @@ packages: - "git-core" - "zip" - "faketime" -- "wine" - "psmisc" reference_datetime: "2011-01-30 00:00:00" remotes: [] @@ -47,10 +46,23 @@ script: | # tar xzf miniupnpc-1.6.tar.gz cd miniupnpc-1.6 - sed 's/dllwrap -k --driver-name gcc/$(DLLWRAP) -k --driver-name $(CC)/' -i Makefile.mingw - sed 's|wingenminiupnpcstrings $< $@|./wingenminiupnpcstrings $< $@|' -i Makefile.mingw + echo " + --- miniupnpc-1.6/Makefile.mingw.orig 2013-09-29 18:52:51.014087958 -1000 + +++ miniupnpc-1.6/Makefile.mingw 2013-09-29 19:09:29.663318691 -1000 + @@ -67,8 +67,8 @@ + + wingenminiupnpcstrings.o: wingenminiupnpcstrings.c + + -miniupnpcstrings.h: miniupnpcstrings.h.in wingenminiupnpcstrings + - wingenminiupnpcstrings \$< \$@ + +miniupnpcstrings.h: miniupnpcstrings.h.in + + sed -e 's|OS/version|MSWindows/5.1.2600|' -e 's|MINIUPNPC_VERSION_STRING \"version\"|MINIUPNPC_VERSION_STRING \"VERSIONHERE\"|' \$< > \$@ + + minixml.o: minixml.c minixml.h miniupnpcstrings.h + + " | sed "s/VERSIONHERE/$(cat VERSION)/" | patch -p1 mkdir -p dll - make -f Makefile.mingw DLLWRAP=$HOST-dllwrap CC=$HOST-gcc AR=$HOST-ar libminiupnpc.a + make -f Makefile.mingw CC=$HOST-gcc AR=$HOST-ar libminiupnpc.a install -d $INSTALLPREFIX/include/miniupnpc install *.h $INSTALLPREFIX/include/miniupnpc install libminiupnpc.a $INSTALLPREFIX/lib @@ -78,6 +90,4 @@ script: | cd .. # cd $INSTALLPREFIX - zip -r $OUTDIR/bitcoin-deps-win32-gitian-r8.zip include lib - # Kill wine processes as gitian won't figure out we are done otherwise - killall wineserver services.exe explorer.exe winedevice.exe + zip -r $OUTDIR/bitcoin-deps-win32-gitian-r9.zip include lib |