[gentoo-commits] gentoo-x86 commit in app-emulation/libguestfs/files/1.8/1.8.16: 0002-disable_php_in_makefile.patch 0001-configure_ac_automagic_patch.patch 0003-hivex_to_hard_error.patch

[Maxim Koltsov (maksbotan)]

maksbotan    12/01/05 11:23:23

  Added:                0002-disable_php_in_makefile.patch
                        0001-configure_ac_automagic_patch.patch
                        0003-hivex_to_hard_error.patch
  Log:
  Bump to 1.8.16, thanks to slepnoga
  
  (Portage version: 2.1.10.44/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  app-emulation/libguestfs/files/1.8/1.8.16/0002-disable_php_in_makefile.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.8/1.8.16/0002-disable_php_in_makefile.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.8/1.8.16/0002-disable_php_in_makefile.patch?rev=1.1&content-type=text/plain

Index: 0002-disable_php_in_makefile.patch
===================================================================
# HG changeset patch
# User Andreis Vinogradovs <spamslepnoga@×××××.ru>
# Date 1325421062 -7200
# Node ID 8d969d9324fa8f1f5384037627d5478e33be5d47
# Parent  ba14909c0a95bf9879e6df25d8128d1cf9a75252
disable_php_in_makefile

diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -57,9 +57,12 @@
 if HAVE_HASKELL
 SUBDIRS += haskell
 endif
-if HAVE_PHP
-SUBDIRS += php
-endif
+
+# use Gentoo way to compile/install php extension
+# due slot  system
+#if HAVE_PHP
+#SUBDIRS += php
+#endif
 
 # Unconditional because nothing is built yet.
 SUBDIRS += csharp



1.1                  app-emulation/libguestfs/files/1.8/1.8.16/0001-configure_ac_automagic_patch.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.8/1.8.16/0001-configure_ac_automagic_patch.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.8/1.8.16/0001-configure_ac_automagic_patch.patch?rev=1.1&content-type=text/plain

Index: 0001-configure_ac_automagic_patch.patch
===================================================================
# HG changeset patch
# User Andreis Vinogradovs <spamslepnoga@×××××.ru>
# Date 1325421041 -7200
# Node ID ba14909c0a95bf9879e6df25d8128d1cf9a75252
# Parent  c9bc634a526984160a40b70f71895de0a855f4c0
configure_ac_automagic.patch

diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -217,6 +217,10 @@
     if test -f /etc/arch-release; then
         DISTRO=ARCHLINUX
     fi
+    dnl Slepnoga for Gentoo
+    if test -f /etc/gentoo-release; then
+    	DISTRO=GENTOO
+   fi
     AC_MSG_RESULT([$DISTRO])
     AC_SUBST([DISTRO])
 fi
@@ -461,7 +465,7 @@
                  AC_DEFINE([HAVE_LIBMAGIC],[1],[libmagic found at compile time.])
                 ], [])
         ],
-        [AC_MSG_WARN([libmagic not found, some core features will be disabled])])
+        [AC_MSG_FAILURE([libmagic not found, some core features will be disabled])])
 
 dnl Check for PCRE (highly recommended)
 PKG_CHECK_MODULES([PCRE], [libpcre],
@@ -469,7 +473,7 @@
          AC_SUBST([PCRE_LIBS])
          AC_DEFINE([HAVE_PCRE],[1],[PCRE found at compile time.])
         ],
-        [AC_MSG_WARN([PCRE not found, some core features will be disabled])])
+        [AC_MSG_FAILURE([PCRE not found, some core features will be disabled])])
 
 dnl libvirt (highly recommended)
 PKG_CHECK_MODULES([LIBVIRT], [libvirt],
@@ -486,7 +490,7 @@
          AC_SUBST([LIBXML2_LIBS])
          AC_DEFINE([HAVE_LIBXML2],[1],[libxml2 found at compile time.])
         ],
-        [AC_MSG_WARN([libxml2 not found, some core features will be disabled])])
+        [AC_MSG_FAILURE([libxml2 not found, some core features will be disabled])])
 AM_CONDITIONAL([HAVE_LIBXML2],[test "x$LIBXML2_LIBS" != "x"])
 
 dnl hivex library (highly recommended)
@@ -654,13 +658,13 @@
 AM_CONDITIONAL([HAVE_RUBY],
     [test "x$RAKE" != "xno" && test -n "$HAVE_LIBRUBY"])
 
-dnl Check for Java.
-AC_ARG_WITH(java_home,
-    [AS_HELP_STRING([--with-java-home],
-        [specify path to JDK directory @<:@default=check@:>@])],
-    [],
-    [with_java_home=check])
+AC_ARG_ENABLE([java],
+	AS_HELP_STRING([--enable-java], [Disable Java language bindings]),
+        [enable_java=no],
+	[enable_java=yes])
 
+AS_IF([test "x$enable_java" = "xyes"],
+	[
 if test "x$with_java_home" != "xno"; then
     if test "x$with_java_home" != "xyes" && test "x$with_java_home" != "xcheck"
     then
@@ -756,7 +760,6 @@
             fi
         fi
         AC_MSG_RESULT([$JNI_CFLAGS])
-
         dnl Need extra version flag?
         AC_MSG_CHECKING([extra javac flags])
         JAVAC_FLAGS=
@@ -791,8 +794,8 @@
 AC_SUBST(JAR_INSTALL_DIR)
 AC_SUBST(JNI_INSTALL_DIR)
 AC_SUBST(JNI_VERSION_INFO)
-
-AM_CONDITIONAL([HAVE_JAVA],[test -n "$JAVAC"])
+])
+AM_CONDITIONAL([HAVE_JAVA],[test -n "$JAVAC" && test "x$enable_java" != "xno"])
 
 dnl Check for Haskell (GHC).
 GHC=no
@@ -849,8 +852,12 @@
 
 dnl Replace libtool with a wrapper that clobbers dependency_libs in *.la files
 dnl http://lists.fedoraproject.org/pipermail/devel/2010-November/146343.html
-LIBTOOL='bash $(top_srcdir)/libtool-kill-dependency_libs.sh $(top_builddir)/libtool'
-AC_SUBST([LIBTOOL])
+dnl ha-ha, criocamera :) - gentoo kill la files in other way's
+dnlLIBTOOL='$(SHELL) $(top_srcdir)/libtool-kill-dependency_libs.sh $(top_builddir)/libtool'
+dnl haha, are stub
+dnl AC_PROG_LIBTOOL
+dnl AC_SUBST([LIBTOOL])
+LT_INIT
 
 dnl Run in subdirs.
 if test "x$enable_daemon" = "xyes"; then



1.1                  app-emulation/libguestfs/files/1.8/1.8.16/0003-hivex_to_hard_error.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.8/1.8.16/0003-hivex_to_hard_error.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libguestfs/files/1.8/1.8.16/0003-hivex_to_hard_error.patch?rev=1.1&content-type=text/plain

Index: 0003-hivex_to_hard_error.patch
===================================================================
# HG changeset patch
# User Andreis Vinogradovs <spamslepnoga@×××××.ru>
# Date 1325421826 -7200
# Node ID 4bcdef3cca5c867d82c72d4b394b866a3b9f2d95
# Parent  8d969d9324fa8f1f5384037627d5478e33be5d47
hivex to hard error

diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -501,7 +501,7 @@
          AC_SUBST([HIVEX_LIBS])
          AC_DEFINE([HAVE_HIVEX],[1],[hivex library found at compile time.])
         ],
-        [AC_MSG_WARN([hivex not found, some core features will be disabled])])
+        [AC_MSG_ERROR([hivex not found, some core features will be disabled])])
 
 dnl FUSE is optional to build the FUSE module.
 AC_ARG_ENABLE([fuse],