Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not clear RPATH by default on Linux to simplify building from source #3939

Merged
merged 1 commit into from
Dec 9, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions 3rdparty/3rdparty.pri
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,15 @@ unix:macx { # OSX
unix:!macx { # ubuntu & debian
QMAKE_CXXFLAGS += -std=gnu++0x #workaround for google breakpad

# clean default flags
QMAKE_LFLAGS_RPATH=
defined(CLEAN_RPATH, var) { # clean default flags
message("DEB package build")
QMAKE_LFLAGS_RPATH=
QMAKE_LFLAGS = -Wl,-rpath=\\\$$ORIGIN/../lib
QMAKE_LFLAGS += -static-libgcc -static-libstdc++
} else {
# Note: uncomment if qtcreator fails to find QtCore dependencies
#QMAKE_LFLAGS = -Wl,-rpath=/home/user/Qt5.9.3/5.9.3/gcc_64/lib
}

LIBS += -Wl,-rpath=\\\$$ORIGIN/../lib #don't remove!!!
LIBS += $$BREAKPADDIR/client/linux/libbreakpad_client.a
}
2 changes: 1 addition & 1 deletion build/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
dh $@

override_dh_auto_build:
qmake
qmake "CLEAN_RPATH=true"
$(MAKE)

override_dh_auto_install:
Expand Down
3 changes: 1 addition & 2 deletions src/rdm.pro
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,7 @@ unix:!macx { # ubuntu & debian

QTPLUGIN += qsvg qsvgicon

QMAKE_CXXFLAGS += -Wno-sign-compare
QMAKE_LFLAGS += -static-libgcc -static-libstdc++
QMAKE_CXXFLAGS += -Wno-sign-compare

release: DESTDIR = ./../bin/linux/release
debug: DESTDIR = ./../bin/linux/debug
Expand Down