Hello community, here is the log from the commit of package libquo for openSUSE:Factory checked in at 2017-11-09 13:57:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libquo (Old) and /work/SRC/openSUSE:Factory/.libquo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libquo" Thu Nov 9 13:57:09 2017 rev:6 rq:536945 version:1.3 Changes: -------- --- /work/SRC/openSUSE:Factory/libquo/libquo.changes 2017-02-03 17:48:23.197996594 +0100 +++ /work/SRC/openSUSE:Factory/.libquo.new/libquo.changes 2017-11-09 13:57:41.191357922 +0100 @@ -1,0 +2,18 @@ +Thu Oct 26 17:28:56 UTC 2017 - jungh...@votca.org + +- added 29.patch to fix return value for comp_dgemv + +------------------------------------------------------------------- +Wed Oct 25 22:02:45 UTC 2017 - jungh...@votca.org + +- version bump to v1.3 + * Drop 27.patch, merged upstream + * Changes: https://github.com/lanl/libquo/compare/v1.2.9...v1.3 + - add c++ api + +------------------------------------------------------------------- +Wed Oct 25 12:43:35 UTC 2017 - jungh...@votca.org + +- adapt to new openlmi package - source mpivars.h during build + +------------------------------------------------------------------- Old: ---- 27.patch libquo-1.2.9.tar.gz New: ---- 29.patch libquo-1.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libquo.spec ++++++ --- /var/tmp/diff_new_pack.7WPKFs/_old 2017-11-09 13:57:41.631341893 +0100 +++ /var/tmp/diff_new_pack.7WPKFs/_new 2017-11-09 13:57:41.635341747 +0100 @@ -18,12 +18,12 @@ Name: libquo -Version: 1.2.9 +Version: 1.3 Release: 0 Source: http://lanl.github.io/libquo/dists/%{name}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM - 27.patch - make build reproducible -Patch0: https://patch-diff.githubusercontent.com/raw/lanl/libquo/pull/27.patch +# PATCH-FIX-UPSTREAM - 29.patch - comp_dgemv: fix return value +Patch0: https://patch-diff.githubusercontent.com/raw/lanl/libquo/pull/29.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://lanl.github.io/libquo/ @@ -45,11 +45,11 @@ during the execution as different computational phases are entered and exited, respectively. -%package -n libquo4 +%package -n libquo6 Summary: A library for run-time tuning of process binding policies Group: System/Libraries -%description -n libquo4 +%description -n libquo6 QUO is an API tailored for MPI/MPI+X codes that may benefit from evolving process binding policies during their execution. QUO allows for arbitrary process binding policies to be enacted and reverted @@ -59,7 +59,7 @@ %package devel Summary: Development headers and libraries for libquo Group: Development/Libraries/C and C++ -Requires: libquo4 = %{version}-%{release} +Requires: libquo6 = %{version}-%{release} %description devel QUO is an API tailored for MPI/MPI+X codes that may benefit from @@ -73,11 +73,10 @@ %prep %setup %patch0 -p1 -#for patch0 -touch configure.ac aclocal.m4 configure config.h.in -find . -name Makefile.in -exec touch {} \; %build +source %{_libdir}/mpi/gcc/openmpi/bin/mpivars.sh + DATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M:%%S') %configure --disable-silent-rules --enable-shared CC=mpicc USER="Opensuse-builder" HOSTNAME="Opensuse" DATE="$DATE" make %{?_smp_mflags} @@ -86,10 +85,10 @@ make install DESTDIR=%{buildroot} rm %{buildroot}%{_libdir}/*.la -%post -n libquo4 -p /sbin/ldconfig -%postun -n libquo4 -p /sbin/ldconfig +%post -n libquo6 -p /sbin/ldconfig +%postun -n libquo6 -p /sbin/ldconfig -%files -n libquo4 +%files -n libquo6 %defattr(-,root,root,0755) %{_libdir}/libquo.so.* ++++++ 27.patch -> 29.patch ++++++ --- /work/SRC/openSUSE:Factory/libquo/27.patch 2017-02-03 17:48:23.181998850 +0100 +++ /work/SRC/openSUSE:Factory/.libquo.new/29.patch 2017-11-09 13:57:41.103361128 +0100 @@ -1,152 +1,30 @@ +From 013cbded3faef910ef39481bc64cc5a6adf4e89e Mon Sep 17 00:00:00 2001 From: Christoph Junghans <jungh...@lanl.gov> -Date: Fri, 27 Jan 2017 09:56:41 -0700 -Subject: [PATCH] Allow to override build info at configure time +Date: Thu, 26 Oct 2017 11:25:24 -0600 +Subject: [PATCH] comp_dgemv: fix return value -Sometimes you want to have a reproducible build, e.g. -https://build.opensuse.org/request/show/451980 -so let's allow override user, hostname, date at -configure time. We failback to output of id, hostname, date -if variables are empty. ---- libquo.2/configure.ac 2017-01-27 10:51:35.000000000 -0700 -+++ libquo/configure.ac 2017-01-27 10:20:48.000000000 -0700 -@@ -157,6 +157,19 @@ - QUO_WHICH_FC="none" - fi - -+AC_ARG_VAR(USER,[ Username used in build info (fails back to `id -u -n` output)]) -+if test "x$USER" = x; then -+ USER=`id -u -n` -+fi -+AC_ARG_VAR(HOSTNAME,[ Hostname used in build info (fails back to `hostname` output)]) -+if test "x$HOSTNAME" = x; then -+ HOSTNAME=`hostname` -+fi -+AC_ARG_VAR(DATE,[ Date used in build info (fails back to `date` output)]) -+if test "x$DATE" = x; then -+ DATE=`date` -+fi -+ - AC_SUBST([CC]) - AC_SUBST([QUO_WHICH_CC]) - AC_SUBST([CFLAGS]) -@@ -165,6 +178,9 @@ - AC_SUBST([CXXCPPFLAGS]) - AC_SUBST([FC]) - AC_SUBST([QUO_WHICH_FC]) -+AC_SUBST([USER]) -+AC_SUBST([HOSTNAME]) -+AC_SUBST([DATE]) - AC_SUBST([FFLAGS]) - AC_SUBST([FCFLAGS]) - AC_SUBST([LDFLAGS]) ---- libquo.2/configure 2017-01-27 10:52:30.000000000 -0700 -+++ libquo/configure 2017-01-27 10:55:31.000000000 -0700 -@@ -641,6 +641,9 @@ - CXXCPPFLAGS - CXXFLAGS - QUO_WHICH_CC -+DATE -+HOSTNAME -+USER - PTHREAD_CFLAGS - PTHREAD_LIBS - PTHREAD_CC -@@ -941,7 +944,10 @@ - HWLOC_PCIACCESS_LIBS - XMKMF - HWLOC_LIBXML2_CFLAGS --HWLOC_LIBXML2_LIBS' -+HWLOC_LIBXML2_LIBS -+USER -+HOSTNAME -+DATE' - - - # Initialize some variables set by options. -@@ -1627,6 +1633,9 @@ - C compiler flags for LIBXML2, overriding pkg-config - HWLOC_LIBXML2_LIBS - linker flags for LIBXML2, overriding pkg-config -+ USER Username used in build info (fails back to `id -u -n` output) -+ HOSTNAME Hostname used in build info (fails back to `hostname` output) -+ DATE Date used in build info (fails back to `date` output) - - Use these variables to override the choices made by `configure' or to help - it to find libraries and programs with nonstandard names/locations. -@@ -26420,6 +26429,22 @@ - fi - +--- + demos/mpi-openmp/dgemv.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/demos/mpi-openmp/dgemv.c b/demos/mpi-openmp/dgemv.c +index 9db4a92..510b35a 100644 +--- a/demos/mpi-openmp/dgemv.c ++++ b/demos/mpi-openmp/dgemv.c +@@ -113,6 +113,7 @@ matrix_destruct(matrix_t *mat) + if (mat->values[r]) free(mat->values[r]); + } + } ++ return SUCCESS; + } + + typedef struct dgemv_t { +@@ -349,6 +350,8 @@ comp_dgemv(dgemv_t *d) + const double end = gettime(); -+if test "x$USER" = x; then -+ USER=`id -u -n` -+fi -+ -+if test "x$HOSTNAME" = x; then -+ HOSTNAME=`hostname` -+fi + pprintf(emit, "# comp-dgemv-s=%lf\n", timediff(start, end)); + -+if test "x$DATE" = x; then -+ DATE=`date` -+fi -+ -+ -+ -+ -+ - - - ---- libquo.2/src/tools/Makefile.am 2017-01-27 10:51:35.000000000 -0700 -+++ libquo/src/tools/Makefile.am 2017-01-27 10:20:48.000000000 -0700 -@@ -14,9 +14,9 @@ ++ return SUCCESS; + } - quo_info_CPPFLAGS = \ - -I${top_srcdir}/src \ ---DQUO_BUILD_USER="\"$$USER\"" \ ---DQUO_BUILD_HOST="\"`hostname`\"" \ ---DQUO_BUILD_DATE="\"`date`\"" \ -+-DQUO_BUILD_USER="\"@USER@\"" \ -+-DQUO_BUILD_HOST="\"@HOSTNAME@\"" \ -+-DQUO_BUILD_DATE="\"@DATE@\"" \ - -DQUO_BUILD_PREFIX="\"@prefix@\"" \ - -DQUO_BUILD_CC="\"@CC@\"" \ - -DQUO_BUILD_WHICH_CC="\"@QUO_WHICH_CC@\"" \ ---- libquo.2/src/tools/Makefile.in 2017-01-27 10:52:38.000000000 -0700 -+++ libquo/src/tools/Makefile.in 2017-01-27 10:55:37.000000000 -0700 -@@ -220,6 +220,7 @@ - CXXCPPFLAGS = @CXXCPPFLAGS@ - CXXFLAGS = @CXXFLAGS@ - CYGPATH_W = @CYGPATH_W@ -+DATE = @DATE@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ -@@ -235,6 +236,7 @@ - FFLAGS = @FFLAGS@ - FGREP = @FGREP@ - GREP = @GREP@ -+HOSTNAME = @HOSTNAME@ - HWLOC_CFLAGS = @HWLOC_CFLAGS@ - HWLOC_CPPFLAGS = @HWLOC_CPPFLAGS@ - HWLOC_CUDA_LIBS = @HWLOC_CUDA_LIBS@ -@@ -311,6 +313,7 @@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -+USER = @USER@ - VERSION = @VERSION@ - XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ -@@ -375,9 +378,9 @@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --quo_info_CPPFLAGS = -I${top_srcdir}/src -DQUO_BUILD_USER="\"$$USER\"" \ -- -DQUO_BUILD_HOST="\"`hostname`\"" \ -- -DQUO_BUILD_DATE="\"`date`\"" \ -+quo_info_CPPFLAGS = -I${top_srcdir}/src -DQUO_BUILD_USER="\"@USER@\"" \ -+ -DQUO_BUILD_HOST="\"@HOSTNAME@\"" \ -+ -DQUO_BUILD_DATE="\"@DATE@\"" \ - -DQUO_BUILD_PREFIX="\"@prefix@\"" -DQUO_BUILD_CC="\"@CC@\"" \ - -DQUO_BUILD_WHICH_CC="\"@QUO_WHICH_CC@\"" \ - -DQUO_BUILD_CFLAGS="\"@CFLAGS@\"" \ + int ++++++ libquo-1.2.9.tar.gz -> libquo-1.3.tar.gz ++++++ ++++ 62092 lines of diff (skipped)
