summaryrefslogtreecommitdiff
path: root/deps/cares
diff options
context:
space:
mode:
authorBen Noordhuis <info@bnoordhuis.nl>2018-10-24 16:49:04 +0200
committerAnna Henningsen <anna@addaleax.net>2018-11-06 11:29:22 +0000
commit50f951c90f7a68bc4285a1cfb8e0180c9a336060 (patch)
treee14c6a1e85b4729440c9b981303a7519fcbed4e0 /deps/cares
parentaa82a21c3aa706036451775e7e0a9a487e2bf922 (diff)
downloadandroid-node-v8-50f951c90f7a68bc4285a1cfb8e0180c9a336060.tar.gz
android-node-v8-50f951c90f7a68bc4285a1cfb8e0180c9a336060.tar.bz2
android-node-v8-50f951c90f7a68bc4285a1cfb8e0180c9a336060.zip
deps: remove old c-ares configure files
Remove leftover files that were added in commit 58e4edaf68 from 2013 to help with standalone builds of the c-ares fork that we maintained at the time. PR-URL: https://github.com/nodejs/node/pull/23854 Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Diffstat (limited to 'deps/cares')
-rw-r--r--deps/cares/Makefile53
-rwxr-xr-xdeps/cares/android-configure21
-rw-r--r--deps/cares/build.mk147
-rw-r--r--deps/cares/build/gcc_version.py20
-rw-r--r--deps/cares/cares.gyp1
-rw-r--r--deps/cares/common.gypi172
-rw-r--r--deps/cares/get_ver.awk26
-rwxr-xr-xdeps/cares/gyp_cares98
8 files changed, 0 insertions, 538 deletions
diff --git a/deps/cares/Makefile b/deps/cares/Makefile
deleted file mode 100644
index 069c67e542..0000000000
--- a/deps/cares/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright Joyent, Inc. and other Node contributors. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-
-SRCDIR ?= $(CURDIR)
-
-ifeq (,$(builddir_name))
-
-VPATH := $(SRCDIR)
-include $(SRCDIR)/build.mk
-
-else # Out of tree build.
-
-# Drop all built-in rules.
-.SUFFIXES:
-
-.PHONY: $(builddir_name)
-$(builddir_name): $(builddir_name)/.buildstamp
- $(MAKE) -C $@ -f $(CURDIR)/Makefile $(MAKECMDGOALS) \
- SRCDIR=$(CURDIR) builddir_name=
-
-$(builddir_name)/.buildstamp:
- mkdir -p $(dir $@)
- touch $@
-
-# Add no-op rules for Makefiles to stop make from trying to rebuild them.
-Makefile:: ;
-%.mk:: ;
-
-# Turn everything else into a no-op rule that depends on the build directory.
-%:: $(builddir_name) ;
-
-.PHONY: clean
-clean:
- $(RM) -fr $(builddir_name)
-
-endif
diff --git a/deps/cares/android-configure b/deps/cares/android-configure
deleted file mode 100755
index 5299e5c718..0000000000
--- a/deps/cares/android-configure
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-export TOOLCHAIN=$PWD/android-toolchain
-mkdir -p $TOOLCHAIN
-$1/build/tools/make-standalone-toolchain.sh \
- --toolchain=arm-linux-androideabi-4.7 \
- --arch=arm \
- --install-dir=$TOOLCHAIN \
- --platform=android-9
-export PATH=$TOOLCHAIN/bin:$PATH
-export AR=arm-linux-androideabi-ar
-export CC=arm-linux-androideabi-gcc
-export CXX=arm-linux-androideabi-g++
-export LINK=arm-linux-androideabi-g++
-export PLATFORM=android
-export OS=android
-
-if [ $2 -a $2 == 'gyp' ]
- then
- ./gyp_cares -DOS=android -Dtarget_arch=arm
-fi
diff --git a/deps/cares/build.mk b/deps/cares/build.mk
deleted file mode 100644
index 91af512721..0000000000
--- a/deps/cares/build.mk
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright Joyent, Inc. and other Node contributors. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-
-OS ?= $(shell sh -c 'uname -s | tr "[A-Z]" "[a-z]"')
-
-OBJS= \
- src/ares_cancel.o \
- src/ares__close_sockets.o \
- src/ares_create_query.o \
- src/ares_data.o \
- src/ares_destroy.o \
- src/ares_expand_name.o \
- src/ares_expand_string.o \
- src/ares_fds.o \
- src/ares_free_hostent.o \
- src/ares_free_string.o \
- src/ares_gethostbyaddr.o \
- src/ares_gethostbyname.o \
- src/ares__get_hostent.o \
- src/ares_getnameinfo.o \
- src/ares_getopt.o \
- src/ares_getsock.o \
- src/ares_init.o \
- src/ares_library_init.o \
- src/ares_llist.o \
- src/ares_mkquery.o \
- src/ares_nowarn.o \
- src/ares_options.o \
- src/ares_parse_aaaa_reply.o \
- src/ares_parse_a_reply.o \
- src/ares_parse_mx_reply.o \
- src/ares_parse_naptr_reply.o \
- src/ares_parse_ns_reply.o \
- src/ares_parse_ptr_reply.o \
- src/ares_parse_soa_reply.o \
- src/ares_parse_srv_reply.o \
- src/ares_parse_txt_reply.o \
- src/ares_process.o \
- src/ares_query.o \
- src/ares__read_line.o \
- src/ares_search.o \
- src/ares_send.o \
- src/ares_strcasecmp.o \
- src/ares_strdup.o \
- src/ares_strerror.o \
- src/ares_timeout.o \
- src/ares__timeval.o \
- src/ares_version.o \
- src/ares_writev.o \
- src/bitncmp.o \
- src/inet_net_pton.o \
- src/inet_ntop.o \
-
-CFLAGS += -I. -I$(SRCDIR)/include -DHAVE_CONFIG_H
-
-ARES_CONFIG_OS = $(OS)
-SOEXT = so
-
-# if on windows
-ifneq (,$(findstring mingw,$(OS)))
-ARES_CONFIG_OS = win32
-OBJS += src/windows_port.o
-OBJS += src/ares_getenv.o
-OBJS += src/ares_platform.o
-
-LDFLAGS += -lws2_32.lib -liphlpapi.lib
-else # else a posix system
-CFLAGS += -g --std=gnu89 -pedantic
-CFLAGS += -Wall -Wextra -Wno-unused-parameter
-CFLAGS += -D_LARGEFILE_SOURCE
-CFLAGS += -D_FILE_OFFSET_BITS=64
-endif
-
-ifneq (,$(findstring cygwin,$(OS)))
-ARES_CONFIG_OS = cygwin
-CFLAGS += -D_GNU_SOURCE
-endif
-
-ifeq (dragonflybsd,$(OS))
-ARES_CONFIG_OS = freebsd
-endif
-
-ifeq (darwin,$(OS))
-CFLAGS += -D_DARWIN_USE_64_BIT_INODE=1
-LDFLAGS += -dynamiclib -install_name "@rpath/libcares.dylib"
-SOEXT = dylib
-endif
-
-ifeq (linux,$(OS))
-CFLAGS += -D_GNU_SOURCE
-endif
-
-ifeq (android,$(OS))
-CFLAGS += -D_GNU_SOURCE
-endif
-
-ifeq (sunos,$(OS))
-LDFLAGS += -lsocket -lnsl
-CFLAGS += -D__EXTENSIONS__ -D_XOPEN_SOURCE=500
-endif
-
-CFLAGS += -I$(SRCDIR)/config/$(ARES_CONFIG_OS)
-
-ifneq (,$(findstring libcares.$(SOEXT),$(MAKECMDGOALS)))
-CFLAGS += -DCARES_BUILDING_LIBRARY
-else
-CFLAGS += -DCARES_STATICLIB
-endif
-
-all: libcares.a
-
-src/.buildstamp:
- mkdir -p $(dir $@)
- touch $@
-
-libcares.a: $(OBJS)
- $(AR) rcs $@ $^
-
-libcares.$(SOEXT): override CFLAGS += -fPIC
-libcares.$(SOEXT): $(OBJS:%.o=%.pic.o)
- $(CC) -shared -o $@ $^ $(LDFLAGS)
-
-src/%.o src/%.pic.o: src/%.c include/ares.h include/ares_version.h \
- include/nameser.h src/.buildstamp \
- $(SRCDIR)/config/$(ARES_CONFIG_OS)/ares_config.h
- $(CC) $(CFLAGS) -c $< -o $@
-
-.PHONY: clean
-clean:
- $(RM) -f libcares.a libcares.$(SOEXT) src/*.o src/.buildstamp
diff --git a/deps/cares/build/gcc_version.py b/deps/cares/build/gcc_version.py
deleted file mode 100644
index da019e8661..0000000000
--- a/deps/cares/build/gcc_version.py
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env python
-
-import os
-import re
-import subprocess
-import sys
-
-
-def DoMain(*args):
- cc = os.environ.get('CC', 'gcc')
- stdin, stderr = os.pipe()
- subprocess.call([cc, '-v'], stderr=stderr)
- output = os.read(stdin, 4096)
- match = re.search("\ngcc version (\d+\.\d+\.\d+)", output)
- if match:
- print(match.group(1))
-
-
-if __name__ == '__main__':
- DoMain(*sys.argv)
diff --git a/deps/cares/cares.gyp b/deps/cares/cares.gyp
index fce52acb31..c5719f4d90 100644
--- a/deps/cares/cares.gyp
+++ b/deps/cares/cares.gyp
@@ -35,7 +35,6 @@
'include_dirs': [ 'include' ]
},
'sources': [
- 'common.gypi',
'include/ares.h',
'include/ares_rules.h',
'include/ares_version.h',
diff --git a/deps/cares/common.gypi b/deps/cares/common.gypi
deleted file mode 100644
index 609ad62a39..0000000000
--- a/deps/cares/common.gypi
+++ /dev/null
@@ -1,172 +0,0 @@
-{
- 'variables': {
- 'visibility%': 'hidden',
- 'library%': 'static_library', # allow override to 'shared_library' for DLL/.so builds
- 'component%': 'static_library',
- 'host_arch%': '',
- 'target_arch%': ''
- },
-
- 'target_defaults': {
- 'default_configuration': 'Debug',
- 'configurations': {
-
- 'Debug': {
- 'defines': [ 'DEBUG', '_DEBUG' ],
- 'cflags': [ '-g', '-O0' ],
- 'msvs_settings': {
- 'VCCLCompilerTool': {
- 'target_conditions': [
- ['library=="static_library"', {
- 'RuntimeLibrary': 1 # static debug
- }, {
- 'RuntimeLibrary': 3 # DLL debug
- }]
- ],
- 'Optimization': 0, # /Od, no optimization
- 'MinimalRebuild': 'false',
- 'OmitFramePointers': 'false',
- 'BasicRuntimeChecks': 3 # /RTC1
- },
- 'VCLinkerTool': {
- 'LinkIncremental': 2 # enable incremental linking
- }
- },
- 'xcode_settings': {
- 'GCC_OPTIMIZATION_LEVEL': '0'
- }
- },
-
- 'Release': {
- 'defines': [ 'NDEBUG' ],
- 'cflags': [
- '-O3',
- '-fomit-frame-pointer',
- '-fdata-sections',
- '-ffunction-sections'
- ],
- 'msvs_settings': {
- 'VCCLCompilerTool': {
- 'target_conditions': [
- ['library=="static_library"', {
- 'RuntimeLibrary': 0, # static release
- }, {
- 'RuntimeLibrary': 2, # debug release
- }],
- ],
- 'Optimization': 3, # /Ox, full optimization
- 'FavorSizeOrSpeed': 1, # /Ot, favour speed over size
- 'InlineFunctionExpansion': 2, # /Ob2, inline anything eligible
- 'WholeProgramOptimization': 'true', # /GL, whole program optimization, needed for LTCG
- 'OmitFramePointers': 'true',
- 'EnableFunctionLevelLinking': 'true',
- 'EnableIntrinsicFunctions': 'true'
- },
- 'VCLibrarianTool': {
- 'AdditionalOptions': [
- '/LTCG' # link time code generation
- ]
- },
- 'VCLinkerTool': {
- 'LinkTimeCodeGeneration': 1, # link-time code generation
- 'OptimizeReferences': 2, # /OPT:REF
- 'EnableCOMDATFolding': 2, # /OPT:ICF
- 'LinkIncremental': 1 # disable incremental linking
- },
- },
- }
- },
-
- 'msvs_settings': {
- 'VCCLCompilerTool': {
- 'StringPooling': 'true', # pool string literals
- 'DebugInformationFormat': 3, # Generate a PDB
- 'WarningLevel': 3,
- 'BufferSecurityCheck': 'true',
- 'ExceptionHandling': 1, # /EHsc
- 'SuppressStartupBanner': 'true',
- 'WarnAsError': 'false',
- 'AdditionalOptions': [
- '/MP', # compile across multiple CPUs
- ],
- },
- 'VCLinkerTool': {
- 'GenerateDebugInformation': 'true',
- 'RandomizedBaseAddress': 2, # enable ASLR
- 'DataExecutionPrevention': 2, # enable DEP
- 'AllowIsolation': 'true',
- 'SuppressStartupBanner': 'true',
- 'target_conditions': [
- ['_type=="executable"', {
- 'SubSystem': 1, # console executable
- }],
- ],
- },
- },
-
- 'xcode_settings': {
- 'ALWAYS_SEARCH_USER_PATHS': 'NO',
- 'GCC_CW_ASM_SYNTAX': 'NO', # No -fasm-blocks
- 'GCC_ENABLE_CPP_EXCEPTIONS': 'NO', # -fno-exceptions
- 'GCC_ENABLE_CPP_RTTI': 'NO', # -fno-rtti
- 'GCC_ENABLE_PASCAL_STRINGS': 'NO', # No -mpascal-strings
- # GCC_INLINES_ARE_PRIVATE_EXTERN maps to -fvisibility-inlines-hidden
- 'GCC_INLINES_ARE_PRIVATE_EXTERN': 'YES',
- 'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES', # -fvisibility=hidden
- 'GCC_THREADSAFE_STATICS': 'NO', # -fno-threadsafe-statics
- 'GCC_WARN_ABOUT_MISSING_NEWLINE': 'YES', # -Wnewline-eof
- 'PREBINDING': 'NO', # No -Wl,-prebind
- 'USE_HEADERMAP': 'NO',
- 'WARNING_CFLAGS': [
- '-Wall',
- '-Wendif-labels',
- '-W',
- '-Wno-unused-parameter'
- ]
- },
-
- 'conditions': [
- ['OS == "win"', {
- 'msvs_cygwin_shell': 0, # prevent actions from trying to use cygwin
- 'defines': [
- 'WIN32',
- # we don't want VC++ warning us about how dangerous C functions are.
- '_CRT_SECURE_NO_DEPRECATE',
- # ... or that C implementations shouldn't use POSIX names
- '_CRT_NONSTDC_NO_DEPRECATE'
- ],
- }],
-
- [ 'OS in "linux freebsd openbsd solaris android aix"', {
- 'variables': {
- 'gcc_version%': '<!(python build/gcc_version.py)>)'
- },
- 'cflags': [ '-Wall' ],
- 'cflags_cc': [ '-fno-rtti', '-fno-exceptions' ],
- 'conditions': [
- [ 'host_arch != target_arch and target_arch=="ia32"', {
- 'cflags': [ '-m32' ],
- 'ldflags': [ '-m32' ]
- }],
- [ 'OS=="linux"', {
- 'cflags': [ '-ansi' ]
- }],
- [ 'visibility=="hidden" and gcc_version >= "4.0.0"', {
- 'cflags': [ '-fvisibility=hidden' ]
- }],
- ]
- }]
- ],
-
- 'target_conditions': [
- ['_type!="static_library"', {
- 'cflags': [ '-fPIC' ],
- 'xcode_settings': {
- 'GCC_DYNAMIC_NO_PIC': 'NO', # No -mdynamic-no-pic
- # (Equivalent to -fPIC)
- 'OTHER_LDFLAGS': [ '-Wl,-search_paths_first' ]
- }
- }]
- ]
- }
-}
diff --git a/deps/cares/get_ver.awk b/deps/cares/get_ver.awk
deleted file mode 100644
index f9929b7361..0000000000
--- a/deps/cares/get_ver.awk
+++ /dev/null
@@ -1,26 +0,0 @@
-# ***************************************************************************
-# * Project: c-ares
-# *
-# ***************************************************************************
-# awk script which fetches c-ares version number and string from input
-# file and writes them to STDOUT. Here you can get an awk version for Win32:
-# http://www.gknw.net/development/prgtools/awk-20100523.zip
-#
-BEGIN {
- while ((getline < ARGV[1]) > 0) {
- sub("\r", "") # make MSYS gawk work with CRLF header input.
- if (match ($0, /^#define ARES_COPYRIGHT "[^"]+"$/))
- copyright_string = substr($0, 25, length($0)-25)
- else if (match ($0, /^#define ARES_VERSION_STR "[^"]+"$/))
- version_string = substr($3, 2, length($3)-2)
- else if (match ($0, /^#define ARES_VERSION_MAJOR [0-9]+$/))
- version_major = $3
- else if (match ($0, /^#define ARES_VERSION_MINOR [0-9]+$/))
- version_minor = $3
- else if (match ($0, /^#define ARES_VERSION_PATCH [0-9]+$/))
- version_patch = $3
- }
- print "LIBCARES_VERSION = " version_major "," version_minor "," version_patch
- print "LIBCARES_VERSION_STR = " version_string
- print "LIBCARES_COPYRIGHT_STR = " copyright_string
-}
diff --git a/deps/cares/gyp_cares b/deps/cares/gyp_cares
deleted file mode 100755
index d1f1640e01..0000000000
--- a/deps/cares/gyp_cares
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/usr/bin/env python
-
-import glob
-import platform
-import os
-import subprocess
-import sys
-
-CC = os.environ.get('CC', 'cc')
-script_dir = os.path.dirname(__file__)
-cares_root = os.path.normpath(script_dir)
-output_dir = os.path.join(os.path.abspath(cares_root), 'out')
-
-sys.path.insert(0, os.path.join(cares_root, 'build', 'gyp', 'pylib'))
-try:
- import gyp
-except ImportError:
- print('You need to install gyp in build/gyp first. See the README.')
- sys.exit(42)
-
-
-def host_arch():
- machine = platform.machine()
- if machine == 'i386': return 'ia32'
- if machine == 'x86_64': return 'x64'
- if machine.startswith('arm'): return 'arm'
- return machine # Return as-is and hope for the best.
-
-
-def compiler_version():
- proc = subprocess.Popen(CC.split() + ['--version'], stdout=subprocess.PIPE)
- is_clang = 'clang' in proc.communicate()[0].split('\n')[0]
- proc = subprocess.Popen(CC.split() + ['-dumpversion'], stdout=subprocess.PIPE)
- version = proc.communicate()[0].split('.')
- version = map(int, version[:2])
- version = tuple(version)
- return (version, is_clang)
-
-
-def run_gyp(args):
- rc = gyp.main(args)
- if rc != 0:
- print 'Error running GYP'
- sys.exit(rc)
-
-
-if __name__ == '__main__':
- args = sys.argv[1:]
-
- # GYP bug.
- # On msvs it will crash if it gets an absolute path.
- # On Mac/make it will crash if it doesn't get an absolute path.
- if sys.platform == 'win32':
- args.append(os.path.join(cares_root, 'cares.gyp'))
- common_fn = os.path.join(cares_root, 'common.gypi')
- options_fn = os.path.join(cares_root, 'options.gypi')
- # we force vs 2010 over 2008 which would otherwise be the default for gyp
- if not os.environ.get('GYP_MSVS_VERSION'):
- os.environ['GYP_MSVS_VERSION'] = '2010'
- else:
- args.append(os.path.join(os.path.abspath(cares_root), 'cares.gyp'))
- common_fn = os.path.join(os.path.abspath(cares_root), 'common.gypi')
- options_fn = os.path.join(os.path.abspath(cares_root), 'options.gypi')
-
- if os.path.exists(common_fn):
- args.extend(['-I', common_fn])
-
- if os.path.exists(options_fn):
- args.extend(['-I', options_fn])
-
- args.append('--depth=' + cares_root)
-
- # There's a bug with windows which doesn't allow this feature.
- if sys.platform != 'win32':
- if '-f' not in args:
- args.extend('-f make'.split())
- if 'ninja' not in args:
- args.extend(['-Goutput_dir=' + output_dir])
- args.extend(['--generator-output', output_dir])
- (major, minor), is_clang = compiler_version()
- args.append('-Dgcc_version=%d' % (10 * major + minor))
- args.append('-Dclang=%d' % int(is_clang))
-
- if not any(a.startswith('-Dhost_arch=') for a in args):
- args.append('-Dhost_arch=%s' % host_arch())
-
- if not any(a.startswith('-Dtarget_arch=') for a in args):
- args.append('-Dtarget_arch=%s' % host_arch())
-
- if not any(a.startswith('-Dlibrary=') for a in args):
- args.append('-Dlibrary=static_library')
-
- if not any(a.startswith('-Dcomponent=') for a in args):
- args.append('-Dcomponent=static_library')
-
- gyp_args = list(args)
- print gyp_args
- run_gyp(gyp_args)