Commit Graph

50 Commits

Author SHA1 Message Date
Jon Layton 2a63c34936 Merge remote-tracking branch 'btc/master' into upstream-merge 2018-10-16 22:27:53 -05:00
MarcoFalke 415f2bff69
Merge #13095: build: update ax_boost_chrono/unit_test_framework
aa85dcf472 build: sync ax_boost_chrono/unit_test (fanquake)

Pull request description:

  [ax_boost_chrono](https://github.com/bitcoin/bitcoin/blob/master/build-aux/m4/ax_boost_chrono.m4) and [ax_boost_unit_test_framework](https://github.com/bitcoin/bitcoin/blob/master/build-aux/m4/ax_boost_unit_test_framework.m4) were updated from upstream in #12678. However some minor upstream changes were missed. Pull those changes in here so these files actually reflect their upstream serial.

Tree-SHA512: 71d9ee7a1616d9d36e6f63dedb6687918c3662bde724cdda1fdf3eb039c8973acd166273876a9b2671a7e087149fcf956552f9f2b946e5ee1835d12944c0065d
2018-07-26 08:54:59 -04:00
Wladimir J. van der Laan 2dc5ab6378
Merge #13482: Remove boost::program_options dependency
f447a0a707 Remove program options from build system (Chun Kuan Lee)
11588c639e Replace boost program_options (Chun Kuan Lee)

Pull request description:

  Concept from #12744, but without parsing negated options.

Tree-SHA512: 7f418744bb8934e313d77a5f162633746ef5d043de802b9c9cd9f7c1842e7e566eb5f171cd9e2cc13317281b2449c6fbd553fa4f09b837e6af2f5d2b2aabdca2
2018-07-20 16:45:44 +02:00
Chun Kuan Lee f447a0a707 Remove program options from build system 2018-07-18 02:48:34 +00:00
Sebastian Kung 800dea88a6
Upgrade Qt depends to 5.9.6 2018-07-06 14:26:26 +02:00
Sebastian Kung 28482efefb
Ugrade Qt depends to Qt5.9.4
Depends can now be built with Qt5.9.4 , which is Qt's new long term
support version.
2018-07-05 17:12:42 +02:00
Wladimir J. van der Laan bad068ad9f build: Build system changes to support only Qt5 2018-06-13 18:15:47 +02:00
jc 8e04b9dd54 [build] autoconf adaptions for new files and targets and update dependencies 2018-06-03 09:36:22 -04:00
fanquake aa85dcf472 build: sync ax_boost_chrono/unit_test 2018-04-27 01:02:58 +08:00
Vasil Dimov 8c632f73c2
ax_boost_{chrono,unit_test_framework}.m4: take changes from upstream
Apply changes to
build-aux/m4/ax_boost_chrono.m4 and
build-aux/m4/ax_boost_unit_test_framework.m4
from upstream: https://github.com/peti/autoconf-archive
2018-03-15 19:59:11 +01:00
Wladimir J. van der Laan 7cf1aea5cf
Merge #12294: [Docs] Create NetBSD build instructions and fix compilation
11c5827 [build] Add NETBSD leveldb target to configure.ac (fanquake)
1944fa3 [doc] Create build-netbsd.md (Randolf Richardson)
336685e [build] Add db4_cxx to bitcoin_find_bdb48.m4 (Randolf Richardson)

Pull request description:

  Replaces #12125.

Tree-SHA512: 411d082ffff7198bcc1b2b6fcdf86c378baf228d8f4fee0e6c9f0688efe9c6b6dcfd5c1ab9c1dfd0c4637723b8584dbbb614634ace0e1a417b59e88a6c736dc0
2018-01-30 09:57:45 +01:00
Randolf Richardson 336685e17e
[build] Add db4_cxx to bitcoin_find_bdb48.m4
Added "db4_cxx" as this is the name used in NetBSD for the Berkeley DB library.  Without this additional base filename alternative, the "configure" script will fail to find this library and compilation will not succeed.
2018-01-29 21:15:51 +08:00
Werner Lemberg 06abcbf9ba
scripted-diff: Orthogonalize string quoting
Add double qoutes to string tests where arguments could (theoretically)
contain spaces.

Remove double quotes where not necessary.

-BEGIN VERIFY SCRIPT-
sed -iE -e 's/"x\(yes\|no\|auto\)\?"/x\1/g' -e 's/test \(x\$[^ ]*\)/test "\1"/g' build-aux/m4/bitcoin_qt.m4
-END VERIFY SCRIPT-
2017-11-17 22:21:53 +08:00
Werner Lemberg e0496d3b9a
bitcoin_qt.m4: Add missing dollar sign for variable. 2017-11-17 22:18:55 +08:00
Werner Lemberg 079f4b2a24
bitcoin_qt.m4: Add missing braces around variables in autoconf messages. 2017-11-17 22:18:55 +08:00
Werner Lemberg 8695315fb2
bitcoin_qt.m4: Use correct M4 quoting characters. 2017-11-17 22:18:55 +08:00
Werner Lemberg db32a4fd6b
bitcoin_qt.m4: Improve QT_VERSION tests.
Use '<QtCore/qconfig.h> and '<QtCore/qglobal.h>' for testing QT_VERSION.
This makes the tests work with both Qt4 and Qt5, even if '-fPIC' or '-fPIE'
is not used (the compiler might choke otherwise if QT_REDUCE_RELOCATIONS is
active).
2017-11-17 22:18:55 +08:00
Patrick Strateman 1cc251f50f Explicitly search for bdb5.3.
Some systems do not symlink the major version to the minor version.
2017-07-02 02:48:00 +00:00
Timothy Redaelli 7222388bb2 Avoid printing generic and duplicated "checking for QT" during ./configure
Print "checking for QT4" and "checking for QT5" instead
2017-06-08 10:41:34 +02:00
Russell Yanofsky bf1026412d Run bitcoin_test-qt under minimal QPA platform
Fixes broken "make check" reported by Matt Corallo <git@bluematt.me> in
https://github.com/bitcoin/bitcoin/issues/10110

Fix was suggested and initially implemented by
Cory Fields <cory-nospam-@coryfields.com> in
https://github.com/bitcoin/bitcoin/pull/10117#issuecomment-290275236
2017-04-03 11:07:40 -04:00
Cory Fields 9829c54de2 build: force a c++ standard to be specified
Newer compilers may switch to newer standards by default. For example, gcc6
uses std=gnu++14 by default.
2017-02-22 13:37:35 -05:00
Wladimir J. van der Laan 8713de83a0 build: Add options to override BDB cflags/libs
Add environment settings to specify the CFLAGS and LIBS to be used for
BerkeleyDB directly. These will completely by-pass autodetection in the
same way as other similar flags.

```
BDB_CFLAGS  C compiler flags for BerkeleyDB, bypasses autodetection
BDB_LIBS    Linker flags for BerkeleyDB, bypasses autodetection
```

Implements #3921.
2017-02-07 13:01:41 +01:00
Cory Fields 342eb9618a build: find qt's renamed helper libs from 5.7 2017-01-28 01:54:30 -05:00
fanquake 282abd8358
[build-aux] Boost_Base serial 27 2016-10-17 11:43:24 +08:00
Luke Dashjr 0c4e6ce88f Add MIT license to build-aux/m4 scripts 2016-09-21 23:01:46 +00:00
Luke Dashjr 3f8a5d8f6e Trivial: build-aux/m4/l_atomic: Fix typo 2016-09-21 23:01:46 +00:00
Anthony Towns 878faacd7b Add configure check for -latomic 2016-08-23 16:55:15 +10:00
Cory Fields 0c928cb13c build: Fix Qt5PlatformSupport check without pkg-config
The non-pkg-config case can't use pkg-config to check the version.

Also, make sure that the check is properly guarded in the case of missing
pkg-config macros.
2016-07-07 14:15:17 -04:00
Jonas Schnelli 2759597bc8
Only pass -lQt5PlatformSupport if >=Qt5.6 2016-06-20 10:17:01 +02:00
Jonas Schnelli 6194d9a501
Fix bitcoin_qt.m4 and fix-xcb-include-order.patch 2016-06-17 15:56:05 +02:00
fanquake 0e209f9bf9
[trivial] Sync ax_pthread with upstream draft 2016-06-13 19:51:32 +08:00
Wladimir J. van der Laan 2aacc72727 build: update ax_cxx_compile_stdcxx to serial 4 2016-04-28 10:18:06 +02:00
Wladimir J. van der Laan 67969af09f build: Enable C++11 build, require C++11 compiler
Implements #6211.
2016-04-26 16:15:02 +02:00
fanquake cf5c786fc3 [build-aux] Update Boost & check macros to latest serials 2016-03-19 15:24:00 +08:00
Wladimir J. van der Laan 354b03dee1
Merge #7604: build: Remove spurious dollar sign. Fixes #7189.
3d19193 Remove spurious dollar sign. Fixes #7189. (Chris Moore)
2016-02-29 09:40:40 +01:00
Chris Moore 3d19193f14 Remove spurious dollar sign. Fixes #7189. 2016-02-25 19:15:17 -08:00
Luke Dashjr d5f46832de Unify package name to as few places as possible without major changes 2015-12-14 02:11:10 +00:00
Cory Fields 69d0513436 build: Use fPIC rather than fPIE for qt objects.
But only if qt was built with reduced relocations.
2015-11-09 22:50:31 -05:00
Cory Fields 17c4d9d164 build: Split hardening/fPIE options out
This allows for fPIE to be used selectively.
2015-11-09 22:50:31 -05:00
Wladimir J. van der Laan dbacc69b4f build: If both Qt4 and Qt5 are installed, use Qt5
If both Qt4 and Qt5 development headers are installed, use Qt5. Building
against Qt5 should be encouraged as that is where active development
happens.
2015-11-04 16:19:28 +01:00
Cory Fields 31bfc272c7 build: make sure pkg-config checks are guarded by an m4_ifdef 2015-07-31 23:21:34 -04:00
Cory Fields fe997dfd12 build: fix building against qt5.4/5.5 2015-07-23 21:10:35 -04:00
Wladimir J. van der Laan 55f55ec5db qt: disable qt tests when one of the checks for the gui fails 2015-04-29 16:09:56 +02:00
Luke Dashjr faf0af49f5 Suggest --disable-wallet when libdb_cxx headers are missing 2015-01-31 17:38:28 -05:00
Cory Fields ee64c53c1f build: remove internal/protected build attribute checks
They're not necessary, and not always supported. We only need to know about
hidden and default.
2014-11-19 22:08:27 -05:00
Cory Fields f36a40f7fd build: check visibility attributes 2014-11-19 22:08:27 -05:00
Luke Dashjr b77b4eda8d Bugfix: Replace bashisms with standard sh to fix build on non-BASH systems 2014-10-03 23:45:26 +00:00
Cory Fields 9fedafba4b build: Fix OSX build when using Homebrew and qt5
Qt5 is bottled, so configure won't find it without some help. Use
brew to find out its prefix.

Also, qt5 added the host_bins variable to pkg-config, use it.
2014-10-01 19:26:29 -04:00
randy-waterhouse e2a98d270d Update obsolete AC macros. 2014-09-16 23:17:20 +12:00
randy-waterhouse 52a5f90360 Create the common location for all m4 autotool build scripts, build-aux/m4.
Update .gitignore.
2014-09-16 11:55:15 +02:00