6e16d7ac5b
This makes the build tree more organized, which is good for adding new stuff. Now, it's useful for example for adding manual pages in man3/, but it may be useful in the future for example for extending the build system to run linters (e.g., clang-tidy(1), Clang analyzer, ...) on the C source code. Previously, the build tree was quite flat, and looked like this (after `./configure && make`): $ tree -I src build build ├── Makefile ├── autoconf.data ├── autoconf.err ├── echo ├── libnxt.a ├── nxt_auto_config.h ├── nxt_version.h ├── unitd └── unitd.8 1 directory, 9 files And after this patch, it looks like this: $ tree -I src build build ├── Makefile ├── autoconf.data ├── autoconf.err ├── bin │ └── echo ├── include │ ├── nxt_auto_config.h │ └── nxt_version.h ├── lib │ ├── libnxt.a │ └── unit │ └── modules ├── sbin │ └── unitd ├── share │ └── man │ └── man8 │ └── unitd.8 └── var ├── lib │ └── unit ├── log │ └── unit └── run └── unit 17 directories, 9 files It also solves one issue introduced in5a37171f73
("Added default values for pathnames."). Before that commit, it was possible to run unitd from the build system (`./build/unitd`). Now, since it expects files in a very specific location, that has been broken. By having a directory structure that mirrors the installation, it's possible to trick it to believe it's installed, and run it from there: $ ./configure --prefix=./build $ make $ ./build/sbin/unitd Fixes:5a37171f73
("Added default values for pathnames.") Reported-by: Liam Crilly <liam@nginx.com> Reviewed-by: Konstantin Pavlov <thresh@nginx.com> Reviewed-by: Andrew Clayton <a.clayton@nginx.com> Cc: Andrei Zeliankou <zelenkov@nginx.com> Cc: Zhidao Hong <z.hong@f5.com> Signed-off-by: Alejandro Colomar <alx@nginx.com>
141 lines
3.1 KiB
Text
141 lines
3.1 KiB
Text
|
|
# 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
|
|
|
|
|
|
if [ ! -f $NXT_AUTOCONF_DATA ]; then
|
|
echo
|
|
echo Please run common $0 before configuring module \"$nxt_module\".
|
|
echo
|
|
exit 1
|
|
fi
|
|
|
|
. $NXT_AUTOCONF_DATA
|
|
|
|
|
|
$echo "configuring Go package"
|
|
$echo "configuring Go package ..." >> $NXT_AUTOCONF_ERR
|
|
|
|
$echo -n "checking for Go ..."
|
|
$echo "checking for Go ..." >> $NXT_AUTOCONF_ERR
|
|
|
|
|
|
if /bin/sh -c "${NXT_GO} version" >> $NXT_AUTOCONF_ERR 2>&1; then
|
|
$echo " found"
|
|
|
|
NXT_GO_VERSION="`${NXT_GO} version`"
|
|
$echo " + ${NXT_GO_VERSION}"
|
|
|
|
else
|
|
$echo
|
|
$echo $0: error: no Go found.
|
|
$echo
|
|
exit 1;
|
|
fi
|
|
|
|
|
|
NXT_GO_PATH=${NXT_GO_PATH=`${NXT_GO} env GOPATH`}
|
|
NXT_GO_PATH=${NXT_GO_PATH:-${PWD}/${NXT_BUILD_DIR}/${NXT_GO}}
|
|
|
|
NXT_GO_PKG=unit.nginx.org/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
|
|
|
|
NXT_GO_LDFLAGS=
|
|
|
|
for o in ${CFLAGS} ${NXT_CC_OPT}; do
|
|
case "$o" in
|
|
-fsanitize* | -L* | -l*) NXT_GO_LDFLAGS="${NXT_GO_LDFLAGS} $o" ;;
|
|
esac
|
|
done
|
|
|
|
cat << END >> $NXT_MAKEFILE
|
|
|
|
.PHONY: ${NXT_GO}
|
|
.PHONY: ${NXT_GO}-install
|
|
.PHONY: ${NXT_GO}-install-src
|
|
.PHONY: ${NXT_GO}-uninstall
|
|
|
|
GOPATH = $NXT_GO_PATH
|
|
GOOS = `${NXT_GO} env GOOS`
|
|
GOARCH = `${NXT_GO} env GOARCH`
|
|
|
|
NXT_GO_DST = ${NXT_GO_PATH%%:*}
|
|
|
|
install: ${NXT_GO}-install
|
|
|
|
${NXT_GO}:
|
|
|
|
${NXT_GO}-install: ${NXT_GO}-install-src ${NXT_GO}-install-env
|
|
cd \$(DESTDIR)\$(NXT_GO_DST)/src/${NXT_GO_PKG} && \
|
|
GOPATH=\$(DESTDIR)\$(GOPATH) ${NXT_GO} build ${NXT_GO_PKG}
|
|
|
|
${NXT_GO}-install-src:
|
|
install -d \$(DESTDIR)\$(NXT_GO_DST)/src/${NXT_GO_PKG}
|
|
install -p -m644 ./go/* \$(DESTDIR)\$(NXT_GO_DST)/src/${NXT_GO_PKG}/
|
|
|
|
${NXT_GO}-install-env: \$(DESTDIR)\$(NXT_GO_DST)/src/${NXT_GO_PKG}/env.go \
|
|
${NXT_VERSION_H} ${NXT_BUILD_DIR}/lib/${NXT_LIB_UNIT_STATIC}
|
|
|
|
\$(DESTDIR)\$(NXT_GO_DST)/src/${NXT_GO_PKG}/env.go:
|
|
install -d \$(DESTDIR)\$(NXT_GO_DST)/src/${NXT_GO_PKG}
|
|
$echo "package unit" > \$@
|
|
$echo "/*" >> \$@
|
|
$echo "#cgo CFLAGS: ${CFLAGS} ${NXT_CC_OPT}" >> \$@
|
|
$echo "#cgo CPPFLAGS: -I${PWD}/src -I${PWD}/${NXT_BUILD_DIR}/include" >> \$@
|
|
$echo "#cgo LDFLAGS: -L${PWD}/${NXT_BUILD_DIR}/lib ${NXT_GO_LDFLAGS} ${NXT_LD_OPT}" >> \$@
|
|
$echo "*/" >> \$@
|
|
$echo 'import "C"' >> \$@
|
|
|
|
|
|
uninstall: ${NXT_GO}-uninstall
|
|
|
|
${NXT_GO}-uninstall:
|
|
rm -rf \$(DESTDIR)\$(NXT_GO_DST)/src/${NXT_GO_PKG}
|
|
rm -rf \$(DESTDIR)\$(NXT_GO_DST)/pkg/\$(GOOS)_\$(GOARCH)/${NXT_GO_PKG}
|
|
|
|
END
|