mirror of
https://salsa.debian.org/ha-team/libqb
synced 2025-08-26 05:57:31 +00:00
Test the patches meant for upstream inclusion
This commit is contained in:
Ferenc Wágner
parent
8c933e327c
commit
eaeee6dfcd
40
debian/patches/Correctly-check-for-the-check-requirement-of-enable-.patch
vendored
Normal file
40
debian/patches/Correctly-check-for-the-check-requirement-of-enable-.patch
vendored
Normal file
@ -0,0 +1,40 @@
|
||||
From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi@debian.org>
|
||||
Date: Mon, 5 Dec 2016 12:37:47 +0100
|
||||
Subject: Correctly check for the "check" requirement of --enable-syslog-tests
|
||||
|
||||
---
|
||||
configure.ac | 12 ++++++------
|
||||
1 file changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index bb8357c..3c902f8 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -466,10 +466,8 @@ AC_ARG_ENABLE([coverage],
|
||||
AC_ARG_ENABLE([slow-tests],
|
||||
[AS_HELP_STRING([--enable-slow-tests],[build and run slow tests])])
|
||||
|
||||
-if test x"$with_check" = xyes; then
|
||||
AC_ARG_ENABLE([syslog-tests],
|
||||
[AS_HELP_STRING([--enable-syslog-tests],[build and run syslog tests])])
|
||||
-fi
|
||||
|
||||
AC_ARG_WITH([socket-dir],
|
||||
[AS_HELP_STRING([--with-socket-dir=DIR],[socket directory @<:@LOCALSTATEDIR/run@:>@])],
|
||||
@@ -570,10 +568,12 @@ if test "x${enable_slow_tests}" = xyes ; then
|
||||
fi
|
||||
AM_CONDITIONAL(HAVE_SLOW_TESTS, [test "x${enable_slow_tests}" = xyes])
|
||||
AC_SUBST(HAVE_SLOW_TESTS)
|
||||
-if test "x${enable_syslog_tests}" = xyes ; then
|
||||
- AC_DEFINE([HAVE_SYSLOG_TESTS], 1,[have syslog tests])
|
||||
- AC_MSG_NOTICE([Enabling syslog tests])
|
||||
-fi
|
||||
+
|
||||
+AS_IF([test "x$enable_syslog_tests" = xyes],
|
||||
+ [AS_IF([test "x$with_check" = xno],
|
||||
+ [AC_MSG_ERROR([--enable-syslog-tests requires the "check" test harness])],
|
||||
+ [AC_DEFINE([HAVE_SYSLOG_TESTS], 1,[have syslog tests])
|
||||
+ AC_MSG_NOTICE([Enabling syslog tests])])])
|
||||
AM_CONDITIONAL(HAVE_SYSLOG_TESTS, [test "x${enable_syslog_tests}" = xyes])
|
||||
AC_SUBST(HAVE_SYSLOG_TESTS)
|
||||
|
||||
22
debian/patches/LTLIBOBJS-is-also-a-Make-variable.patch
vendored
Normal file
22
debian/patches/LTLIBOBJS-is-also-a-Make-variable.patch
vendored
Normal file
@ -0,0 +1,22 @@
|
||||
From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi@debian.org>
|
||||
Date: Wed, 7 Dec 2016 14:44:51 +0100
|
||||
Subject: LTLIBOBJS is also a Make variable
|
||||
|
||||
So let's use the more friendly syntax.
|
||||
---
|
||||
lib/Makefile.am | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/Makefile.am b/lib/Makefile.am
|
||||
index 06fb2fa..cb81787 100644
|
||||
--- a/lib/Makefile.am
|
||||
+++ b/lib/Makefile.am
|
||||
@@ -40,7 +40,7 @@ source_to_lint = util.c hdb.c ringbuffer.c ringbuffer_helper.c \
|
||||
map.c skiplist.c hashtable.c trie.c
|
||||
|
||||
libqb_la_SOURCES = $(source_to_lint) unix.c
|
||||
-libqb_la_LIBADD = @LTLIBOBJS@
|
||||
+libqb_la_LIBADD = $(LTLIBOBJS)
|
||||
|
||||
AM_LDFLAGS = $(LDFLAGS_COPY:-Bsymbolic-functions=)
|
||||
|
||||
41
debian/patches/configure.ac-emit-the-error-message-right-after-the-.patch
vendored
Normal file
41
debian/patches/configure.ac-emit-the-error-message-right-after-the-.patch
vendored
Normal file
@ -0,0 +1,41 @@
|
||||
From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi@debian.org>
|
||||
Date: Mon, 5 Dec 2016 12:41:24 +0100
|
||||
Subject: configure.ac: emit the error message right after the failed check
|
||||
|
||||
---
|
||||
configure.ac | 15 +++++++--------
|
||||
1 file changed, 7 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 3c902f8..7108604 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -115,6 +115,13 @@ AC_SEARCH_LIBS([gethostbyname], [nsl])
|
||||
# look for testing harness "check"
|
||||
PKG_CHECK_MODULES([CHECK], [check >= 0.9.4],[with_check=yes],[with_check=no])
|
||||
AM_CONDITIONAL(HAVE_CHECK, test "${with_check}" = "yes")
|
||||
+AS_IF([test "x$enable_syslog_tests" = xyes],
|
||||
+ [AS_IF([test "x$with_check" = xno],
|
||||
+ [AC_MSG_ERROR([--enable-syslog-tests requires the "check" test harness])],
|
||||
+ [AC_DEFINE([HAVE_SYSLOG_TESTS], 1,[have syslog tests])
|
||||
+ AC_MSG_NOTICE([Enabling syslog tests])])])
|
||||
+AM_CONDITIONAL(HAVE_SYSLOG_TESTS, [test "x${enable_syslog_tests}" = xyes])
|
||||
+AC_SUBST(HAVE_SYSLOG_TESTS)
|
||||
|
||||
# look for GLIB (used for testing integration)
|
||||
PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.0, have_glib=yes, have_glib=no)
|
||||
@@ -569,14 +576,6 @@ fi
|
||||
AM_CONDITIONAL(HAVE_SLOW_TESTS, [test "x${enable_slow_tests}" = xyes])
|
||||
AC_SUBST(HAVE_SLOW_TESTS)
|
||||
|
||||
-AS_IF([test "x$enable_syslog_tests" = xyes],
|
||||
- [AS_IF([test "x$with_check" = xno],
|
||||
- [AC_MSG_ERROR([--enable-syslog-tests requires the "check" test harness])],
|
||||
- [AC_DEFINE([HAVE_SYSLOG_TESTS], 1,[have syslog tests])
|
||||
- AC_MSG_NOTICE([Enabling syslog tests])])])
|
||||
-AM_CONDITIONAL(HAVE_SYSLOG_TESTS, [test "x${enable_syslog_tests}" = xyes])
|
||||
-AC_SUBST(HAVE_SYSLOG_TESTS)
|
||||
-
|
||||
# --- callsite sections ---
|
||||
if test "x${GCC}" = xyes; then
|
||||
AC_MSG_CHECKING([whether GCC supports __attribute__((section()) + ld supports orphan sections])
|
||||
54
debian/patches/configure.ac-help-string-cleanup.patch
vendored
Normal file
54
debian/patches/configure.ac-help-string-cleanup.patch
vendored
Normal file
@ -0,0 +1,54 @@
|
||||
From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi@debian.org>
|
||||
Date: Mon, 5 Dec 2016 12:29:22 +0100
|
||||
Subject: configure.ac help string cleanup
|
||||
|
||||
The [ defualt="no" ] branches were sense- and (mostly) harmless.
|
||||
---
|
||||
configure.ac | 20 +++++++-------------
|
||||
1 file changed, 7 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index fa13ae6..bb8357c 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -452,33 +452,27 @@ LINT_FLAGS="-weak -D__gnuc_va_list=va_list -D__attribute\(x\)= \
|
||||
|
||||
# local options
|
||||
AC_ARG_ENABLE([ansi],
|
||||
- [ --enable-ansi : force to build with ANSI standards. ],
|
||||
- [ default="no" ])
|
||||
+ [AS_HELP_STRING([--enable-ansi],[force to build with ANSI standards])])
|
||||
|
||||
AC_ARG_ENABLE([fatal-warnings],
|
||||
- [ --enable-fatal-warnings : enable fatal warnings. ],
|
||||
- [ default="no" ])
|
||||
+ [AS_HELP_STRING([--enable-fatal-warnings],[enable fatal warnings])])
|
||||
|
||||
AC_ARG_ENABLE([debug],
|
||||
- [ --enable-debug : enable debug build. ],
|
||||
- [ default="no" ])
|
||||
+ [AS_HELP_STRING([--enable-debug],[enable debug build])])
|
||||
|
||||
AC_ARG_ENABLE([coverage],
|
||||
- [ --enable-coverage : coverage analysis of the codebase. ],
|
||||
- [ default="no" ])
|
||||
+ [AS_HELP_STRING([--enable-coverage],[coverage analysis of the codebase])])
|
||||
|
||||
AC_ARG_ENABLE([slow-tests],
|
||||
- [ --enable-slow-tests : build and run slow tests. ],
|
||||
- [ default="no" ])
|
||||
+ [AS_HELP_STRING([--enable-slow-tests],[build and run slow tests])])
|
||||
|
||||
if test x"$with_check" = xyes; then
|
||||
AC_ARG_ENABLE([syslog-tests],
|
||||
- [ --enable-syslog-tests : build and run syslog tests. ],
|
||||
- [ default="no" ])
|
||||
+ [AS_HELP_STRING([--enable-syslog-tests],[build and run syslog tests])])
|
||||
fi
|
||||
|
||||
AC_ARG_WITH([socket-dir],
|
||||
- [ --with-socket-dir=DIR : socket dir. ],
|
||||
+ [AS_HELP_STRING([--with-socket-dir=DIR],[socket directory @<:@LOCALSTATEDIR/run@:>@])],
|
||||
[ SOCKETDIR="$withval" ],
|
||||
[ SOCKETDIR="$localstatedir/run" ])
|
||||
|
||||
4
debian/patches/series
vendored
4
debian/patches/series
vendored
@ -1,3 +1,7 @@
|
||||
hurd-support.patch
|
||||
Fix-spelling-synchonization-synchronization.patch
|
||||
Fix-spelling-paramaters-parameters.patch
|
||||
configure.ac-help-string-cleanup.patch
|
||||
Correctly-check-for-the-check-requirement-of-enable-.patch
|
||||
configure.ac-emit-the-error-message-right-after-the-.patch
|
||||
LTLIBOBJS-is-also-a-Make-variable.patch
|
||||
|
||||
Loading…
Reference in New Issue
Block a user