Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 1 | From 73d2aea33e32272bac693550e8a3b0e3ad89707f Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= <jpokorny@redhat.com> |
| 3 | Date: Tue, 26 Dec 2017 00:02:26 +0100 |
| 4 | Subject: [PATCH] build: fix configure script neglecting, re-enable out-of-tree |
| 5 | builds |
| 6 | MIME-Version: 1.0 |
| 7 | Content-Type: text/plain; charset=UTF-8 |
| 8 | Content-Transfer-Encoding: 8bit |
| 9 | |
| 10 | For the former, a prototype and the final code got (hm, mysteriously) |
| 11 | intertwisted. For the latter, I am clearly guilty of (rare, anyway) |
| 12 | testing of the out-of-tree builds only with libqb-already-system-wide |
| 13 | scenario, which is rather shortsighted. |
| 14 | |
| 15 | Thanks Fabio and his ci.kronosnet.org project for spotting that. |
| 16 | |
| 17 | X-mas-present-for: Fabio M. Di Nitto <fdinitto@redhat.com> |
| 18 | Signed-off-by: Jan Pokorný <jpokorny@redhat.com> |
| 19 | --- |
| 20 | Upstream-Status: Backport |
| 21 | |
| 22 | configure.ac | 2 +- |
| 23 | lib/Makefile.am | 4 +++- |
| 24 | 2 files changed, 4 insertions(+), 2 deletions(-) |
| 25 | |
| 26 | diff --git a/configure.ac b/configure.ac |
| 27 | index 9900310..f9761cc 100644 |
| 28 | --- a/configure.ac |
| 29 | +++ b/configure.ac |
| 30 | @@ -710,7 +710,7 @@ if test "x${GCC}" = xyes; then |
| 31 | | grep __stop___verbose | cut -d" " -f 3) |
| 32 | test "${verbose_start_addr}" = "${verbose_stop_addr}" \ |
| 33 | && gcc_has_attribute_section_visible=no \ |
| 34 | - || { verbose_start_type=$(${READELF} -s backup \ |
| 35 | + || { verbose_start_type=$(${READELF} -s "conftest${shrext_cmds}" \ |
| 36 | | sed -n '/__start___verbose/{s/^\s*//p;q}' \ |
| 37 | | tr -s ' ' \ |
| 38 | | cut -d" " -f6) |
| 39 | diff --git a/lib/Makefile.am b/lib/Makefile.am |
| 40 | index 6ca6b15..b035f0b 100644 |
| 41 | --- a/lib/Makefile.am |
| 42 | +++ b/lib/Makefile.am |
| 43 | @@ -101,7 +101,9 @@ endif |
| 44 | endif |
| 45 | |
| 46 | qblog_script.ld: %.ld: %.ld.in |
| 47 | - $(AM_V_GEN)$(CPP) -xc -I$(top_srcdir)/include -D_GNU_SOURCE -C -P $< \ |
| 48 | + $(AM_V_GEN)$(CPP) -C -D_GNU_SOURCE -P \ |
| 49 | + -I$(top_srcdir)/include -I$(top_builddir)/include \ |
| 50 | + -xc $< \ |
| 51 | | sed -n "/$$(sed -n '/^[^#]/{s/[*\/]/\\&/g;p;q;}' $<)/,$$ p" \ |
| 52 | > $@ |
| 53 | |
| 54 | -- |
| 55 | 2.16.2 |
| 56 | |