Hello community, here is the log from the commit of package SHERPA-MC for openSUSE:Factory checked in at 2020-11-26 23:14:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/SHERPA-MC (Old) and /work/SRC/openSUSE:Factory/.SHERPA-MC.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "SHERPA-MC" Thu Nov 26 23:14:20 2020 rev:16 rq:850840 version:2.2.10 Changes: -------- --- /work/SRC/openSUSE:Factory/SHERPA-MC/SHERPA-MC.changes 2020-06-03 20:32:33.165179121 +0200 +++ /work/SRC/openSUSE:Factory/.SHERPA-MC.new.5913/SHERPA-MC.changes 2020-11-26 23:15:29.613042214 +0100 @@ -1,0 +2,6 @@ +Wed Nov 25 00:25:56 UTC 2020 - Atri Bhattacharya <[email protected]> + +- Add SHERPA-MC-build-with-recent-glibc.patch to fix builds + against recent glibc; patch taken from upstream git. + +------------------------------------------------------------------- New: ---- SHERPA-MC-build-with-recent-glibc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ SHERPA-MC.spec ++++++ --- /var/tmp/diff_new_pack.Sptgnw/_old 2020-11-26 23:15:30.301042749 +0100 +++ /var/tmp/diff_new_pack.Sptgnw/_new 2020-11-26 23:15:30.305042752 +0100 @@ -29,6 +29,8 @@ Source: https://www.hepforge.org/downloads/sherpa/%{name}-%{version}.tar.gz # PATCH-FIX-UPSTREAM SHERPA-MC-no-return-in-non-void-function.patch [email protected] -- Fix a non-void (bool) function that was not returning any data to return "true" Patch0: SHERPA-MC-no-return-in-non-void-function.patch +# PATCH-FIX-UPSTREAM SHERPA-MC-build-with-recent-glibc.patch [email protected] -- Fix build problem with very new glibc; patch taken from upstream git +Patch1: SHERPA-MC-build-with-recent-glibc.patch BuildRequires: HepMC-devel >= 3.0 BuildRequires: LHAPDF-devel BuildRequires: Rivet-devel @@ -134,6 +136,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 # REMOVE HASHBANGS FROM FILES NOT TO BE INSTALLED TO EXEC PATH sed -E -i "1{s|#!/bin/env python2||}" MODEL/UFO/test.py ++++++ SHERPA-MC-build-with-recent-glibc.patch ++++++ From 402bac007100bf573a2f55f4f1eb0a854e84891b Mon Sep 17 00:00:00 2001 From: Andrii Verbytskyi <[email protected]> Date: Wed, 20 May 2020 13:21:17 +0000 Subject: [PATCH] Fix build problem with very new glibc --- ATOOLS/Org/Run_Parameter.C | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ATOOLS/Org/Run_Parameter.C b/ATOOLS/Org/Run_Parameter.C index c8913898c..ebd9986e0 100644 --- a/ATOOLS/Org/Run_Parameter.C +++ b/ATOOLS/Org/Run_Parameter.C @@ -20,7 +20,9 @@ #include <sys/time.h> #include <sys/resource.h> #include <sys/types.h> +#ifdef ARCH_DARWIN #include <sys/sysctl.h> +#endif #include <limits> namespace ATOOLS { -- GitLab _______________________________________________ openSUSE Commits mailing list -- [email protected] To unsubscribe, email [email protected] List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/[email protected]
