Hello community, here is the log from the commit of package schedtop for openSUSE:Factory checked in at Thu Mar 24 17:38:07 CET 2011.
-------- --- schedtop/schedtop.changes 2009-08-02 17:14:20.000000000 +0200 +++ /mounts/work_src_done/STABLE/schedtop/schedtop.changes 2011-03-17 12:40:46.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Mar 17 12:35:51 CET 2011 - [email protected] + +- Use CXXFLAGS for compiler options not CFLAGS. +- Compile using RPM_OPT_FLAGS. +- Default since boost 1.46.0 is boost::filesystem v3 so adapt to + the changes. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- schedtop-boost_filesystem_changes.patch schedtop-cxxflags.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ schedtop.spec ++++++ --- /var/tmp/diff_new_pack.YlwNJ8/_old 2011-03-24 17:37:47.000000000 +0100 +++ /var/tmp/diff_new_pack.YlwNJ8/_new 2011-03-24 17:37:47.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package schedtop (Version 1.1) +# spec file for package schedtop # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -31,11 +31,13 @@ Name: schedtop Version: 1.1 -Release: 3 +Release: 13 License: GPL Requires: ncurses Group: System/Monitoring Source: %{name}-%{version}.tar.gz +Patch0: schedtop-cxxflags.patch +Patch1: schedtop-boost_filesystem_changes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -50,9 +52,11 @@ %prep %setup +%patch0 +%patch1 %build -make +make CXXFLAGS="%{optflags}" %install make install PREFIX=$RPM_BUILD_ROOT ++++++ schedtop-boost_filesystem_changes.patch ++++++ Index: schedtop.cc =================================================================== --- schedtop.cc.orig 2009-03-25 01:24:52.000000000 +0100 +++ schedtop.cc 2011-03-17 12:19:45.617622677 +0100 @@ -267,21 +267,21 @@ void ProcSnapshot(StatMap &smap) fs::directory_iterator end; for (fs::directory_iterator iter("/proc"); iter != end; ++iter) { - std::string path(iter->string() + "/schedstat"); + std::string path(iter->path().string() + "/schedstat"); if (fs::exists(path)) { std::ifstream is(path.c_str()); if (!is.is_open()) throw std::runtime_error("could not open " + path); - Importer importer(smap, is, iter->string() + "/"); + Importer importer(smap, is, iter->path().string() + "/"); importer += "sched_info.cpu_time"; importer += "sched_info.run_delay"; importer += "sched_info.pcount"; } - path = iter->string() + "/sched"; + path = iter->path().string() + "/sched"; if (fs::exists(path)) { std::ifstream is(path.c_str()); @@ -312,7 +312,7 @@ void ProcSnapshot(StatMap &smap) lis >> tmp; Importer importer(smap, lis, - iter->string() + "/"); + iter->path().string() + "/"); importer += type; } ++++++ schedtop-cxxflags.patch ++++++ Index: Makefile =================================================================== --- Makefile.orig 2009-05-22 20:12:28.000000000 +0200 +++ Makefile 2011-03-17 12:00:17.320827379 +0100 @@ -1,5 +1,5 @@ -CFLAGS += -g -O0 +CXXFLAGS += -g -O0 ARCH=$(shell uname -m) OBJDIR ?= obj/$(ARCH) LIBRARIES += -lboost_regex @@ -29,12 +29,12 @@ $(OUTPUT): $(OBJS) $(OBJDIR)/%.o: %.cc Makefile @echo "Compiling (C++) $< to $@" @mkdir -p $(OBJDIR) - $(CXX) $(CFLAGS) $(INCLUDES) -c -o $@ $< + $(CXX) $(CXXFLAGS) $(INCLUDES) -c -o $@ $< $(OBJDIR)/%: @echo "Linking $@" @mkdir -p $(OBJDIR) - $(CXX) $(CFLAGS) $(INCLUDES) -o $@ $(filter %.o %.a,$+) $(LIBDIR) $(LIBRARIES) + $(CXX) $(CXXFLAGS) $(INCLUDES) -o $@ $(filter %.o %.a,$+) $(LIBDIR) $(LIBRARIES) clean: @rm -f $(OBJDIR)/* ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
