Commit b97a5aeb authored by Boris Pek's avatar Boris Pek

Delete all patches: available in upstream now.

parent 5b9aac75
Description: Use LDFLAGS variable from build environment
Origin: upstream, https://github.com/psi-plus/qconf/commit/851a9d9
Author: Boris Pek <tehnick-8@mail.ru>
Last-Update: 2016-10-20
diff --git a/qconf.pro b/qconf.pro
--- a/qconf.pro
+++ b/qconf.pro
@@ -16,10 +16,19 @@
}
!isEmpty(CXXFLAGS) {
+ QMAKE_CXXFLAGS = $$CXXFLAGS
QMAKE_CXXFLAGS_DEBUG = $$CXXFLAGS
QMAKE_CXXFLAGS_RELEASE = $$CXXFLAGS
}
+isEmpty(LDFLAGS) {
+ LDFLAGS=$$(LDFLAGS)
+}
+
+!isEmpty(LDFLAGS) {
+ QMAKE_LFLAGS = $$LDFLAGS
+}
+
!isEmpty(DATADIR) {
contains($$list($$[QT_VERSION]), 4.0.*|4.1.*) {
DEFINES += DATADIR=\"$$DATADIR\"
Description: Remove bashism from configure
Origin: upstream, https://github.com/psi-plus/qconf/commit/13505e3
Last-Update: 2016-10-20
diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -173,7 +173,7 @@
printf "Verifying Qt build environment ... "
if [ -z "$QC_QTSELECT" ]; then
- QC_QTSELECT="${QT_SELECT/qt/}"
+ QC_QTSELECT="$(echo $QT_SELECT | tr -d "qt")"
fi
if [ ! -z "$QC_QTSELECT" ]; then
add-hardening-flags-in-compiler-options.patch
remove-bashism-from-configure.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment