Hello community, here is the log from the commit of package cpufrequtils for openSUSE:Factory checked in at 2012-03-17 13:20:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cpufrequtils (Old) and /work/SRC/openSUSE:Factory/.cpufrequtils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cpufrequtils", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/cpufrequtils/cpufrequtils.changes 2011-12-07 14:37:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cpufrequtils.new/cpufrequtils.changes 2012-03-17 13:20:17.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 15 15:16:14 UTC 2012 - [email protected] + +- don't build cpufreq-aperf and turbostat for ppc and ppc64 + +------------------------------------------------------------------- New: ---- cpufrequtils-no-aperf-on-ppc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cpufrequtils.spec ++++++ --- /var/tmp/diff_new_pack.LDCeSz/_old 2012-03-17 13:20:21.000000000 +0100 +++ /var/tmp/diff_new_pack.LDCeSz/_new 2012-03-17 13:20:21.000000000 +0100 @@ -29,6 +29,7 @@ Source: %{name}-%{version}.tar.bz2 Source2: baselibs.conf Source3: turbostat-%{turbostat_version}.tar.bz2 +Patch1: cpufrequtils-no-aperf-on-ppc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # bug437293 %ifarch ppc64 @@ -66,6 +67,9 @@ %prep %setup -q -a 3 +%ifarch ppc ppc64 +%patch1 -p1 +%endif %build # This package failed when testing with -Wl,-as-needed being default. @@ -74,10 +78,12 @@ CONF="PACKAGE_BUGREPORT=http://bugs.opensuse.org mandir=%_mandir libdir=%_libdir CPUFRQ_BENCH=true STRIP=true" export CFLAGS="$RPM_OPT_FLAGS" make $CONF %{?_smp_mflags} +%ifnarch ppc ppc64 cd turbostat export CFLAGS="$CFLAGS -D_GNU_SOURCE" make %{?_smp_mflags} cd .. +%endif %install CONF="PACKAGE_BUGREPORT=http://bugs.opensuse.org mandir=%_mandir libdir=%_libdir CPUFRQ_BENCH=true DESTDIR=$RPM_BUILD_ROOT sbindir=/usr/sbin docdir=%{_docdir}/%{name} confdir=/etc" @@ -90,8 +96,10 @@ mkdir -p $RPM_BUILD_ROOT/%{_sbindir} mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man8 +%ifnarch ppc ppc64 install -D -m 0755 turbostat/turbostat $RPM_BUILD_ROOT/%{_sbindir} install -D -m 0644 turbostat/turbostat.8.gz $RPM_BUILD_ROOT/%{_mandir}/man8 +%endif %post -p /sbin/ldconfig @@ -101,11 +109,13 @@ %defattr (-,root,root) %{_libdir}/libcpufreq.*.0 %{_mandir}/man1/cpufreq* +%ifnarch ppc ppc64 %{_mandir}/man8/turbostat* %{_sbindir}/turbostat +/usr/bin/cpufreq-aperf +%endif /usr/bin/cpufreq-info /usr/bin/cpufreq-set -/usr/bin/cpufreq-aperf %files bench %defattr (-,root,root) ++++++ cpufrequtils-no-aperf-on-ppc.patch ++++++ Index: cpufrequtils-008/Makefile =================================================================== --- cpufrequtils-008.orig/Makefile +++ cpufrequtils-008/Makefile @@ -118,7 +118,7 @@ WARNINGS += -Wshadow CPPFLAGS += -DVERSION=\"$(VERSION)\" -DPACKAGE=\"$(PACKAGE)\" \ -DPACKAGE_BUGREPORT=\"$(PACKAGE_BUGREPORT)\" -D_GNU_SOURCE -UTIL_SRC = utils/info.c utils/set.c utils/aperf.c utils/cpuid.h +UTIL_SRC = utils/info.c utils/set.c LIB_HEADERS = lib/cpufreq.h lib/interfaces.h LIB_SRC = lib/cpufreq.c LIB_OBJS = lib/cpufreq.o @@ -199,7 +199,7 @@ cpufreq-%: libcpufreq.so.$(LIB_MAJ) $(UT $(QUIET) $(CC) $(CFLAGS) $(LDFLAGS) -L. -o $@ utils/[email protected] -lcpufreq $(QUIET) $(STRIPCMD) $@ -utils: cpufreq-info cpufreq-set cpufreq-aperf +utils: cpufreq-info cpufreq-set po/$(PACKAGE).pot: $(UTIL_SRC) @xgettext --default-domain=$(PACKAGE) --add-comments \ @@ -226,7 +226,7 @@ compile-bench: libcpufreq clean: -find . \( -not -type d \) -and \( -name '*~' -o -name '*.[oas]' \) -type f -print \ | xargs rm -f - -rm -f cpufreq-info cpufreq-set cpufreq-aperf + -rm -f cpufreq-info cpufreq-set -rm -f libcpufreq.so* -rm -f build/ccdv -rm -rf po/*.gmo po/*.pot @@ -243,7 +243,6 @@ install-tools: $(INSTALL) -d $(DESTDIR)${bindir} $(INSTALL_PROGRAM) cpufreq-set $(DESTDIR)${bindir}/cpufreq-set $(INSTALL_PROGRAM) cpufreq-info $(DESTDIR)${bindir}/cpufreq-info - $(INSTALL_PROGRAM) cpufreq-aperf $(DESTDIR)${bindir}/cpufreq-aperf install-man: $(INSTALL_DATA) -D man/cpufreq-set.1 $(DESTDIR)${mandir}/man1/cpufreq-set.1 @@ -267,7 +266,6 @@ uninstall: - rm -f $(DESTDIR)${includedir}/cpufreq.h - rm -f $(DESTDIR)${bindir}/cpufreq-set - rm -f $(DESTDIR)${bindir}/cpufreq-info - - rm -f $(DESTDIR)${bindir}/cpufreq-aperf - rm -f $(DESTDIR)${mandir}/man1/cpufreq-set.1 - rm -f $(DESTDIR)${mandir}/man1/cpufreq-info.1 - for HLANG in $(LANGUAGES); do \ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
