aboutsummaryrefslogtreecommitdiffhomepage
path: root/third_party/libmicrohttpd
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2016-09-22 11:51:24 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-09-22 11:51:24 -0700
commitecbc526418414f6f9d29b176ea0ad8037fff2e2d (patch)
treed30b81603e03e85738aa4faa867a4cc165908ae4 /third_party/libmicrohttpd
parentbac104605ef3d9a8ed0022694990f00518b809e9 (diff)
GN: build skiaserve
I trimmed the libmicrohttpd sources and defines down to the minimum needed to build and run. This builds and runs on Linux and Android for me. Request.h was missing an include for SkTypes.h, which supplies the default for SK_GPU_SUPPORTED if not otherwise defined. To build on Android, exit() -> _exit(). build.py was unused. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2367513002 NOTREECHECKS=true Review-Url: https://codereview.chromium.org/2367513002
Diffstat (limited to 'third_party/libmicrohttpd')
-rw-r--r--third_party/libmicrohttpd/BUILD.gn36
-rw-r--r--third_party/libmicrohttpd/build.py38
2 files changed, 36 insertions, 38 deletions
diff --git a/third_party/libmicrohttpd/BUILD.gn b/third_party/libmicrohttpd/BUILD.gn
new file mode 100644
index 0000000000..723807723f
--- /dev/null
+++ b/third_party/libmicrohttpd/BUILD.gn
@@ -0,0 +1,36 @@
+# Copyright 2016 Google Inc.
+#
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+declare_args() {
+}
+
+import("../third_party.gni")
+
+third_party("libmicrohttpd") {
+ public_include_dirs = [ "../externals/microhttpd/src/include" ]
+
+ include_dirs = [ "." ]
+ sources = [
+ "../externals/microhttpd/src/microhttpd/base64.c",
+ "../externals/microhttpd/src/microhttpd/connection.c",
+ "../externals/microhttpd/src/microhttpd/daemon.c",
+ "../externals/microhttpd/src/microhttpd/internal.c",
+ "../externals/microhttpd/src/microhttpd/memorypool.c",
+ "../externals/microhttpd/src/microhttpd/postprocessor.c",
+ "../externals/microhttpd/src/microhttpd/reason_phrase.c",
+ "../externals/microhttpd/src/microhttpd/response.c",
+ ]
+
+ defines = [ "DAUTH_SUPPORT=1" ]
+
+ if (!is_win) {
+ defines += [
+ "HAVE_NETINET_IN_H=1",
+ "HAVE_PTHREAD_H=1",
+ "HAVE_SYS_SOCKET_H=1",
+ "MHD_USE_POSIX_THREADS=1",
+ ]
+ }
+}
diff --git a/third_party/libmicrohttpd/build.py b/third_party/libmicrohttpd/build.py
deleted file mode 100644
index f09a360204..0000000000
--- a/third_party/libmicrohttpd/build.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2016 Google Inc.
-#
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# this script will configure and build microhttpd in a temp directory and then
-# copy the static library generated to a destination folder
-import argparse
-import os
-from subprocess import call
-import shutil
-import tempfile
-
-parser = argparse.ArgumentParser()
-parser.add_argument("--src", help="microhttpd src directory")
-parser.add_argument("--out", help="build directory")
-parser.add_argument("--dst", help="output for final build products")
-args = parser.parse_args()
-
-out_dir = args.out
-cwd = os.getcwd()
-try:
- os.makedirs(out_dir)
-except OSError as e:
- pass
-
-os.chdir(out_dir)
-call([os.path.join(cwd, args.src, "configure"),
- "--disable-doc",
- "--disable-examples",
- "--enable-https=no",
- "--disable-curl",
- "--enable-spdy=no",
- "--enable-shared=no"])
-call(["make", "--silent"])
-call(["cp",
- "src/microhttpd/.libs/libmicrohttpd.a",
- os.path.join(cwd, args.dst)])