File libkdumpfile-fallback-for-old-zlib.patch of Package libkdumpfile

Overview Repositories Revisions Requests Users Attributes Meta

File libkdumpfile-fallback-for-old-zlib.patch of Package libkdumpfile (Revision a5b8d6ff9943a09bfccd52f3e69de2a7)

Currently displaying revision a5b8d6ff9943a09bfccd52f3e69de2a7 , Show latest

From: Petr Tesarik <ptesarik@suse.com>
Subject: Fall back to AC_SEARCH_LIBS if there is no pkg-config file for zlib
Patch-mainline: never, support of legacy products only

Old version of zlib (before 1.2.7?) did not install a pkg-config file. As
a result, support for zlib compression is missing from SLE11 SP2 and older.
This is suboptimal, since most dump files for those products acutally use
that compression algorithm.

Signed-off-by: Petr Tesarik <ptesarik@suse.com>
---
 configure    |  166 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 configure.ac |    2 
 2 files changed, 165 insertions(+), 3 deletions(-)

--- a/configure.ac
+++ b/configure.ac
@@ -41,7 +41,7 @@ m4_pattern_forbid([^_?PKG_[A-Z_]+$],[***
 PKG_CHECK_MODULES(ZLIB, zlib,
   [ REQUIRES_PRIVATE="zlib $REQUIRES_PRIVATE"
     AC_DEFINE(USE_ZLIB, 1, [Define to enable support for zlib compression])
-  ],[# ignore if missing])
+  ],[kdump_COMPRESSION(zlib, ZLIB, z, uncompress)])
 AS_VAR_APPEND([CFLAGS], " $ZLIB_CFLAGS")
 AS_VAR_APPEND([LIBS], " $ZLIB_LIBS")
 
--- a/configure
+++ b/configure
@@ -767,6 +767,7 @@ enable_fast_install
 with_gnu_ld
 with_sysroot
 enable_libtool_lock
+with_zlib
 with_lzo
 with_snappy
 '
@@ -1422,6 +1423,7 @@ Optional Packages:
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-sysroot=DIR Search for dependent libraries within DIR
                         (or the compiler's sysroot if not specified).
+  --with-zlib             support for zlib compression [default=check]
   --with-lzo              support for lzo compression [default=check]
   --with-snappy           support for snappy compression [default=check]
 
@@ -11621,11 +11623,171 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$ZLIB_PKG_ERRORS" >&5
 
-	# ignore if missing
+
+# Check whether --with-zlib was given.
+if test "${with_zlib+set}" = set; then :
+  withval=$with_zlib;
+else
+  with_zlib=check
+fi
+
+if test "x$with_zlib" != xno; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing uncompress" >&5
+$as_echo_n "checking for library containing uncompress... " >&6; }
+if ${ac_cv_search_uncompress+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char uncompress ();
+int
+main ()
+{
+return uncompress ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' z; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_uncompress=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_uncompress+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_uncompress+:} false; then :
+
+else
+  ac_cv_search_uncompress=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_uncompress" >&5
+$as_echo "$ac_cv_search_uncompress" >&6; }
+ac_res=$ac_cv_search_uncompress
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+$as_echo "#define USE_ZLIB 1" >>confdefs.h
+
+      as_fn_append LIBS_PRIVATE " -lz"
+
+else
+
+      if test "x$with_zlib" != xcheck; then
+        { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "--with-zlib was given, but test for zlib failed
+See \`config.log' for more details" "$LINENO" 5; }
+      fi
+
+fi
+
+
+fi
+
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	# ignore if missing
+
+# Check whether --with-zlib was given.
+if test "${with_zlib+set}" = set; then :
+  withval=$with_zlib;
+else
+  with_zlib=check
+fi
+
+if test "x$with_zlib" != xno; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing uncompress" >&5
+$as_echo_n "checking for library containing uncompress... " >&6; }
+if ${ac_cv_search_uncompress+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char uncompress ();
+int
+main ()
+{
+return uncompress ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' z; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_uncompress=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_uncompress+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_uncompress+:} false; then :
+
+else
+  ac_cv_search_uncompress=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_uncompress" >&5
+$as_echo "$ac_cv_search_uncompress" >&6; }
+ac_res=$ac_cv_search_uncompress
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+$as_echo "#define USE_ZLIB 1" >>confdefs.h
+
+      as_fn_append LIBS_PRIVATE " -lz"
+
+else
+
+      if test "x$with_zlib" != xcheck; then
+        { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "--with-zlib was given, but test for zlib failed
+See \`config.log' for more details" "$LINENO" 5; }
+      fi
+
+fi
+
+
+fi
+
 else
 	ZLIB_CFLAGS=$pkg_cv_ZLIB_CFLAGS
 	ZLIB_LIBS=$pkg_cv_ZLIB_LIBS

Places

File libkdumpfile-fallback-for-old-zlib.patch of Package libkdumpfile (Revision a5b8d6ff9943a09bfccd52f3e69de2a7)

Places