make qmake accept pre-defined --param options #2211

pull tomboy-64 wants to merge 1 commits into bitcoin:master from tomboy-64:master changing 1 files +2 −2

tomboy-64 commented at 10:19 PM on January 23, 2013: none

This fixes qmake-breakage in case the build-system has other --param options pre-defined in its CFLAGS.

Update bitcoin-qt.pro

This fixes qmake-breakage in case the build-system has other --param options pre-defined in its CFLAGS.

97c92f6f1b

tomboy-64 cross-referenced this on Jan 23, 2013 from issue qmake breaks upon pre-defined system wide --param options by tomboy-64
BitcoinPullTester commented at 1:05 AM on January 24, 2013: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/97c92f6f1b87c6637fa7e19599b5a45005741990 for binaries and test log.
in bitcoin-qt.pro:None in 97c92f6f1b
```
  34 | @@ -35,8 +35,8 @@ contains(RELEASE, 1) {
  35 |  
  36 |  !win32 {
  37 |  # for extra security against potential buffer overflows: enable GCCs Stack Smashing Protection
  38 | -QMAKE_CXXFLAGS *= -fstack-protector-all
  39 | -QMAKE_LFLAGS *= -fstack-protector-all
  40 | +QMAKE_CXXFLAGS *= -fstack-protector-all "--param ssp-buffer-size=1"
  41 | +QMAKE_LFLAGS *= -fstack-protector-all "--param ssp-buffer-size=1"
```
laanwj commented at 8:38 AM on January 24, 2013:

This adds a parameter "--param ssp-buffer-size=1". How does that help compilation when other params are added?

Diapolo commented at 9:02 AM on January 24, 2013:

Some time ago I wanted to add this switch, but Gavin told me the -all includes this. Perhaps this pull is based on an old version of my pull-request?

tomboy-64 commented at 5:54 PM on January 24, 2013:

It's based on 0.7.2, not git. in current HEAD the option is not there. The error I described occurs with 0.7.2 and probably other older releases.

laanwj commented at 6:28 PM on January 24, 2013:

Ok, if it's already solved then I'm closing this pull

luke-jr commented at 6:28 PM on January 24, 2013:

So master does NOT have the overall problem, correct?

laanwj commented at 7:24 PM on January 24, 2013:

That's what I understood, as there are no --params in master, they also can't interfere with other options.
laanwj closed this on Jan 24, 2013
luke-jr referenced this in commit 91ea937170 on Aug 16, 2013
bitcoin locked this on Sep 8, 2021

Contributors

Linked (view graph)

#2196 qmake breaks upon pre-defined system wide --param options