Hello community, here is the log from the commit of package libquo for openSUSE:Factory checked in at 2017-02-02 15:41:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libquo (Old) and /work/SRC/openSUSE:Factory/.libquo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libquo" Changes: -------- --- /work/SRC/openSUSE:Factory/libquo/libquo.changes 2017-01-23 11:36:07.240677552 +0100 +++ /work/SRC/openSUSE:Factory/.libquo.new/libquo.changes 2017-02-03 17:48:23.197996594 +0100 @@ -1,0 +2,6 @@ +Fri Jan 27 17:14:51 UTC 2017 - [email protected] + +- added patch from upsteam - 27.patch to make build + reproducible + +------------------------------------------------------------------- New: ---- 27.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libquo.spec ++++++ --- /var/tmp/diff_new_pack.foIx0F/_old 2017-02-03 17:48:23.765916532 +0100 +++ /var/tmp/diff_new_pack.foIx0F/_new 2017-02-03 17:48:23.765916532 +0100 @@ -22,6 +22,9 @@ 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 + BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://lanl.github.io/libquo/ Summary: A library for run-time tuning of process binding policies @@ -69,9 +72,14 @@ %prep %setup +%patch0 -p1 +#for patch0 +touch configure.ac aclocal.m4 configure config.h.in +find . -name Makefile.in -exec touch {} \; %build -%configure --enable-shared CC=mpicc +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} %install ++++++ 27.patch ++++++ From: Christoph Junghans <[email protected]> Date: Fri, 27 Jan 2017 09:56:41 -0700 Subject: [PATCH] Allow to override build info at configure time 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 +if test "x$USER" = x; then + USER=`id -u -n` +fi + +if test "x$HOSTNAME" = x; then + HOSTNAME=`hostname` +fi + +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 @@ 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@\"" \
