deps: Small changes for Ubuntu18 build (#4630)

tools/provision/formula/libgcrypt.rb

@@ -23,31 +23,22 @@ class Libgcrypt < AbstractOsqueryFormula
     sha256 "d02340651b18090f3df9eed47a4d84bed703103131378e1e493c26d7d0c7aab1"
   end
 
-  option :universal
-
   def install
-    ENV.universal_binary if build.universal?
-
     args = [
-      "--disable-dependency-tracking",
-      "--disable-silent-rules",
       "--disable-avx-support",
       "--disable-avx2-support",
       "--disable-drng-support",
       "--disable-pclmul-support",
-      "--disable-shared",
-      "--enable-static",
-      "--prefix=#{prefix}",
+      "--disable-sse41-support",
+      "--disable-optimization",
       "--disable-asm",
-      "--with-libgpg-error-prefix=#{Formula["libgpg-error"].opt_prefix}",
-      "--with-gpg-error-prefix=#{Formula["libgpg-error"].opt_prefix}",
+      "--with-libgpg-error-prefix=#{Formula["osquery/osquery-local/libgpg-error"].opt_prefix}",
+      "--with-gpg-error-prefix=#{Formula["osquery/osquery-local/libgpg-error"].opt_prefix}",
     ]
 
-    system "./configure", *args
-    if build.universal?
-      buildpath.install resource("config.h.ed")
-      system "ed -s - config.h <config.h.ed"
-    end
+    system "./configure", *osquery_autoconf_flags, *args
+    buildpath.install resource("config.h.ed")
+    system "ed -s - config.h <config.h.ed"
 
     cd "cipher" do
       system "make"

tools/provision/formula/popt.rb

@@ -5,6 +5,7 @@ class Popt < AbstractOsqueryFormula
   homepage "http://rpm5.org"
   license "X11"
   url "http://rpm5.org/files/popt/popt-1.16.tar.gz"
+  mirror "https://fossies.org/linux/misc/popt-1.16.tar.gz"
   sha256 "e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304cc8"
   revision 200
 

tools/provision/ubuntu.sh

@@ -27,6 +27,9 @@ function distro_main() {
   package doxygen
   package valgrind
 
+  # Needed to build thrift
+  package libfl-dev
+
   # Needed to build LLVM
   package cmake