diff options
| author | Michael Biebl <biebl@debian.org> | 2014-08-20 19:36:18 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2014-08-20 19:36:18 +0200 |
| commit | 279cf23a54a275a1da0c000ff493fe00ff7f81f2 (patch) | |
| tree | a12c7de8ab1426affb7e0b5e83897a2ad5d2103a | |
| parent | 9c01b4ecebcdf5ca911a09d308992355c5f67be7 (diff) | |
| download | rsyslog-279cf23a54a275a1da0c000ff493fe00ff7f81f2.tar.gz | |
Cherry-pick upstream patch to fix build failures on platforms without atomic instructions.
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/0003-fix-build-problem-on-platforms-without-atomic-instru.patch | 22 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 25 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index fcd69bc..1c3146f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ rsyslog (8.4.0-2) UNRELEASED; urgency=medium * Tweak rsyslog systemd service file. Add Documentation field and restart the rsyslogd daemon on failures. + * Cherry-pick upstream patch to fix build failures on platforms without + atomic instructions. -- Michael Biebl <biebl@debian.org> Wed, 20 Aug 2014 19:31:37 +0200 diff --git a/debian/patches/0003-fix-build-problem-on-platforms-without-atomic-instru.patch b/debian/patches/0003-fix-build-problem-on-platforms-without-atomic-instru.patch new file mode 100644 index 0000000..ed5efd1 --- /dev/null +++ b/debian/patches/0003-fix-build-problem-on-platforms-without-atomic-instru.patch @@ -0,0 +1,22 @@ +From: Rainer Gerhards <rgerhards@adiscon.com> +Date: Tue, 19 Aug 2014 16:04:52 +0200 +Subject: fix build problem on platforms without atomic instructions + +Thanks to Michael Biebl for his very helpful analysis of the bug. +--- + runtime/atomic.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/runtime/atomic.h b/runtime/atomic.h +index 49c17d8..d59858a 100644 +--- a/runtime/atomic.h ++++ b/runtime/atomic.h +@@ -221,7 +221,7 @@ + return(val); + } + +-# define DEF_ATOMIC_HELPER_MUT64(x) pthread_mutex_t x ++# define DEF_ATOMIC_HELPER_MUT64(x) pthread_mutex_t x; + # define INIT_ATOMIC_HELPER_MUT64(x) pthread_mutex_init(&(x), NULL) + # define DESTROY_ATOMIC_HELPER_MUT64(x) pthread_mutex_destroy(&(x)) + #endif /* #ifdef HAVE_ATOMIC_BUILTINS64 */ diff --git a/debian/patches/series b/debian/patches/series index 5a1152d..2c8eb87 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 0001-Don-t-create-a-database.patch 0002-systemd-service-file-tweaks.patch +0003-fix-build-problem-on-platforms-without-atomic-instru.patch |