From 571c715a45218f2b9321f36a5ff30454aca80aac Mon Sep 17 00:00:00 2001 From: randy-waterhouse Date: Fri, 20 May 2016 16:14:23 +1200 Subject: [PATCH 1/4] Remove errant ']' from configure.ac --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 208d9475..b2e84c37 100644 --- a/configure.ac +++ b/configure.ac @@ -321,7 +321,7 @@ AC_DEFINE_UNQUOTED([ENABLE_DBB_APP],[1],[Define to 1 to enable the dbb app]) fi if test x$bitcoin_enable_qt = xno; then - if test x$enable_daemon] = xno; then + if test x$enable_daemon = xno; then AM_CONDITIONAL([ENABLE_DBB_APP],[test x$enable_daemon = xyes]) else AM_CONDITIONAL([ENABLE_DBB_APP],[test x$enable_daemon = xyes]) From c282ac910286d4eb743c3e9c554cf4b2a1967032 Mon Sep 17 00:00:00 2001 From: randy-waterhouse Date: Mon, 4 Sep 2017 22:46:17 +1200 Subject: [PATCH 2/4] Add --enable-libusb to configure for depends builds. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8d595cd9..0863c4db 100644 --- a/README.md +++ b/README.md @@ -92,7 +92,7 @@ Optionally probably want to create out-of-tree directory to save latest source & make -j4 BASE_CACHE=(absolute-path-here)/deps-cache/ SOURCES_PATH=(absolute-path-here)/deps-cache/sources/ cd .. ./autogen.sh - ./configure --prefix=`pwd`/depends/x86_64-pc-linux-gnu --enable-debug --with-gui=qt5 + ./configure --prefix=`pwd`/depends/x86_64-pc-linux-gnu --enable-debug --with-gui=qt5 --enable-libusb make From 41341af5f40a998e175a15cdd1a714cb29f8c588 Mon Sep 17 00:00:00 2001 From: randy-waterhouse Date: Mon, 4 Sep 2017 23:36:43 +1200 Subject: [PATCH 3/4] Remove libbtc.pc ; this file will be auto-generated by libbtc.pc.in --- src/libbtc/libbtc.pc | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 src/libbtc/libbtc.pc diff --git a/src/libbtc/libbtc.pc b/src/libbtc/libbtc.pc deleted file mode 100644 index 4586da4a..00000000 --- a/src/libbtc/libbtc.pc +++ /dev/null @@ -1,12 +0,0 @@ -prefix=/usr/local -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: libbtc -Description: C library for manipulating bitcoin data structures -URL: https://github.com/jonasschnelli/libbtc -Version: 0.1 -Cflags: -I${includedir} -Libs: -L${libdir} -lbtc - From 785ebd189b8a2cbe021fa043e9420722f0ed353f Mon Sep 17 00:00:00 2001 From: randy-waterhouse Date: Mon, 4 Sep 2017 23:41:40 +1200 Subject: [PATCH 4/4] Add in fix_qt_pkconfig.patch for depends builds. (May need to add to depends/patches/qt_mm/ also?) --- depends/patches/qt/fix_qt_pkgconfig.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 depends/patches/qt/fix_qt_pkgconfig.patch diff --git a/depends/patches/qt/fix_qt_pkgconfig.patch b/depends/patches/qt/fix_qt_pkgconfig.patch new file mode 100644 index 00000000..34302a9f --- /dev/null +++ b/depends/patches/qt/fix_qt_pkgconfig.patch @@ -0,0 +1,11 @@ +--- old/qtbase/mkspecs/features/qt_module.prf ++++ new/qtbase/mkspecs/features/qt_module.prf +@@ -245,7 +245,7 @@ + load(qt_targets) + + # this builds on top of qt_common +-!internal_module:!lib_bundle:if(unix|mingw) { ++unix|mingw { + CONFIG += create_pc + QMAKE_PKGCONFIG_DESTDIR = pkgconfig + host_build: \