diff options
author | Igor Sysoev <igor@sysoev.ru> | 2017-08-17 21:47:19 +0300 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2017-08-17 21:47:19 +0300 |
commit | 949548da293fa30ef200d07c3e4ff108174404b7 (patch) | |
tree | 8f03eaad277ec558f9ce2f223db350d134532e4b /auto | |
parent | 5ef8e0ee8933e914b1847168255b53f07c3727b3 (diff) | |
download | unit-949548da293fa30ef200d07c3e4ff108174404b7.tar.gz unit-949548da293fa30ef200d07c3e4ff108174404b7.tar.bz2 |
The new module configuration interface.
Configuration and building example:
./configure
./configure python
./configure php
./configure go
make all
or
./configure
make nginext
./configure python
make python
./configure php
make php
./configure go
make go
Modules configuration options and building examples:
./configure python --module=python2 --config=python2.7-config
make python2
./configure php --module=php7 --config=php7.0-config
--lib-path=/usr/local/php7.0
make php7
./configure go --go=go1.6 --go-path=${HOME}/go1.6
make go1.6
Diffstat (limited to 'auto')
-rw-r--r-- | auto/make | 49 | ||||
-rw-r--r-- | auto/modules/conf | 37 | ||||
-rw-r--r-- | auto/modules/go | 109 | ||||
-rw-r--r-- | auto/modules/php | 152 | ||||
-rw-r--r-- | auto/modules/python | 148 | ||||
-rw-r--r-- | auto/options | 20 | ||||
-rw-r--r-- | auto/os/conf | 8 | ||||
-rw-r--r-- | auto/os/test | 2 | ||||
-rw-r--r-- | auto/save | 24 | ||||
-rw-r--r-- | auto/sources | 1 | ||||
-rw-r--r-- | auto/unix | 6 |
11 files changed, 490 insertions, 66 deletions
@@ -20,6 +20,11 @@ NXT_EXEC_LINK = $NXT_EXEC_LINK $NXT_LD_OPT NXT_SHARED_LOCAL_LINK = $NXT_SHARED_LOCAL_LINK $NXT_LD_OPT NXT_MODULE_LINK = $NXT_MODULE_LINK $NXT_LD_OPT +.PHONY: $NXT_BIN +$NXT_BIN: $NXT_BUILD_DIR/$NXT_BIN + +all: $NXT_BIN + END @@ -169,24 +174,19 @@ $echo >> $NXT_MAKEFILE # Object files list. -nxt_modules_obj=`$echo $NXT_MODULES_SRC | sed -e "s/\.c$/\.o/"` - $echo "NXT_OBJS = \\" >> $NXT_MAKEFILE -for nxt_src in $NXT_MAKE_SRCS $NXT_MODULES_SRCS +for nxt_src in $NXT_MAKE_SRCS do nxt_obj=`$echo $nxt_src | sed -e "s/\.c$/\.o/"` $echo " $NXT_BUILD_DIR/$nxt_obj \\" >> $NXT_MAKEFILE done -$echo " $nxt_modules_obj" >> $NXT_MAKEFILE $echo >> $NXT_MAKEFILE # nginext executable. -NXT_BIN=nginext - cat << END >> $NXT_MAKEFILE $NXT_BUILD_DIR/$NXT_BIN: $NXT_BUILD_DIR/$NXT_LIB_STATIC \\ @@ -215,48 +215,17 @@ END done -# nxt_modules.c. - -cat << END >> $NXT_MAKEFILE - -$nxt_modules_obj: $NXT_MODULES_SRC \$(NXT_DEPS) - \$(CC) -c \$(CFLAGS) \$(NXT_INCS) \\ - $NXT_LIB_AUX_CFLAGS \\ - -o $nxt_modules_obj \\ - $NXT_MODULES_SRC -END - - -if [ $NXT_PYTHON_MODULE != NO ]; then - . auto/modules/python/make -fi - -if [ $NXT_PHP_MODULE != NO ]; then - . auto/modules/php/make -fi - -if [ $NXT_GO_MODULE != NO ]; then - . auto/modules/go/make -fi - - # Makefile. # *.dSYM is MacOSX Clang debug information. cat << END > Makefile -.PHONY: $NXT_BIN lib_test - -all: $NXT_BIN - include $NXT_MAKEFILE - -lib_test: $NXT_BUILD_DIR/lib_unit_test $NXT_BUILD_DIR/utf8_file_name_test +.PHONY: lib_test +lib_test: $NXT_BUILD_DIR/lib_unit_test $NXT_BUILD_DIR/utf8_file_name_test clean: - rm -rf $NXT_BUILD_DIR *.dSYM Makefile - -$NXT_BIN: $NXT_BUILD_DIR/$NXT_BIN + rm -rf $NXT_BUILD_DIR *.dSYM Makefile END diff --git a/auto/modules/conf b/auto/modules/conf new file mode 100644 index 00000000..e7f21b9e --- /dev/null +++ b/auto/modules/conf @@ -0,0 +1,37 @@ + +# Copyright (C) Igor Sysoev +# Copyright (C) NGINX, Inc. + + +if [ ! -f $NXT_AUTOCONF_DATA ]; then + echo + echo Please run common $0 before configuring module \"$nxt_module\". + echo + exit 1 +fi + +. $NXT_AUTOCONF_DATA + + +case "$nxt_module" in + + python) + . auto/modules/python + ;; + + php) + . auto/modules/php + ;; + + go) + . auto/modules/go + ;; + + *) + echo + echo $0: error: invalid module \"$nxt_module\". + echo + exit 1 + ;; + +esac diff --git a/auto/modules/go b/auto/modules/go new file mode 100644 index 00000000..dbba443d --- /dev/null +++ b/auto/modules/go @@ -0,0 +1,109 @@ + +# Copyright (C) Max Romanov +# Copyright (C) NGINX, Inc. + + +shift + +NXT_GO=go + +for nxt_option; do + + case "$nxt_option" in + -*=*) value=`$echo "$nxt_option" | sed -e 's/[-_a-zA-Z0-9]*=//'` ;; + *) value="" ;; + esac + + case "$nxt_option" in + --go=*) NXT_GO="$value" ;; + --go-path=*) NXT_GO_PATH="$value" ;; + + --help) + cat << END + + --go=NAME set go executable + --go-path=PATH set GOPATH variable to install package + +END + exit 0 + ;; + + *) + $echo + $echo $0: error: invalid Go option \"$nxt_option\" + $echo + exit 1 + ;; + + esac + +done + + +$echo "configuring Go package" +$echo "configuring Go package ..." >> $NXT_AUTOCONF_ERR + +$echo -n "checking for Go ..." +$echo "checking for Go ..." >> $NXT_AUTOCONF_ERR + +nxt_go_test="GOPATH=`pwd` CGO_CPPFLAGS=-DNXT_CONFIGURE \ + \"${NXT_GO}\" build -o build/nxt_go_gen.a --buildmode=c-archive nginext" + + +if /bin/sh -c "$nxt_go_test" >> $NXT_AUTOCONF_ERR 2>&1; then + $echo " found" + + NXT_GO_VERSION="`${NXT_GO} version`" + $echo " + ${NXT_GO_VERSION}" + +else + $echo "----------" >> $NXT_AUTOCONF_ERR + $echo $nxt_go_test >> $NXT_AUTOCONF_ERR + $echo "----------" >> $NXT_AUTOCONF_ERR + $echo + $echo + $echo $0: error: no Go found. + $echo + exit 1; +fi + + + +NXT_GO_PATH=${NXT_GO_PATH=`go env GOPATH`} +NXT_GO_PATH=${NXT_GO_PATH:-`pwd`/${NXT_GO}} + +$echo " + Go package path: \"${NXT_GO_PATH}\"" + +if grep ^$NXT_GO: $NXT_MAKEFILE 2>&1 > /dev/null; then + $echo + $echo $0: error: duplicate \"$NXT_GO\" package configured. + $echo + exit 1; +fi + +cat << END >> $NXT_MAKEFILE + +.PHONY: ${NXT_GO} + +NXT_ROOT = `pwd` + +GOPATH = $NXT_GO_PATH +GOOS = `go env GOOS` +GOARCH = `go env GOARCH` + +${NXT_GO}: + install -d \$(GOPATH)/src/nginext + install -p ./src/nginext/*.c ./src/nginext/*.h \\ + ./src/nginext/*.go \$(GOPATH)/src/nginext/ + CGO_CFLAGS="-I\$(NXT_ROOT)/build -I\$(NXT_ROOT)/src" \\ + CGO_LDFLAGS="-L\$(NXT_ROOT)/build" \\ + GOPATH=$NXT_GO_PATH \\ + go install -v nginext + +${NXT_GO}-uninstall: + rm -rf \$(GOPATH)/src/nginext + rm -f \$(GOPATH)/pkg/\$(GOOS)_\$(GOARCH)/nginext.a + +END + +sed -i.bak -e "s/\(all:.*\)/\1 ${NXT_GO}/" $NXT_MAKEFILE diff --git a/auto/modules/php b/auto/modules/php new file mode 100644 index 00000000..c9fff12f --- /dev/null +++ b/auto/modules/php @@ -0,0 +1,152 @@ + +# Copyright (C) Max Romanov +# Copyright (C) Igor Sysoev +# Copyright (C) NGINX, Inc. + + +shift + +for nxt_option; do + + case "$nxt_option" in + -*=*) value=`$echo "$nxt_option" | sed -e 's/[-_a-zA-Z0-9]*=//'` ;; + *) value="" ;; + esac + + case "$nxt_option" in + --config=*) NXT_PHP_CONFIG="$value" ;; + --module=*) NXT_PHP_MODULE="$value" ;; + --lib-path=*) NXT_PHP_LIB_PATH="$value" ;; + + --help) + cat << END + + --config=NAME set php-config name + --module=NAME set php module name + --lib-path=PATH set path to libphp.so library + +END + exit 0 + ;; + + *) + $echo + $echo $0: error: invalid PHP option \"$nxt_option\" + $echo + exit 1 + ;; + + esac + + +done + + +NXT_PHP_CONFIG=${NXT_PHP_CONFIG=php-config} +NXT_PHP=${NXT_PHP_CONFIG%-config*} +NXT_PHP_MODULE=${NXT_PHP_MODULE=${NXT_PHP##*/}} +NXT_PHP_LIB_PATH=${NXT_PHP_LIB_PATH=} + + +$echo "configuring PHP module" +$echo "configuring PHP module ..." >> $NXT_AUTOCONF_ERR + +$echo -n "checking for PHP ..." +$echo "checking for PHP ..." >> $NXT_AUTOCONF_ERR + +NXT_PHP_LDFLAGS= + +if /bin/sh -c "${NXT_PHP_CONFIG} --version" >> $NXT_AUTOCONF_ERR 2>&1; then + + $echo " found" + + NXT_PHP_VERSION="`${NXT_PHP_CONFIG} --version`" + $echo " + PHP version: ${NXT_PHP_VERSION}" + $echo " + PHP SAPI: [`${NXT_PHP_CONFIG} --php-sapis`]" + + NXT_PHP_INCLUDE="`${NXT_PHP_CONFIG} --includes`" + NXT_PHP_LIB="-lphp${NXT_PHP_VERSION%%.*}" + + if [ "$NXT_PHP_LIB_PATH" != "" ]; then + # "php-config --ldflags" does not contain path to libphp. + NXT_PHP_LDFLAGS="-L${NXT_PHP_LIB_PATH} -Wl,-rpath ${NXT_PHP_LIB_PATH}" + fi + + nxt_feature="PHP embed SAPI" + nxt_feature_name=NXT_HAVE_PHP + nxt_feature_run=no + nxt_feature_incs="${NXT_PHP_INCLUDE}" + nxt_feature_libs="${NXT_PHP_LIB} ${NXT_PHP_LDFLAGS}" + nxt_feature_test=" + #include <php.h> + #include <php_main.h> + + int main() { + php_request_startup(); + return 0; + }" + + . auto/feature + + if [ $nxt_found = no ]; then + $echo + $echo $0: error: no PHP embed SAPI found. + $echo + exit 1; + fi + +else + $echo + $echo $0: error: no PHP found. + $echo + exit 1; +fi + +if grep ^$NXT_PHP_MODULE: $NXT_MAKEFILE 2>&1 > /dev/null; then + $echo + $echo $0: error: duplicate \"$NXT_PHP_MODULE\" module configured. + $echo + exit 1; +fi + +$echo " + PHP module: nginext.${NXT_PHP_MODULE}" + + +$echo >> $NXT_MAKEFILE + +NXT_PHP_MODULE_SRCS=" \ + src/nxt_php_sapi.c \ +" + +# The php module object files. + +nxt_objs= + +for nxt_src in $NXT_PHP_MODULE_SRCS; do + + nxt_obj=`$echo $nxt_src | sed -e "s/\.c$/-$NXT_PHP_MODULE.o/"` + nxt_objs="$nxt_objs $NXT_BUILD_DIR/$nxt_obj" + + cat << END >> $NXT_MAKEFILE + +$NXT_BUILD_DIR/$nxt_obj: $nxt_src + \$(CC) -c \$(CFLAGS) \$(NXT_INCS) $NXT_PHP_INCLUDE \\ + -o $NXT_BUILD_DIR/$nxt_obj $nxt_src +END + +done + + +cat << END >> $NXT_MAKEFILE + +.PHONY: ${NXT_PHP_MODULE} + +${NXT_PHP_MODULE}: $NXT_BUILD_DIR/nginext.${NXT_PHP_MODULE} + +$NXT_BUILD_DIR/nginext.${NXT_PHP_MODULE}: $nxt_objs + $NXT_MODULE_LINK -o $NXT_BUILD_DIR/nginext.${NXT_PHP_MODULE} \\ + $nxt_objs ${NXT_PHP_LIB} ${NXT_PHP_LDFLAGS} + +END + +sed -i.bak -e "s/\(all:.*\)/\1 ${NXT_PHP_MODULE}/" $NXT_MAKEFILE diff --git a/auto/modules/python b/auto/modules/python new file mode 100644 index 00000000..d34abca9 --- /dev/null +++ b/auto/modules/python @@ -0,0 +1,148 @@ + +# Copyright (C) Valentin V. Bartenev +# Copyright (C) Igor Sysoev +# Copyright (C) NGINX, Inc. + + +shift + +for nxt_option; do + + case "$nxt_option" in + -*=*) value=`$echo "$nxt_option" | sed -e 's/[-_a-zA-Z0-9]*=//'` ;; + *) value="" ;; + esac + + case "$nxt_option" in + + --config=*) NXT_PYTHON_CONFIG="$value" ;; + --module=*) NXT_PYTHON_MODULE="$value" ;; + + --help) + cat << END + + --config=NAME set python-config name + --module=NAME set python module name + +END + exit 0 + ;; + + *) + $echo + $echo $0: error: invalid Python option \"$nxt_option\" + $echo + exit 1 + ;; + esac + +done + + +NXT_PYTHON_CONFIG=${NXT_PYTHON_CONFIG=python-config} +NXT_PYTHON=${NXT_PYTHON_CONFIG%-config*} +NXT_PYTHON_MODULE=${NXT_PYTHON_MODULE=${NXT_PYTHON##*/}} + + +$echo "configuring Python module" +$echo "configuring Python module ..." >> $NXT_AUTOCONF_ERR + +nxt_found=no + +if /bin/sh -c "$NXT_PYTHON_CONFIG --prefix" >> $NXT_AUTOCONF_ERR 2>&1; then + + NXT_PYTHON_INCLUDE=`${NXT_PYTHON_CONFIG} --includes` + NXT_PYTHON_LIBS=`${NXT_PYTHON_CONFIG} --ldflags` + + nxt_feature="Python" + nxt_feature_name=NXT_HAVE_PYTHON + nxt_feature_run=no + nxt_feature_incs="${NXT_PYTHON_INCLUDE}" + nxt_feature_libs="${NXT_PYTHON_LIBS}" + nxt_feature_test=" + #include <Python.h> + + int main() { + Py_Initialize(); + return 0; + }" + + . auto/feature + +else + $echo "checking for Python ... not found" +fi + +if [ $nxt_found = no ]; then + $echo + $echo $0: error: no Python found. + $echo + exit 1; +fi + + +nxt_feature="Python version" +nxt_feature_name=NXT_PYTHON_VERSION +nxt_feature_run=value +nxt_feature_incs="${NXT_PYTHON_INCLUDE}" +nxt_feature_libs="${NXT_PYTHON_LIBS}" +nxt_feature_test=" + #include <Python.h> + #include <stdio.h> + + int main() { + printf("PY_VERSION"); + return 0; + }" + +. auto/feature + + +if grep ^$NXT_PYTHON_MODULE: $NXT_MAKEFILE 2>&1 > /dev/null; then + $echo + $echo $0: error: duplicate \"$NXT_PYTHON_MODULE\" module configured. + $echo + exit 1; +fi + +$echo " + Python module: nginext.${NXT_PYTHON_MODULE}" + + +$echo >> $NXT_MAKEFILE + +NXT_PYTHON_MODULE_SRCS=" \ + src/nxt_python_wsgi.c \ +" + +# The python module object files. + +nxt_objs= + +for nxt_src in $NXT_PYTHON_MODULE_SRCS; do + + nxt_obj=`$echo $nxt_src | sed -e "s/\.c$/-$NXT_PYTHON_MODULE.o/"` + nxt_objs="$nxt_objs $NXT_BUILD_DIR/$nxt_obj" + + cat << END >> $NXT_MAKEFILE + +$NXT_BUILD_DIR/$nxt_obj: $nxt_src + \$(CC) -c \$(CFLAGS) \$(NXT_INCS) $NXT_PYTHON_INCLUDE \\ + -o $NXT_BUILD_DIR/$nxt_obj $nxt_src +END + +done + + +cat << END >> $NXT_MAKEFILE + +.PHONY: ${NXT_PYTHON_MODULE} + +${NXT_PYTHON_MODULE}: $NXT_BUILD_DIR/nginext.${NXT_PYTHON_MODULE} + +$NXT_BUILD_DIR/nginext.${NXT_PYTHON_MODULE}: $nxt_objs + $NXT_MODULE_LINK -o $NXT_BUILD_DIR/nginext.${NXT_PYTHON_MODULE} \\ + $nxt_objs $NXT_PYTHON_LIBS + +END + +sed -i.bak -e "s/\(all:.*\)/\1 ${NXT_PYTHON_MODULE}/" $NXT_MAKEFILE diff --git a/auto/options b/auto/options index 594a5ab8..5e402524 100644 --- a/auto/options +++ b/auto/options @@ -41,16 +41,6 @@ NXT_TEST_BUILD_HPUX_SENDFILE=NO NXT_LIB_UNIT_TEST=NO -NXT_PYTHON=python -NXT_PYTHON_MODULE=NO - -NXT_PHP=php -NXT_PHP_LDFLAGS= -NXT_PHP_MODULE=NO - -NXT_GO=go -NXT_GO_MODULE=NO - for nxt_option do case "$nxt_option" in @@ -96,16 +86,6 @@ do --with-lib-unit-tests) NXT_LIB_UNIT_TEST=YES ;; - --with-python=*) NXT_PYTHON="$value" ;; - --with-python_module) NXT_PYTHON_MODULE=YES ;; - - --with-php=*) NXT_PHP="$value" ;; - --with-php-ldflags=*) NXT_PHP_LDFLAGS="$value" ;; - --with-php_module) NXT_PHP_MODULE=YES ;; - - --with-go=*) NXT_GO="$value" ;; - --with-go_module) NXT_GO_MODULE=YES ;; - *) $echo $echo "$0: error: invalid option \"$nxt_option\"". diff --git a/auto/os/conf b/auto/os/conf index 3db382c6..6d86a849 100644 --- a/auto/os/conf +++ b/auto/os/conf @@ -26,7 +26,6 @@ case "$NXT_SYSTEM" in NXT_SHARED_LOCAL_LINK="\$(CC) -shared \ -Wl,-soname,\\\$\$ORIGIN/libnxt.so" NXT_MODULE_LINK="\$(CC) -shared" - NXT_MODULE_LINK="\$(CC) -shared" # "-Wl,-E" exports symbols of executable file. NXT_EXEC_LINK="\$(CC) -Wl,-E" @@ -104,8 +103,8 @@ case "$NXT_SYSTEM" in # MacOSX 10.6 (Snow Leopard) has deprecated ucontext(3). # MacOSX 10.7 (Lion) has deprecated system OpenSSL. # MAC_OS_X_VERSION_MIN_REQUIRED macro does not help. - # The minimum version allowed for i386 is 10.4 (Tiger). - NXT_CFLAGS="$NXT_CFLAGS -mmacosx-version-min=10.4" + # "-rpath" is supported since MacOSX 10.5 (Leopard). + NXT_CFLAGS="$NXT_CFLAGS -mmacosx-version-min=10.5" NXT_STATIC_LINK="ar -r -c" NXT_SHARED_LINK="\$(CC) -dynamiclib" @@ -113,7 +112,8 @@ case "$NXT_SYSTEM" in -install_name @executable_path/libnxt.dylib" # Prior to MacOSX 10.5 (Leopard) only bundles could be unloaded. - NXT_MODULE_LINK="\$(CC) -bundle -undefined dynamic_lookup" + # NXT_MODULE_LINK="\$(CC) -bundle -undefined dynamic_lookup" + NXT_MODULE_LINK="\$(CC) -dynamiclib -undefined dynamic_lookup" NXT_EXEC_LINK="\$(CC)" NXT_SHARED_LOCAL_EXEC_LINK= diff --git a/auto/os/test b/auto/os/test index 36ce50ae..0332fcfa 100644 --- a/auto/os/test +++ b/auto/os/test @@ -41,7 +41,7 @@ case "$NXT_SYSTEM" in echo=echo CC=${CC:-cc} - NXT_TEST_CFLAGS="$NXT_TEST_CFLAGS -mmacosx-version-min=10.4" + NXT_TEST_CFLAGS="$NXT_TEST_CFLAGS -mmacosx-version-min=10.5" ;; AIX) diff --git a/auto/save b/auto/save new file mode 100644 index 00000000..d295ad8b --- /dev/null +++ b/auto/save @@ -0,0 +1,24 @@ + +# Copyright (C) Igor Sysoev +# Copyright (C) NGINX, Inc. + + +cat << END > $NXT_AUTOCONF_DATA + +CC='$CC' +CFLAGS='$CFLAGS' + +NXT_CFLAGS='$NXT_CFLAGS' +NXT_CC_OPT='$NXT_CC_OPT' +NXT_LD_OPT='$NXT_LD_OPT' +NXT_MODULE_LINK='$NXT_MODULE_LINK' + +NXT_TEST_CFLAGS='$NXT_TEST_CFLAGS' +NXT_TEST_LIBS='$NXT_TEST_LIBS' + +echo=$NXT_BUILD_DIR/echo + +NXT_LIB_AUX_CFLAGS= +NXT_LIB_AUX_LIBS= + +END diff --git a/auto/sources b/auto/sources index f4447c2a..6ef8b5fe 100644 --- a/auto/sources +++ b/auto/sources @@ -147,6 +147,7 @@ NXT_LIB_SRCS=" \ src/nxt_controller.c \ src/nxt_router.c \ src/nxt_application.c \ + src/nxt_go.c \ src/nxt_port_hash.c \ " @@ -73,6 +73,8 @@ fi # FreeBSD dlopen() is in libc. # MacOSX libdl.dylib is a symlink to libSystem.dylib. +# GCC5 AddressSanitizer intercepts dlopen() and dlclose() but not dlsym() +# so all dynamic linker functions should be tested. NXT_LIBDL= @@ -85,7 +87,9 @@ nxt_feature_test="#include <stdlib.h> #include <dlfcn.h> int main() { - dlopen(NULL, 0); + void *h = dlopen(NULL, RTLD_NOW | RTLD_GLOBAL); + dlsym(h, \"\"); + dlclose(h); return 0; }" . auto/feature |