yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
26ba25
From 1adffaf59f8b1a62353a009ac62aef8172514e2c Mon Sep 17 00:00:00 2001
26ba25
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
26ba25
Date: Sun, 4 Nov 2018 15:45:26 +0000
26ba25
Subject: [PATCH 01/35] configure: add test for libudev
26ba25
MIME-Version: 1.0
26ba25
Content-Type: text/plain; charset=UTF-8
26ba25
Content-Transfer-Encoding: 8bit
26ba25
26ba25
RH-Author: Marc-André Lureau <marcandre.lureau@redhat.com>
26ba25
Message-id: <20181104154528.19241-2-marcandre.lureau@redhat.com>
26ba25
Patchwork-id: 82925
26ba25
O-Subject: [RHEL8/rhel qemu-kvm PATCH 1/3] configure: add test for libudev
26ba25
Bugzilla: 1636185
26ba25
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
26ba25
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
26ba25
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
26ba25
26ba25
From: Tomáš Golembiovský <tgolembi@redhat.com>
26ba25
26ba25
Signed-off-by: Tomáš Golembiovský <tgolembi@redhat.com>
26ba25
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
26ba25
*make libudev optional to avoid breaking existing build/test environments
26ba25
*disable libudev for --static builds
26ba25
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
26ba25
26ba25
BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1636185
26ba25
26ba25
(cherry picked from commit 3efac6ebb88e4d099f07fef65178ebaa595ae770)
26ba25
26ba25
[ fix conflicts due to extra configure checks for pmem & cross upstream ]
26ba25
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
26ba25
26ba25
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
26ba25
---
26ba25
 configure | 19 +++++++++++++++++++
26ba25
 1 file changed, 19 insertions(+)
26ba25
26ba25
diff --git a/configure b/configure
26ba25
index efd9eb6..0cb2b79 100755
26ba25
--- a/configure
26ba25
+++ b/configure
26ba25
@@ -451,6 +451,7 @@ jemalloc="no"
26ba25
 replication="yes"
26ba25
 vxhs=""
26ba25
 libxml2=""
26ba25
+libudev="no"
26ba25
 
26ba25
 supported_cpu="no"
26ba25
 supported_os="no"
26ba25
@@ -819,6 +820,7 @@ Linux)
26ba25
   vhost_vsock="yes"
26ba25
   QEMU_INCLUDES="-I\$(SRC_PATH)/linux-headers -I$(pwd)/linux-headers $QEMU_INCLUDES"
26ba25
   supported_os="yes"
26ba25
+  libudev="yes"
26ba25
 ;;
26ba25
 esac
26ba25
 
26ba25
@@ -5440,6 +5442,17 @@ if test "$libnfs" != "no" ; then
26ba25
   fi
26ba25
 fi
26ba25
 
26ba25
+##########################################
26ba25
+# Do we have libudev
26ba25
+if test "$libudev" != "no" ; then
26ba25
+  if $pkg_config libudev && test "$static" != "yes"; then
26ba25
+    libudev="yes"
26ba25
+    libudev_libs=$($pkg_config --libs libudev)
26ba25
+  else
26ba25
+    libudev="no"
26ba25
+  fi
26ba25
+fi
26ba25
+
26ba25
 # Now we've finished running tests it's OK to add -Werror to the compiler flags
26ba25
 if test "$werror" = "yes"; then
26ba25
     QEMU_CFLAGS="-Werror $QEMU_CFLAGS"
26ba25
@@ -5858,6 +5871,7 @@ echo "avx2 optimization $avx2_opt"
26ba25
 echo "replication support $replication"
26ba25
 echo "VxHS block device $vxhs"
26ba25
 echo "capstone          $capstone"
26ba25
+echo "libudev           $libudev"
26ba25
 
26ba25
 if test "$sdl_too_old" = "yes"; then
26ba25
 echo "-> Your SDL version is too old - please upgrade to have SDL support"
26ba25
@@ -6684,6 +6698,11 @@ if test "$gcov" = "yes" ; then
26ba25
   echo "GCOV=$gcov_tool" >> $config_host_mak
26ba25
 fi
26ba25
 
26ba25
+if test "$libudev" != "no"; then
26ba25
+    echo "CONFIG_LIBUDEV=y" >> $config_host_mak
26ba25
+    echo "LIBUDEV_LIBS=$libudev_libs" >> $config_host_mak
26ba25
+fi
26ba25
+
26ba25
 # use included Linux headers
26ba25
 if test "$linux" = "yes" ; then
26ba25
   mkdir -p linux-headers
26ba25
-- 
26ba25
1.8.3.1
26ba25