1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81
|
Author: Shachar Shemesh <shachar@debian.org>
Subject: Disable precompiled headers support.
Rsyncrypto uses precompiled headers. This fails to build when running dpkg-buildpackage, as it passes --disable-dependency-tracking to
autoconf.
Fix here is a hack that simply disables precompiled headers altogether.
--- a/configure.ac
+++ b/configure.ac
@@ -134,17 +134,10 @@
# Checks for compiler precompiled headers support
AC_MSG_CHECKING([whether compiler supports gcc style precompiled headers])
-touch conftest.h
+# Force to "no" as it is incompatible with deb building
rm -f a.out
-if $CXX -c conftest.h >/dev/null 2>&1 && test "! -e a.out -a -f conftest.h.gch"
-then
- AM_CONDITIONAL(PRECOMPILED_HEADERS, true)
- AC_MSG_RESULT([yes])
-else
- rm -f a.out
- AM_CONDITIONAL(PRECOMPILED_HEADERS, false)
- AC_MSG_RESULT([no])
-fi
+AM_CONDITIONAL(PRECOMPILED_HEADERS, false)
+AC_MSG_RESULT([Debian forced no])
AC_CONFIG_FILES(Makefile)
--- a/configure
+++ b/configure
@@ -5549,11 +5549,9 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler supports gcc style precompiled headers" >&5
$as_echo_n "checking whether compiler supports gcc style precompiled headers... " >&6; }
-touch conftest.h
+# Force to "no" as it is incompatible with deb building
rm -f a.out
-if $CXX -c conftest.h >/dev/null 2>&1 && test "! -e a.out -a -f conftest.h.gch"
-then
- if true; then
+ if false; then
PRECOMPILED_HEADERS_TRUE=
PRECOMPILED_HEADERS_FALSE='#'
else
@@ -5561,21 +5559,8 @@
PRECOMPILED_HEADERS_FALSE=
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
- rm -f a.out
- if false; then
- PRECOMPILED_HEADERS_TRUE=
- PRECOMPILED_HEADERS_FALSE='#'
-else
- PRECOMPILED_HEADERS_TRUE='#'
- PRECOMPILED_HEADERS_FALSE=
-fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Debian forced no" >&5
+$as_echo "Debian forced no" >&6; }
ac_config_files="$ac_config_files Makefile"
@@ -5713,10 +5698,6 @@
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${PRECOMPILED_HEADERS_TRUE}" && test -z "${PRECOMPILED_HEADERS_FALSE}"; then
- as_fn_error $? "conditional \"PRECOMPILED_HEADERS\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${PRECOMPILED_HEADERS_TRUE}" && test -z "${PRECOMPILED_HEADERS_FALSE}"; then
as_fn_error $? "conditional \"PRECOMPILED_HEADERS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
|