diff options
| author | Michael Biebl <biebl@debian.org> | 2013-03-21 16:41:07 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2013-03-21 16:41:40 +0100 |
| commit | 730e4829d8fd5627ff29b57ad157dbad949056cd (patch) | |
| tree | 5bccda6822e4acd87d62fdd25246da53c64df289 /debian | |
| parent | 23b4f5bf690c35e3239a7d9a4da7c0c7a56b3152 (diff) | |
| download | rsyslog-730e4829d8fd5627ff29b57ad157dbad949056cd.tar.gz | |
Fix build failures on architectures where prctl is not available. (Closes: #703429)
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/04-no-prctl.patch | 16 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 19 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index e938cf9..3eef9de 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ rsyslog (7.3.8-4) UNRELEASED; urgency=low * Add Build-Depends on bison so we can build twice in a row. "make clean" removes the generated grammar/grammer.[ch]. + * Another patch to fix build failures on architectures where prctl is not + available. (Closes: #703429) -- Michael Biebl <biebl@debian.org> Thu, 21 Mar 2013 16:34:25 +0100 diff --git a/debian/patches/04-no-prctl.patch b/debian/patches/04-no-prctl.patch new file mode 100644 index 0000000..00300f1 --- /dev/null +++ b/debian/patches/04-no-prctl.patch @@ -0,0 +1,16 @@ +Index: rsyslog/threads.c +=================================================================== +--- rsyslog.orig/threads.c 2013-03-18 16:21:20.789144261 +0100 ++++ rsyslog/threads.c 2013-03-21 16:31:05.424025586 +0100 +@@ -183,10 +183,10 @@ + assert(pThis != NULL); + assert(pThis->pUsrThrdMain != NULL); + ++# if HAVE_PRCTL && defined PR_SET_NAME + ustrncpy(thrdName+3, pThis->name, 20); + dbgOutputTID((char*)thrdName); + +-# if HAVE_PRCTL && defined PR_SET_NAME + /* set thread name - we ignore if the call fails, has no harsh consequences... */ + if(prctl(PR_SET_NAME, thrdName, 0, 0, 0) != 0) { + DBGPRINTF("prctl failed, not setting thread name for '%s'\n", pThis->name); diff --git a/debian/patches/series b/debian/patches/series index 567658e..8b3eba3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ 01-dont_create_db.patch 02-sys-gettid.patch 03-build-non-linux.patch +04-no-prctl.patch |