pcp/0004-Remove-CPAN-rpaths.patch
David Disseldorp c6102bc9d9 Accepting request 287414 from home:kwk:branches:Base:System
- Update to 3.10.2
  See http://git.pcp.io/cgi-bin/gitweb.cgi?p=pcp/pcp.git;a=blob_plain;f=CHANGELOG;hb=HEAD
  for details
- new patches
  0007-Honor-CFLAGS-in-qmake.patch
  0008-SUSE-fy-pmsnap-control-path.patch
  0009-pmsnap-control-var-www-srv-www.patch 
- renamed patches
  create-pmlogger-and-pmie-logdirs-during-install.patch
  to 0006-create-pmlogger-and-pmie-logdirs-during-install.patch
- Update to 3.10.1
  See http://git.pcp.io/cgi-bin/gitweb.cgi?p=pcp/pcp.git;a=blob_plain;f=CHANGELOG;hb=HEAD
  for details
- new sub-packages
  * pcp-doc
  * pcp-gui
  * python3-pcp
  * python-pcp
  * pmda-infiniband
  * pmda-perfevent
  * pmda-papi
  * import-collectl2pcp
- drop fix_pmie_pmlogger_startup_races.patch, upstream
  drop pcp-3.6.10-gcc5-reservedword.patch, obsolete

OBS-URL: https://build.opensuse.org/request/show/287414
OBS-URL: https://build.opensuse.org/package/show/Base:System/pcp?expand=0&rev=37
2015-02-24 09:27:55 +00:00

54 lines
2.0 KiB
Diff

From a5e63d1f241a9b574c30093a71e41ab7c9f64dc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
Date: Fri, 12 Dec 2014 15:45:33 +0100
Subject: [PATCH 4/6] Remove CPAN rpaths
---
src/perl/LogImport/Makefile.PL | 2 +-
src/perl/MMV/Makefile.PL | 2 +-
src/perl/PMDA/Makefile.PL | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/perl/LogImport/Makefile.PL b/src/perl/LogImport/Makefile.PL
index 20b716dbea6f..89d5f61e67dc 100644
--- a/src/perl/LogImport/Makefile.PL
+++ b/src/perl/LogImport/Makefile.PL
@@ -15,7 +15,7 @@ if ($ENV{TARGET_OS} eq "mingw") {
else {
$ldfrom = "LogImport.o",
$inc = "-I$ENV{PCP_TOPDIR}/src/include/pcp -I/usr/include/pcp";
- $libs = ["-L$ENV{PCP_TOPDIR}/src/libpcp/src -L$ENV{PCP_TOPDIR}/src/libpcp_import/src -lpcp_import -lpcp"];
+ $libs = ["-lpcp_import -lpcp"];
}
if ($ENV{TARGET_OS} eq "darwin") {
# standard ones, minus -arch ppc
diff --git a/src/perl/MMV/Makefile.PL b/src/perl/MMV/Makefile.PL
index 6a85129842fb..3921421ad80c 100644
--- a/src/perl/MMV/Makefile.PL
+++ b/src/perl/MMV/Makefile.PL
@@ -15,7 +15,7 @@ if ($ENV{TARGET_OS} eq "mingw") {
else {
$ldfrom = "MMV.o";
$inc = "-I$ENV{PCP_TOPDIR}/src/include/pcp -I/usr/include/pcp";
- $libs = ["-L$ENV{PCP_TOPDIR}/src/libpcp_mmv/src -L$ENV{PCP_TOPDIR}/src/libpcp/src -lpcp_mmv -lpcp"];
+ $libs = ["-lpcp_mmv -lpcp"];
}
if ($ENV{TARGET_OS} eq "darwin") {
# standard ones, minus -arch ppc
diff --git a/src/perl/PMDA/Makefile.PL b/src/perl/PMDA/Makefile.PL
index 1191a025fedf..7b1155685ae2 100644
--- a/src/perl/PMDA/Makefile.PL
+++ b/src/perl/PMDA/Makefile.PL
@@ -15,7 +15,7 @@ if ($ENV{TARGET_OS} eq "mingw") {
else {
$ldfrom = "local.o PMDA.o";
$inc = "-I$ENV{PCP_TOPDIR}/src/include/pcp -I/usr/include/pcp";
- $libs = ["-L$ENV{PCP_TOPDIR}/src/libpcp_pmda/src -L$ENV{PCP_TOPDIR}/src/libpcp/src -lpcp_pmda -lpcp"];
+ $libs = ["-lpcp_pmda -lpcp"];
}
if ($ENV{TARGET_OS} eq "darwin") {
# standard ones, minus -arch ppc
--
2.1.2