From 8fbaf3006bbbaf04824ee37197af33d9340033d2978f660cb0d74feed584e939 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Wed, 24 Feb 2010 01:23:45 +0000 Subject: [PATCH] Accepting request 33138 from Base:System Copy from Base:System/pcp based on submit request 33138 from user msmeissn OBS-URL: https://build.opensuse.org/request/show/33138 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pcp?expand=0&rev=12 --- pcp-pic.diff | 73 ++++++++++++++++++++++++++++++++++ pcp.changes | 5 +++ pcp.spec | 110 +++------------------------------------------------ 3 files changed, 84 insertions(+), 104 deletions(-) create mode 100644 pcp-pic.diff diff --git a/pcp-pic.diff b/pcp-pic.diff new file mode 100644 index 0000000..e48cc32 --- /dev/null +++ b/pcp-pic.diff @@ -0,0 +1,73 @@ +--- + src/include/builddefs.in | 2 +- + src/include/buildrules | 2 +- + src/pmdas/simple/GNUmakefile.install | 2 +- + src/pmdas/trace/GNUmakefile.stub | 2 +- + src/pmdas/trivial/GNUmakefile.install | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) + +Index: pcp-2.5.0/src/include/builddefs.in +=================================================================== +--- pcp-2.5.0.orig/src/include/builddefs.in ++++ pcp-2.5.0/src/include/builddefs.in +@@ -56,7 +56,7 @@ PTHREAD_LIB=@ac_cv_pthread_lib@ + PCP_LIBS = -L$(TOPDIR)/src/libpcp/src -L$(TOPDIR)/src/libpcp_pmda/src + + # platform-specific CFLAGS, LDLIBS, and shared library extension +-PCFLAGS = -fpic -fno-strict-aliasing ++PCFLAGS = -fPIC -fno-strict-aliasing + DSOSUFFIX = so + EXECSUFFIX = + PLDFLAGS = +Index: pcp-2.5.0/src/include/buildrules +=================================================================== +--- pcp-2.5.0.orig/src/include/buildrules ++++ pcp-2.5.0/src/include/buildrules +@@ -41,7 +41,7 @@ ifeq ($(TARGET_OS), linux) + _SHAREDOPTS = -shared -Wl,-soname,$(LIBTARGET) + endif + ifeq ($(TARGET_OS), solaris) +-_SHAREDOPTS = -shared -fpic ++_SHAREDOPTS = -shared -fPIC + endif + ifeq ($(TARGET_OS), darwin) + # libtool doesnt understand -dynamiclib so we need both +Index: pcp-2.5.0/src/pmdas/simple/GNUmakefile.install +=================================================================== +--- pcp-2.5.0.orig/src/pmdas/simple/GNUmakefile.install ++++ pcp-2.5.0/src/pmdas/simple/GNUmakefile.install +@@ -44,7 +44,7 @@ LDOPTS = + LDLIBS = -lpcp_pmda -lpcp + + ifeq "$(PCP_PLATFORM)" "solaris" +-DSOOPTS = -fpic -shared ++DSOOPTS = -fPIC -shared + else + DSOOPTS = -shared -Wl,-soname,$(LIBTARGET) + endif +Index: pcp-2.5.0/src/pmdas/trace/GNUmakefile.stub +=================================================================== +--- pcp-2.5.0.orig/src/pmdas/trace/GNUmakefile.stub ++++ pcp-2.5.0/src/pmdas/trace/GNUmakefile.stub +@@ -28,7 +28,7 @@ CFILES = stub.c + CFLAGS += -DPMTRACE_DEBUG + HAVE_64 = $(shell test `uname -m` = "ia64" && echo 1 || echo 0) + ifeq ($(HAVE_64), 1) +-CFLAGS += -fpic -fno-strict-aliasing ++CFLAGS += -fPIC -fno-strict-aliasing + endif + LDIRT = lib lib32 lib64 + +Index: pcp-2.5.0/src/pmdas/trivial/GNUmakefile.install +=================================================================== +--- pcp-2.5.0.orig/src/pmdas/trivial/GNUmakefile.install ++++ pcp-2.5.0/src/pmdas/trivial/GNUmakefile.install +@@ -44,7 +44,7 @@ LDOPTS = + LDLIBS = -lpcp_pmda -lpcp + + ifeq "$(PCP_PLATFORM)" "solaris" +-DSOOPTS = -fpic -shared ++DSOOPTS = -fPIC -shared + else + DSOOPTS = -shared -Wl,-soname,$(LIBTARGET) + endif diff --git a/pcp.changes b/pcp.changes index c5e8a99..14c3f40 100644 --- a/pcp.changes +++ b/pcp.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Feb 11 00:44:51 UTC 2010 - jengelh@medozas.de + +- SPARC requiers use large PIC + ------------------------------------------------------------------- Wed Jun 10 10:55:48 CEST 2009 - coolo@novell.com diff --git a/pcp.spec b/pcp.spec index 5a2a6a3..aadc5db 100644 --- a/pcp.spec +++ b/pcp.spec @@ -1,7 +1,7 @@ # # spec file for package pcp (Version 2.5.0) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,9 +21,9 @@ Name: pcp BuildRequires: bison flex gcc-c++ ncurses-devel procps Version: 2.5.0 -Release: 129 +Release: 130 Summary: Performance Co-Pilot (system-level performance monitoring) -License: GPL v2 or later +License: GPLv2+ Url: http://oss.sgi.com/projects/pcp Group: System/Monitoring Source: pcp-%{version}.src.tar.gz @@ -35,6 +35,7 @@ Patch4: pcp-init.patch Patch5: pcp-2.5.0-buffer-overflow.diff Patch6: pcp-xenbuild.patch Patch7: pcp-2.5.0-GCC44.patch +Patch8: pcp-pic.diff PreReq: %insserv_prereq %fillup_prereq permissions BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -51,7 +52,7 @@ Authors: %package devel Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/C and C++ -License: GPL v2 or later +License: GPLv2+ Requires: %{name} = %{version} %description devel @@ -74,6 +75,7 @@ Authors: %patch5 %patch6 %patch7 -p1 +%patch -P 8 -p1 %build %{suse_update_config -f} @@ -264,103 +266,3 @@ fi exit 0 %changelog -* Wed Jun 10 2009 coolo@novell.com -- filter out -fomit-frame-pointer to fix build -* Tue Jun 09 2009 coolo@novell.com -- continue previous work -* Wed Feb 25 2009 crrodriguez@suse.de -- fix build with GCC44, #ident is a deprecated GCC extension -* Thu Nov 06 2008 ro@suse.de -- fix build failure in obs -* Tue Oct 07 2008 kukuk@suse.de -- Fix possible buffer overflow -* Thu Aug 28 2008 cthiel@suse.de -- fix init scripts -* Wed Dec 05 2007 ro@suse.de -- fix build with gcc-4.3 - (package could possibly be updated anyway) -* Thu Jul 12 2007 rw@suse.de -- Split off development package. -* Fri Mar 30 2007 ro@suse.de -- Add procps,ncurses-devel,bison to buildreq. -* Fri Jun 16 2006 schwab@suse.de -- Set datadir. -- Use RPM_OPT_FLAGS. -* Fri Jun 02 2006 rw@suse.de -- Remove fake dependency on gdbm-devel headers. (#177730) -* Wed Jan 25 2006 mls@suse.de -- Convert neededforbuild to BuildRequires -* Mon Jan 16 2006 rw@suse.de -- Update to version 2.5.0. (FATE 153129) -* Thu Oct 20 2005 rw@suse.de -- Fix permission of a demo directory. (#129486) -* Sat Apr 09 2005 coolo@suse.de -- Fix gcc4 compilation -* Fri Nov 12 2004 ro@suse.de -- Correct permissions handling for pmpost -* Mon Oct 18 2004 nashif@suse.de -- Update to version 2.4.0 -* Wed Apr 28 2004 nashif@suse.de -- #39324: fixes for SuSE and 2.6 kernels in general from SGI -* Tue Mar 16 2004 nashif@suse.de -- Update to version 2.3.2 -* Wed Nov 05 2003 ro@suse.de -- package according to permissions.secure and add run_permissions -- don't build as root -* Mon Jul 21 2003 nashif@suse.de -- update to version 2.3.1 -* Thu Jun 19 2003 nashif@suse.de -- Update to version 2.3.0 -- Fixed file list -* Fri Apr 11 2003 ro@suse.de -- fix build with coreutils - (deprecated calling syntax for head,tail,sort) -* Mon Jan 20 2003 ro@suse.de -- make it compile with latest glibc (pcp-2.2.2-st_mtime.patch) -* Mon Dec 02 2002 ro@suse.de -- include errno.h where needed -- use yacc instead of bison for now (make it compile) -* Fri Aug 16 2002 nashif@suse.de -- Fixed bug #17954: Added PreReq -* Thu Apr 25 2002 coolo@suse.de -- fix build for x86_64 and s390x -* Fri Feb 15 2002 nashif@suse.de -- fix bug #13321: made init script pmie LSB compliant - - Added header note - - Status returns correct value -- Fixed pcp init script: status did not work -* Fri Jan 18 2002 nashif@suse.de -- Update to version 2.2.2 -* Thu Dec 06 2001 nashif@suse.de -- Removed START_ variable -- Changed escaped { to non escaped to stop awk from complaining -* Mon Jul 09 2001 nashif@suse.de -- Update to version 2.2.1 -- Fixed bug # 9068 -* Thu Jun 07 2001 nashif@suse.de -- fixed configure.in -* Wed May 09 2001 mfabian@suse.de -- bzip2 sources -* Thu Mar 15 2001 nashif@suse.de -- added -fpic to fix compile error on ia64 -* Fri Feb 09 2001 nashif@suse.de -- Update headers -- Modified init scripts -* Sun Dec 03 2000 nashif@suse.de -- Fixed %%post (exit before insserv) -- Added sub-package pcp-mysql -- Added mysql PMDA to monitor mysql sessions -* Thu Nov 30 2000 nashif@suse.de -- Update to 2.2.11 -* Wed Nov 29 2000 ro@suse.de -- move rcscript to etc/init.d -* Sun Nov 26 2000 nashif@suse.de -- Use insserv -* Mon Oct 30 2000 nashif@suse.de -- Update to version 2.2.10 -* Wed Sep 27 2000 nashif@suse.de -- Update to 2.1.7 -* Fri Jul 07 2000 kukuk@suse.de -- Fix for SPARC -* Wed May 24 2000 nashif@suse.de -- Initial Release (2.1.4)