24c2d0e20f
- Update to 3.11.8 See http://git.pcp.io/cgi-bin/gitweb.cgi?p=pcp/pcp.git;a=blob_plain;f=CHANGELOG;hb=3.11.8 for details. - Remove 0010-build-do-not-include-.gitignore-in-installed-file-se.patch + Upstream - Drop pcp-webjs.src.tar.gz + https://github.com/performancecopilot/pcp-webjs/issues/3 + Vector will be pulled in from the upstream source in future - Enable pmda-systemd package + libsystemd pkg-config detection fixed upstream - New packages + pcp-devel: Upstream split of non-essential devel packages from libpcp-devel + pcp-pmda-bind2 + pcp-pmda-docker + pcp-pmda-lio + pcp-pmda-nutcracker + pcp-pmda-oracle + pcp-pmda-redis + pcp-pmda-libvirt + pcp-export-pcp2influxdb - Update to 3.10.9 See http://git.pcp.io/cgi-bin/gitweb.cgi?p=pcp/pcp.git;a=blob_plain;f=CHANGELOG;hb=3.10.9 for details. - Drop obsolete 0001-Fix-XEN-build.patch + PCP_PS_ALL_FLAGS now used explicitly - Add 0010-build-do-not-include-.gitignore-in-installed-file-se.patch - Split out a number of agents from the base package into separate rpms - Disable sheet2pcp OBS-URL: https://build.opensuse.org/request/show/483206 OBS-URL: https://build.opensuse.org/package/show/Base:System/pcp?expand=0&rev=49
81 lines
3.0 KiB
Diff
81 lines
3.0 KiB
Diff
From 4f195b3a280a2ced27028a210ae88724f6fe56d8 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
|
|
Date: Tue, 3 Feb 2015 14:15:10 +0100
|
|
Subject: [PATCH 7/7] Honor CFLAGS in qmake
|
|
|
|
rpm complained about files not compile with RPM_OPT_FLAGS
|
|
|
|
http://stackoverflow.com/questions/17578150/add-cflags-to-qmake-project-without-hard-coding-them-in-the-pro-file
|
|
---
|
|
src/libpcp_qed/src/libpcp_qed.pro | 1 +
|
|
src/libpcp_qmc/src/libpcp_qmc.pro | 1 +
|
|
src/libpcp_qwt/src/libpcp_qwt.pro | 1 +
|
|
src/pmdumptext/pmdumptext.pro | 1 +
|
|
src/pmquery/pmquery.pro | 1 +
|
|
src/pmtime/pmtime.pro | 1 +
|
|
6 files changed, 6 insertions(+)
|
|
|
|
Index: pcp-3.11.8/src/libpcp_qed/src/libpcp_qed.pro
|
|
===================================================================
|
|
--- pcp-3.11.8.orig/src/libpcp_qed/src/libpcp_qed.pro
|
|
+++ pcp-3.11.8/src/libpcp_qed/src/libpcp_qed.pro
|
|
@@ -6,6 +6,7 @@ INCLUDEPATH += ../../include ../../libpc
|
|
release:DESTDIR = build/debug
|
|
debug:DESTDIR = build/release
|
|
QT = core gui network printsupport svg widgets
|
|
+QMAKE_CXXFLAGS += $$(PCP_CFLAGS)
|
|
|
|
HEADERS = qed.h \
|
|
qed_actionlist.h \
|
|
Index: pcp-3.11.8/src/libpcp_qmc/src/libpcp_qmc.pro
|
|
===================================================================
|
|
--- pcp-3.11.8.orig/src/libpcp_qmc/src/libpcp_qmc.pro
|
|
+++ pcp-3.11.8/src/libpcp_qmc/src/libpcp_qmc.pro
|
|
@@ -5,6 +5,7 @@ CONFIG += qt staticlib warn_on
|
|
INCLUDEPATH += ../../include
|
|
release:DESTDIR = build/debug
|
|
debug:DESTDIR = build/release
|
|
+QMAKE_CXXFLAGS += $$(PCP_CFLAGS)
|
|
|
|
HEADERS = qmc_context.h qmc_desc.h qmc_group.h \
|
|
qmc_indom.h qmc_metric.h qmc_source.h \
|
|
Index: pcp-3.11.8/src/libpcp_qwt/src/libpcp_qwt.pro
|
|
===================================================================
|
|
--- pcp-3.11.8.orig/src/libpcp_qwt/src/libpcp_qwt.pro
|
|
+++ pcp-3.11.8/src/libpcp_qwt/src/libpcp_qwt.pro
|
|
@@ -8,6 +8,7 @@ QT = core gui network svg
|
|
greaterThan(QT_MAJOR_VERSION, 4) {
|
|
QT += concurrent printsupport
|
|
}
|
|
+QMAKE_CXXFLAGS += $$(PCP_CFLAGS)
|
|
|
|
HEADERS += \
|
|
qwt.h \
|
|
Index: pcp-3.11.8/src/pmdumptext/pmdumptext.pro
|
|
===================================================================
|
|
--- pcp-3.11.8.orig/src/pmdumptext/pmdumptext.pro
|
|
+++ pcp-3.11.8/src/pmdumptext/pmdumptext.pro
|
|
@@ -10,3 +10,4 @@ LIBS += -L../libpcp_qmc/src -L../libpcp
|
|
LIBS += -lpcp_qmc -lpcp
|
|
win32:LIBS += -lwsock32 -liphlpapi
|
|
QT -= gui
|
|
+QMAKE_CXXFLAGS += $$(PCP_CFLAGS)
|
|
Index: pcp-3.11.8/src/pmquery/pmquery.pro
|
|
===================================================================
|
|
--- pcp-3.11.8.orig/src/pmquery/pmquery.pro
|
|
+++ pcp-3.11.8/src/pmquery/pmquery.pro
|
|
@@ -8,3 +8,4 @@ CONFIG += qt warn_on
|
|
QT += widgets
|
|
release:DESTDIR = build/debug
|
|
debug:DESTDIR = build/release
|
|
+QMAKE_CXXFLAGS += $$(PCP_CFLAGS)
|
|
Index: pcp-3.11.8/src/pmtime/pmtime.pro
|
|
===================================================================
|
|
--- pcp-3.11.8.orig/src/pmtime/pmtime.pro
|
|
+++ pcp-3.11.8/src/pmtime/pmtime.pro
|
|
@@ -22,3 +22,4 @@ LIBS += -lpcp_qwt -lpcp_qmc -lpcp
|
|
win32:LIBS += -lwsock32 -liphlpapi
|
|
QT += network widgets
|
|
QMAKE_INFO_PLIST = pmtime.info
|
|
+QMAKE_CXXFLAGS += $$(PCP_CFLAGS)
|