Accepting request 669095 from devel:libraries:c_c++
- Backport patches from upstream to avoid adding a non-existing foo/lib/pgm-5.2/include directory to pkg-config's CFLAGS which breaks applications using strict compiler flags, and to make the build reproducible regardless of the reported system/architecture Added: - libpgm-5.2.122-pkg-config-do-not-add-I-to-non-existing-directory.patch - libpgm-5.2.122-reproducible-architecture.patch OBS-URL: https://build.opensuse.org/request/show/669095 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openpgm?expand=0&rev=6
This commit is contained in:
commit
b55f42d45d
@ -0,0 +1,13 @@
|
|||||||
|
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
Normal file
29
libpgm-5.2.122-reproducible-architecture.patch
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
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
|
@ -1,3 +1,15 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jan 28 12:51:34 UTC 2019 - luca.boccassi@gmail.com
|
||||||
|
|
||||||
|
- Backport patches from upstream to avoid adding a non-existing
|
||||||
|
foo/lib/pgm-5.2/include directory to pkg-config's CFLAGS which
|
||||||
|
breaks applications using strict compiler flags, and to make the
|
||||||
|
build reproducible regardless of the reported system/architecture
|
||||||
|
|
||||||
|
Added:
|
||||||
|
- libpgm-5.2.122-pkg-config-do-not-add-I-to-non-existing-directory.patch
|
||||||
|
- libpgm-5.2.122-reproducible-architecture.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Jul 13 07:39:53 UTC 2018 - dimstar@opensuse.org
|
Fri Jul 13 07:39:53 UTC 2018 - dimstar@opensuse.org
|
||||||
|
|
||||||
|
10
openpgm.spec
10
openpgm.spec
@ -2,7 +2,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package openpgm
|
# spec file for package openpgm
|
||||||
#
|
#
|
||||||
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||||
# Copyright (c) 2012 Pascal Bleser <pascal.bleser@opensuse.org>
|
# Copyright (c) 2012 Pascal Bleser <pascal.bleser@opensuse.org>
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
@ -14,7 +14,7 @@
|
|||||||
# license that conforms to the Open Source Definition (Version 1.9)
|
# license that conforms to the Open Source Definition (Version 1.9)
|
||||||
# published by the Open Source Initiative.
|
# published by the Open Source Initiative.
|
||||||
|
|
||||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
@ -35,6 +35,10 @@ Source: https://github.com/steve-o/openpgm/archive/release-5-2-122.tar.g
|
|||||||
Source99: baselibs.conf
|
Source99: baselibs.conf
|
||||||
# PATCH-FIX-UPSTREAM bmwiedemann https://github.com/steve-o/openpgm/pull/48
|
# PATCH-FIX-UPSTREAM bmwiedemann https://github.com/steve-o/openpgm/pull/48
|
||||||
Patch0: libpgm-5.2.122-reproducible.patch
|
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
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
BuildRequires: automake
|
BuildRequires: automake
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
@ -76,6 +80,8 @@ This subpackage contains the header files for OpenPGM.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -n "%{name}-release-%{tarball_version}/openpgm/pgm"
|
%setup -q -n "%{name}-release-%{tarball_version}/openpgm/pgm"
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
|
%patch1 -p1
|
||||||
|
%patch2 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
mkdir -p m4
|
mkdir -p m4
|
||||||
|
Loading…
Reference in New Issue
Block a user