twisterarmy
/
twister-core
mirror of https://github.com/twisterarmy/twister-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #1966 from TheBlueMatt/leveldbmakefile 

Build script fixes
miguelfreitas
Gregory Maxwell 12 years ago
parent
c13f5dbecf 38fe2e6a68
commit
155bdd90b9
9 changed files with 17 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      bitcoin-qt.pro
  2. 2
      contrib/gitian-descriptors/README
  3. 6
      contrib/gitian-descriptors/gitian-win32.yml
  4. 8
      contrib/gitian-descriptors/qt-win32.yml
  5. 4
      doc/release-process.txt
  6. 2
      src/makefile.linux-mingw
  7. 3
      src/makefile.mingw
  8. 2
      src/makefile.osx
  9. 2
      src/makefile.unix

4
bitcoin-qt.pro
Unescape View File

@ -95,13 +95,13 @@ contains(BITCOIN_NEED_QT_PLUGINS, 1) {
INCLUDEPATH += src/leveldb/include src/leveldb/helpers INCLUDEPATH += src/leveldb/include src/leveldb/helpers
LIBS += $$PWD/src/leveldb/libleveldb.a $$PWD/src/leveldb/libmemenv.a LIBS += $$PWD/src/leveldb/libleveldb.a $$PWD/src/leveldb/libmemenv.a
!windows { !windows {
genleveldb.commands = cd $$PWD/src/leveldb ; $(MAKE) libleveldb.a libmemenv.a genleveldb.commands = cd $$PWD/src/leveldb && $(MAKE) libleveldb.a libmemenv.a
} else { } else {
# make an educated guess about what the ranlib command is called # make an educated guess about what the ranlib command is called
isEmpty(QMAKE_RANLIB) { isEmpty(QMAKE_RANLIB) {
QMAKE_RANLIB = $$replace(QMAKE_STRIP, strip, ranlib) QMAKE_RANLIB = $$replace(QMAKE_STRIP, strip, ranlib)
} }
genleveldb.commands = cd $$PWD/src/leveldb ; CC=$$QMAKE_CC CXX=$$QMAKE_CXX TARGET_OS=OS_WINDOWS_CROSSCOMPILE CXXFLAGS="-I$$BOOST_INCLUDE_PATH" LDFLAGS="-L$$BOOST_LIB_PATH" $(MAKE) libleveldb.a libmemenv.a ; $$QMAKE_RANLIB $$PWD/src/leveldb/libleveldb.a ; $$QMAKE_RANLIB $$PWD/src/leveldb/libmemenv.a genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX TARGET_OS=OS_WINDOWS_CROSSCOMPILE CXXFLAGS="-I$$BOOST_INCLUDE_PATH" LDFLAGS="-L$$BOOST_LIB_PATH" $(MAKE) libleveldb.a libmemenv.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libleveldb.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libmemenv.a
} }
genleveldb.target = $$PWD/src/leveldb/libleveldb.a genleveldb.target = $$PWD/src/leveldb/libleveldb.a
genleveldb.depends = FORCE genleveldb.depends = FORCE

2
contrib/gitian-descriptors/README
Unescape View File

@ -31,7 +31,7 @@ Once you've got the right hardware and software:
wget 'http://download.oracle.com/berkeley-db/db-4.8.30.NC.tar.gz' wget 'http://download.oracle.com/berkeley-db/db-4.8.30.NC.tar.gz'
wget 'https://downloads.sourceforge.net/project/libpng/zlib/1.2.6/zlib-1.2.6.tar.gz' wget 'https://downloads.sourceforge.net/project/libpng/zlib/1.2.6/zlib-1.2.6.tar.gz'
wget 'https://downloads.sourceforge.net/project/libpng/libpng15/older-releases/1.5.9/libpng-1.5.9.tar.gz' wget 'https://downloads.sourceforge.net/project/libpng/libpng15/older-releases/1.5.9/libpng-1.5.9.tar.gz'
wget 'http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.2.tar.gz' wget 'http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.3.tar.gz'
cd ../.. cd ../..
cd gitian-builder cd gitian-builder

6
contrib/gitian-descriptors/gitian-win32.yml
Unescape View File

@ -12,17 +12,17 @@ packages:
- "faketime" - "faketime"
reference_datetime: "2011-01-30 00:00:00" reference_datetime: "2011-01-30 00:00:00"
remotes: remotes:
- "url": "https://github.com/bitcoin/bitcoin.git" - "url": "https://github.com/TheBlueMatt/bitcoin.git"
"dir": "bitcoin" "dir": "bitcoin"
files: files:
- "qt-win32-4.8.2-gitian-r1.zip" - "qt-win32-4.8.3-gitian-r1.zip"
- "boost-win32-1.50.0-gitian2.zip" - "boost-win32-1.50.0-gitian2.zip"
- "bitcoin-deps-0.0.5.zip" - "bitcoin-deps-0.0.5.zip"
script: | script: |
# #
mkdir $HOME/qt mkdir $HOME/qt
cd $HOME/qt cd $HOME/qt
unzip ../build/qt-win32-4.8.2-gitian-r1.zip unzip ../build/qt-win32-4.8.3-gitian-r1.zip
cd $HOME/build/ cd $HOME/build/
export PATH=$PATH:$HOME/qt/bin/ export PATH=$PATH:$HOME/qt/bin/
# #

8
contrib/gitian-descriptors/qt-win32.yml
Unescape View File

@ -11,15 +11,15 @@ packages:
reference_datetime: "2011-01-30 00:00:00" reference_datetime: "2011-01-30 00:00:00"
remotes: [] remotes: []
files: files:
- "qt-everywhere-opensource-src-4.8.2.tar.gz" - "qt-everywhere-opensource-src-4.8.3.tar.gz"
script: | script: |
INSTDIR="$HOME/qt/" INSTDIR="$HOME/qt/"
mkdir $INSTDIR mkdir $INSTDIR
SRCDIR="$INSTDIR/src/" SRCDIR="$INSTDIR/src/"
mkdir $SRCDIR mkdir $SRCDIR
# #
tar xzf qt-everywhere-opensource-src-4.8.2.tar.gz tar xzf qt-everywhere-opensource-src-4.8.3.tar.gz
cd qt-everywhere-opensource-src-4.8.2 cd qt-everywhere-opensource-src-4.8.3
sed 's/$TODAY/2011-01-30/' -i configure sed 's/$TODAY/2011-01-30/' -i configure
sed 's/i686-pc-mingw32-/i586-mingw32msvc-/' -i mkspecs/unsupported/win32-g++-cross/qmake.conf sed 's/i686-pc-mingw32-/i586-mingw32msvc-/' -i mkspecs/unsupported/win32-g++-cross/qmake.conf
sed --posix 's|QMAKE_CFLAGS\t\t= -pipe|QMAKE_CFLAGS\t\t= -pipe -isystem /usr/i586-mingw32msvc/include/ -frandom-seed=qtbuild|' -i mkspecs/unsupported/win32-g++-cross/qmake.conf sed --posix 's|QMAKE_CFLAGS\t\t= -pipe|QMAKE_CFLAGS\t\t= -pipe -isystem /usr/i586-mingw32msvc/include/ -frandom-seed=qtbuild|' -i mkspecs/unsupported/win32-g++-cross/qmake.conf
@ -51,4 +51,4 @@ script: |
# as zip stores file timestamps, use faketime to intercept stat calls to set dates for all files to reference date # as zip stores file timestamps, use faketime to intercept stat calls to set dates for all files to reference date
export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
zip -r $OUTDIR/qt-win32-4.8.2-gitian-r1.zip * zip -r $OUTDIR/qt-win32-4.8.3-gitian-r1.zip *

4
doc/release-process.txt
Unescape View File

@ -30,12 +30,12 @@
wget 'ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.5.9.tar.gz' wget 'ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.5.9.tar.gz'
wget 'http://fukuchi.org/works/qrencode/qrencode-3.2.0.tar.bz2' wget 'http://fukuchi.org/works/qrencode/qrencode-3.2.0.tar.bz2'
wget 'http://downloads.sourceforge.net/project/boost/boost/1.50.0/boost_1_50_0.tar.bz2' wget 'http://downloads.sourceforge.net/project/boost/boost/1.50.0/boost_1_50_0.tar.bz2'
wget 'http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.2.tar.gz' wget 'http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.3.tar.gz'
cd .. cd ..
./bin/gbuild ../bitcoin/contrib/gitian-descriptors/boost-win32.yml ./bin/gbuild ../bitcoin/contrib/gitian-descriptors/boost-win32.yml
mv build/out/boost-win32-1.50.0-gitian2.zip inputs/ mv build/out/boost-win32-1.50.0-gitian2.zip inputs/
./bin/gbuild ../bitcoin/contrib/gitian-descriptors/qt-win32.yml ./bin/gbuild ../bitcoin/contrib/gitian-descriptors/qt-win32.yml
mv build/out/qt-win32-4.8.2-gitian-r1.zip inputs/ mv build/out/qt-win32-4.8.3-gitian-r1.zip inputs/
./bin/gbuild ../bitcoin/contrib/gitian-descriptors/deps-win32.yml ./bin/gbuild ../bitcoin/contrib/gitian-descriptors/deps-win32.yml
mv build/out/bitcoin-deps-0.0.5.zip inputs/ mv build/out/bitcoin-deps-0.0.5.zip inputs/

2
src/makefile.linux-mingw
Unescape View File

@ -92,7 +92,7 @@ LIBS += $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a
DEFS += -I"$(CURDIR)/leveldb/include" DEFS += -I"$(CURDIR)/leveldb/include"
DEFS += -I"$(CURDIR)/leveldb/helpers" DEFS += -I"$(CURDIR)/leveldb/helpers"
leveldb/libleveldb.a: leveldb/libleveldb.a:
@echo "Building LevelDB ..."; cd leveldb; TARGET_OS=OS_WINDOWS_CROSSCOMPILE CXXFLAGS="-I$(INCLUDEPATHS)" LDFLAGS="-L$(LIBPATHS)" make libleveldb.a libmemenv.a; cd .. @echo "Building LevelDB ..." && cd leveldb && CC=i586-mingw32msvc-gcc CXX=i586-mingw32msvc-g++ TARGET_OS=OS_WINDOWS_CROSSCOMPILE CXXFLAGS="-I$(INCLUDEPATHS)" LDFLAGS="-L$(LIBPATHS)" make libleveldb.a libmemenv.a && i586-mingw32msvc-ranlib libleveldb.a && i586-mingw32msvc-ranlib libmemenv.a && cd ..
obj/leveldb.o: leveldb/libleveldb.a obj/leveldb.o: leveldb/libleveldb.a
obj/build.h: FORCE obj/build.h: FORCE

3
src/makefile.mingw
Unescape View File

@ -94,8 +94,9 @@ test check: test_bitcoin.exe FORCE
LIBS += $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a LIBS += $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a
DEFS += $(addprefix -I,$(CURDIR)/leveldb/include) DEFS += $(addprefix -I,$(CURDIR)/leveldb/include)
DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers) DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers)
# TODO: If this fails, try adding a ranlib libleveldb.a && ranlib libmemenv.a
leveldb/libleveldb.a: leveldb/libleveldb.a:
cd leveldb; make libleveldb.a libmemenv.a; cd .. cd leveldb && make libleveldb.a libmemenv.a && cd ..
obj/leveldb.o: leveldb/libleveldb.lib obj/leveldb.o: leveldb/libleveldb.lib
obj/%.o: %.cpp $(HEADERS) obj/%.o: %.cpp $(HEADERS)

2
src/makefile.osx vendored
Unescape View File

@ -128,7 +128,7 @@ LIBS += $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a
DEFS += $(addprefix -I,$(CURDIR)/leveldb/include) DEFS += $(addprefix -I,$(CURDIR)/leveldb/include)
DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers) DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers)
leveldb/libleveldb.a: leveldb/libleveldb.a:
@echo "Building LevelDB ..."; cd leveldb; make libleveldb.a libmemenv.a; cd .. @echo "Building LevelDB ..." && cd leveldb && make libleveldb.a libmemenv.a && cd ..
obj/leveldb.o: leveldb/libleveldb.a obj/leveldb.o: leveldb/libleveldb.a
# auto-generated dependencies: # auto-generated dependencies:

2
src/makefile.unix
Unescape View File

@ -144,7 +144,7 @@ LIBS += $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a
DEFS += $(addprefix -I,$(CURDIR)/leveldb/include) DEFS += $(addprefix -I,$(CURDIR)/leveldb/include)
DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers) DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers)
leveldb/libleveldb.a: leveldb/libleveldb.a:
@echo "Building LevelDB ..."; cd leveldb; make libleveldb.a libmemenv.a; cd ..; @echo "Building LevelDB ..." && cd leveldb && make libleveldb.a libmemenv.a && cd ..
obj/leveldb.o: leveldb/libleveldb.a obj/leveldb.o: leveldb/libleveldb.a
# auto-generated dependencies: # auto-generated dependencies:

Write Preview
Loading…
Cancel
Save