[Pkg-bitcoin-devel] Merging updates from onlyjob-guest git repo

[Petter Reinholdtsen]

[Petter Reinholdtsen]
>[Dmitry Smirnov]
>> I've seen your recent changes but in the above repository you may find few 
>> nice improvements like
>> 
>>   * build-time GUI translations refresh.
>>   * post-build tests.
>>   * hardening workaround for qmake.
>>   * workaround for FTBFS on GNU Hurd.
>>   * misc. lintianisations.
>> 
>> I'm lacking skills and time necessary to translate those changes to CDBS so 
>> I'll be very happy if you'll be able to borrow anything from my packaging.
> 
> I'm not too skilled with CDBS myself, but less(1) is my friend. :)
> 
> Btw, I find debian/bitcoin.1 but no bitcoin-qt.1.  How come?  And why
> isn't it in the manpages directory?

Also, the bitcoin.1 manual page claim to be generated from some info
page, and suggest to look up bitcoin there.  But I fail to find any
info page.  Where did this manual page come from?  I added it to the
collab-maint git repository, but am unsure if it really make sense to
have both bitcoin-qt.1 and bitcoind.1.  They are very similar.

> I'll look more into it later, when things slow down here at home.

I had a look at hardening the bitcoin-qt program, using the attached
patch.  But it do not work.  The linker fail with this message:

  collect2: error: ld returned 1 exit status

Not quite sure how to debug that.  Anyone have any idea what is going
wrong?

BTW, what exactly was the hurd workaround?  I did not find anything
relevant on first look. :)

-- 
Happy hacking
Petter Reinholdtsen
-------------- next part --------------
diff --git a/debian/rules b/debian/rules
index ab9c814..b9dda5f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -87,7 +87,13 @@ DEB_INSTALL_DOCS_ALL =
 pre-build::
 	mkdir -p src/obj/nogui
 	mkdir -p debian/home/.bitcoin
-	qmake USE_DBUS=1 USE_QRCODE=1
+	qmake USE_DBUS=1 USE_QRCODE=1 \
+	  QMAKE_CFLAGS_RELEASE="$(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)" \
+	  QMAKE_CFLAGS_DEBUG="$(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)" \
+	  QMAKE_CXXFLAGS_RELEASE="$(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)" \
+	  QMAKE_CXXFLAGS_DEBUG="$(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)" \
+	  QMAKE_LFLAGS_RELEASE="$(shell dpkg-buildflags --get LDFLAGS)" \
+	  QMAKE_LFLAGS_DEBUG="$(shell dpkg-buildflags --get LDFLAGS)"
 
 clean::
 	[ ! -f Makefile ] || make distclean # Clean up after qmake