Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-02 14:16:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

CONFIG shouldn't be reset at qmake call, use CONFIG+=… instead

Browse source 
With CONFIG=…, the default values of CONFIG are cleared, with qt4 this
doesn't seem to be a problem, but with qt5 the build fails.

CONFIG=staticlib in openpgpsdk.pro was added in 3caeb0ab7f
for OS X, but is not necessary on linux
This commit is contained in:
AsamK 2015-08-31 21:40:52 +02:00
parent 829c2f396e
commit 2be400e33e
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build_scripts/Debian+Ubuntu/debian/rules
View file

@ -3,7 +3,7 @@
configure: configure-stamp
configure-stamp:
dh_testdir
cd src && qmake-qt4 CONFIG=release PREFIX=/usr LIB_DIR=/usr/lib RetroShare.pro
cd src && qmake-qt4 "CONFIG-=debug" "CONFIG+=release" PREFIX=/usr LIB_DIR=/usr/lib RetroShare.pro
touch $@

2
build_scripts/RedHat+Fedora/retroshare06.spec
View file

@ -56,7 +56,7 @@ cd lib/sqlcipher
make
cd -
cd src
qmake-qt4 CONFIG=release PREFIX=%{_prefix} LIB_DIR=%{_libdir} RetroShare.pro
qmake-qt4 "CONFIG-=debug" "CONFIG+=release" PREFIX=%{_prefix} LIB_DIR=%{_libdir} RetroShare.pro
make
cd -