rpm/openpgm
SHA256
1
0
Fork 0
forked from pool/openpgm
Code Pull Requests Activity

Accepting request 1091348 from devel:libraries:c_c++

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1091348
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openpgm?expand=0&rev=11
This commit is contained in:
Dominique Leuenberger 2023-06-09 18:36:59 +00:00 committed by Git OBS Bridge
commit bc4299aa96
10 changed files with 26 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
baselibs.conf
View File

@ -1 +1 @@
libpgm-5_2-0
libpgm-5_3-0

28
libpgm-5.2.122-configure-rdtsc-checking-chg.patch
View File

@ -1,28 +0,0 @@
From: Michel Normand <normand@linux.vnet.ibm.com>
Subject: libpgm 5.2.122 configure rdtsc checking chg
Date: Fri, 16 Aug 2019 13:20:53 +0200
libpgm 5.2.122 configure rdtsc checking chg
To avoid rdtsc to be enabled when not required
(for PowerPC ARM) when LTO is enabled; eg openSUSE:
https://build.opensuse.org/package/show/devel:libraries:c_c++/openpgm
Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: pgm/configure.ac
===================================================================
--- pgm.orig/configure.ac
+++ pgm/configure.ac
@@ -153,7 +153,7 @@ darwin*)
AC_MSG_RESULT([no])
;;
*)
-AC_COMPILE_IFELSE(
+AC_LINK_IFELSE(
[AC_LANG_PROGRAM(,[[unsigned long lo, hi;
__asm__ __volatile__ ("rdtsc" : "=a" (lo), "=d" (hi));]])],
[AC_MSG_RESULT([yes])

13
libpgm-5.2.122-pkg-config-do-not-add-I-to-non-existing-directory.patch
View File

@ -1,13 +0,0 @@
Author: Luca Boccassi <bluca@debian.org>
Description: pkg-config: do not add -I to non-existing directory
foo/lib/pgm-5.2/include does not exist, so applications using strict
compiler flags will fail to build due to this -I flag
Origin: https://github.com/steve-o/openpgm/pull/57
--- pgm.orig/openpgm-5.2.pc.in
+++ pgm/openpgm-5.2.pc.in
@@ -9,4 +9,4 @@ Version: @PACKAGE_VERSION@
# packagers may wish to move @LIBS@ to Libs.private for platforms with
# versions of pkg-config that support static linking.
Libs: -L${libdir} -lpgm @LIBS@
-Cflags: -I${includedir}/pgm-@VERSION_MAJOR@.@VERSION_MINOR@ -I${libdir}/pgm-@VERSION_MAJOR@.@VERSION_MINOR@/include
+Cflags: -I${includedir}/pgm-@VERSION_MAJOR@.@VERSION_MINOR@

29
libpgm-5.2.122-reproducible-architecture.patch
View File

@ -1,29 +0,0 @@
Author: Luca Boccassi <bluca@debian.org>
Description: version_generator.py: make build reproducible
If SOURCE_DATE_EPOCH is defined then the user is most likely interested
in building the library in a reproducible way. So in that case use fixed
"BuildSystem" and "BuildMachine" strings instead of the operating system
and architecture.
Origin: https://github.com/steve-o/openpgm/pull/58
--- pgm.orig/version_generator.py
+++ pgm/version_generator.py
@@ -8,6 +8,11 @@ timestamp = time.gmtime (int (os.getenv
build_date = time.strftime ("%Y-%m-%d", timestamp)
build_time = time.strftime ("%H:%M:%S", timestamp)
build_rev = filter (str.isdigit, "$Revision$")
+build_system = platform.system()
+build_machine = platform.machine()
+if 'SOURCE_DATE_EPOCH' in os.environ:
+ build_system = 'BuildSystem'
+ build_machine = 'BuildMachine'
print """
/* vim:ts=8:sts=8:sw=4:noai:noexpandtab
@@ -51,6 +56,6 @@ const char* pgm_build_revision = "%s";
/* eof */
-"""%(build_date, build_time, platform.system(), platform.machine(), build_rev)
+"""%(build_date, build_time, build_system, build_machine, build_rev)
# end of file

27
libpgm-5.2.122-reproducible.patch
View File

@ -1,27 +0,0 @@
commit f4debdce3de8da1bd401d8542c5acbfaa0982b76
Author: Bernhard M. Wiedemann <githubbmw@lsmod.de>
Date: Wed Jan 25 03:52:14 2017 +0000
allow to override build date
to enable reproducible builds.
See https://reproducible-builds.org/ for why this is good
and https://reproducible-builds.org/specs/source-date-epoch/
for the definition of this variable.
Index: pgm/version_generator.py
===================================================================
--- pgm.orig/version_generator.py
+++ pgm/version_generator.py
@@ -4,8 +4,9 @@ import os
import platform
import time
-build_date = time.strftime ("%Y-%m-%d")
-build_time = time.strftime ("%H:%M:%S")
+timestamp = time.gmtime(int(os.environ.get('SOURCE_DATE_EPOCH', time.time())))
+build_date = time.strftime ("%Y-%m-%d", timestamp)
+build_time = time.strftime ("%H:%M:%S", timestamp)
build_rev = filter (str.isdigit, "$Revision$")
print """

BIN
openpgm-release-5-2-122.tar.gz (Stored with Git LFS)
View File

Binary file not shown.

BIN
openpgm-release-5-3-128.tar.gz (Stored with Git LFS) Normal file
View File

Binary file not shown.

15
openpgm.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Wed Jun 7 13:11:24 UTC 2023 - pgajdos@suse.com
- version update to 5.3.128
* Maintenance release aggregating all patches to the repository since
previous tested release.
- modified sources
% baselibs.conf
- deleted patches
- libpgm-5.2.122-configure-rdtsc-checking-chg.patch (upstreamed)
- libpgm-5.2.122-pkg-config-do-not-add-I-to-non-existing-directory.patch (upstreamed)
- libpgm-5.2.122-reproducible-architecture.patch (upstreamed)
- libpgm-5.2.122-reproducible.patch (upstreamed)
- use_python3.patch (upstreamed)
-------------------------------------------------------------------
Mon Jun 28 17:37:10 UTC 2021 - Matej Cepl <mcepl@suse.com>

24
openpgm.spec
View File

@ -2,7 +2,7 @@
#
# spec file for package openpgm
#
# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2012 Pascal Bleser <pascal.bleser@opensuse.org>
#
# All modifications and additions to the file contributed by third parties
@ -19,31 +19,20 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
%define major 5.2
%define mpkg 5_2
%define major 5.3
%define mpkg 5_3
%define soname 0
%define tarball_version 5-2-122
%define tarball_version 5-3-128
%define libname libpgm-%{mpkg}-%{soname}
Name: openpgm
Version: 5.2.122
Version: 5.3.128
Release: 0
Summary: OpenPGM implementation of the Reliable Multicast Protocol
License: LGPL-2.1-or-later
Group: Development/Libraries/C and C++
URL: https://github.com/steve-o/openpgm
Source: https://github.com/steve-o/openpgm/archive/release-5-2-122.tar.gz#/openpgm-release-%{tarball_version}.tar.gz
Source: https://github.com/steve-o/openpgm/archive/release-%{tarball_version}.tar.gz#/openpgm-release-%{tarball_version}.tar.gz
Source99: baselibs.conf
# PATCH-FIX-UPSTREAM bmwiedemann https://github.com/steve-o/openpgm/pull/48
Patch0: libpgm-5.2.122-reproducible.patch
# PATCH-FIX-UPSTREAM bluca https://github.com/steve-o/openpgm/pull/58
Patch1: libpgm-5.2.122-reproducible-architecture.patch
# PATCH-FIX-UPSTREAM bluca https://github.com/steve-o/openpgm/pull/57
Patch2: libpgm-5.2.122-pkg-config-do-not-add-I-to-non-existing-directory.patch
# upstream pending patch https://github.com/steve-o/openpgm/pull/63
Patch3: libpgm-5.2.122-configure-rdtsc-checking-chg.patch
# PATCH-{FIX|FEATURE}-{OPENSUSE|SLE|UPSTREAM} name-of-file.patch bsc#[0-9]+ mcepl@suse.com
# this patch makes things totally awesome
Patch4: use_python3.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gcc-c++
@ -87,6 +76,7 @@ This subpackage contains the header files for OpenPGM.
%autopatch -p1
%build
mv openpgm-5.2.pc.in openpgm-5.3.pc.in
export ac_cv_func_ftime=no
mkdir -p m4
autoreconf -fi

71
use_python3.patch
View File

@ -1,71 +0,0 @@
---
SConscript.libpgm | 2 +-
version_generator.py | 23 ++++++++++++-----------
2 files changed, 13 insertions(+), 12 deletions(-)
--- a/SConscript.libpgm
+++ b/SConscript.libpgm
@@ -60,7 +60,7 @@ e.Append(CCFLAGS = '-DGETTEXT_PACKAGE=\'
e.Command ('galois_tables.c', 'galois_generator.pl', "perl $SOURCE > $TARGET");
# Version stamping
-e.Command ('version.c', 'version_generator.py', "python $SOURCE > $TARGET");
+e.Command ('version.c', 'version_generator.py', "python3 $SOURCE > $TARGET");
e.Depends ('version.c', src);
src += ['version.c'];
--- a/version_generator.py
+++ b/version_generator.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
import os
import platform
@@ -7,19 +7,19 @@ import time
timestamp = time.gmtime(int(os.environ.get('SOURCE_DATE_EPOCH', time.time())))
build_date = time.strftime ("%Y-%m-%d", timestamp)
build_time = time.strftime ("%H:%M:%S", timestamp)
-build_rev = filter (str.isdigit, "$Revision$")
+build_rev = ''.join (list (filter (str.isdigit, "$Revision$")))
build_system = platform.system()
build_machine = platform.machine()
if 'SOURCE_DATE_EPOCH' in os.environ:
build_system = 'BuildSystem'
build_machine = 'BuildMachine'
-print """
+print ("""
/* vim:ts=8:sts=8:sw=4:noai:noexpandtab
*
* OpenPGM version.
*
- * Copyright (c) 2006-2011 Miru Limited.
+ * Copyright (c) 2006-2014 Miru Limited.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -47,15 +47,16 @@ print """
const unsigned pgm_major_version = 5;
const unsigned pgm_minor_version = 2;
-const unsigned pgm_micro_version = 122;
-const char* pgm_build_date = "%s";
-const char* pgm_build_time = "%s";
-const char* pgm_build_system = "%s";
-const char* pgm_build_machine = "%s";
-const char* pgm_build_revision = "%s";
+const unsigned pgm_micro_version = 128;
+const char* pgm_build_date = "{0}";
+const char* pgm_build_time = "{1}";
+const char* pgm_build_system = "{2}";
+const char* pgm_build_machine = "{3}";
+const char* pgm_build_revision = "{4}";
/* eof */
-"""%(build_date, build_time, build_system, build_machine, build_rev)
+""".format (build_date, build_time, build_system, build_machine, build_rev))
# end of file
+