technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Perl: removed "--include=" configure option.

Browse Source 
It's surplus option because the perl executable returns the proper path.

Also the Perl module configure script was cleaned up a bit.
Note that NXT_PERL_LDOPTS already contains the library path.
This commit is contained in:
Valentin Bartenev
2019-07-17 21:17:30 +03:00
parent a920215a5c
commit dbce694d5a
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
auto/modules/perl
View File

@@ -14,14 +14,12 @@ for nxt_option; do
case "$nxt_option" in case "$nxt_option" in
--perl=*) NXT_PERL="$value" ;; --perl=*) NXT_PERL="$value" ;;
--include=*) NXT_PERL_INCPATH="$value" ;;
--module=*) NXT_PERL_MODULE="$value" ;; --module=*) NXT_PERL_MODULE="$value" ;;
--help) --help)
cat << END cat << END
--perl=FILE set perl executable, default: perl --perl=FILE set perl executable, default: perl
--include=DIRECTORY set directory path to perl headers
--module=NAME set unit perl module name --module=NAME set unit perl module name
END END
@@ -59,10 +57,8 @@ nxt_found=no
if /bin/sh -c "$NXT_PERL -MConfig -e 'print \"Perl version: \", if /bin/sh -c "$NXT_PERL -MConfig -e 'print \"Perl version: \",
\$Config{version}, \"\\n\"'" >> $NXT_AUTOCONF_ERR 2>&1; then \$Config{version}, \"\\n\"'" >> $NXT_AUTOCONF_ERR 2>&1; then
NXT_PERL_INCPATH=${NXT_PERL_INCPATH=`$NXT_PERL -MConfig -e 'print $Config{archlib}, "/CORE"'`} NXT_PERL_INCLUDE=`$NXT_PERL -MExtUtils::Embed -e perl_inc | sed -e 's/^ //;s/ $//'`
NXT_PERL_INCLUDE="-I ${NXT_PERL_INCPATH}" NXT_PERL_LDOPTS=`$NXT_PERL -MExtUtils::Embed -e ldopts | sed -e 's/^ //;s/ $//'`
NXT_PERL_LDOPTS=`$NXT_PERL -MExtUtils::Embed -e ldopts`
if [ "$NXT_SYSTEM" = "Darwin" ]; then if [ "$NXT_SYSTEM" = "Darwin" ]; then
# OS X system perl wants to link universal binaries # OS X system perl wants to link universal binaries
@@ -70,13 +66,11 @@ if /bin/sh -c "$NXT_PERL -MConfig -e 'print \"Perl version: \",
| sed -e 's/-arch i386//' -e 's/-arch x86_64//'` | sed -e 's/-arch i386//' -e 's/-arch x86_64//'`
fi fi
NXT_PERL_LIBS="-L ${NXT_PERL_INCPATH} ${NXT_PERL_LDOPTS}"
nxt_feature="Perl" nxt_feature="Perl"
nxt_feature_name="" nxt_feature_name=""
nxt_feature_run=no nxt_feature_run=no
nxt_feature_incs="${NXT_PERL_INCLUDE}" nxt_feature_incs="${NXT_PERL_INCLUDE}"
nxt_feature_libs="${NXT_PERL_LIBS}" nxt_feature_libs="${NXT_PERL_LDOPTS}"
nxt_feature_test=" nxt_feature_test="
#define _GNU_SOURCE #define _GNU_SOURCE
#include <EXTERN.h> #include <EXTERN.h>
@@ -123,7 +117,7 @@ nxt_feature="Perl version"
nxt_feature_name="" nxt_feature_name=""
nxt_feature_run=value nxt_feature_run=value
nxt_feature_incs="${NXT_PERL_INCLUDE}" nxt_feature_incs="${NXT_PERL_INCLUDE}"
nxt_feature_libs="${NXT_PERL_LIBS}" nxt_feature_libs="${NXT_PERL_LDOPTS}"
nxt_feature_test=" nxt_feature_test="
#define _GNU_SOURCE #define _GNU_SOURCE
#include <EXTERN.h> #include <EXTERN.h>
@@ -194,7 +188,7 @@ ${NXT_PERL_MODULE}: $NXT_BUILD_DIR/${NXT_PERL_MODULE}.unit.so
$NXT_BUILD_DIR/${NXT_PERL_MODULE}.unit.so: $nxt_objs $NXT_BUILD_DIR/${NXT_PERL_MODULE}.unit.so: $nxt_objs
\$(NXT_MODULE_LINK) -o $NXT_BUILD_DIR/${NXT_PERL_MODULE}.unit.so \\ \$(NXT_MODULE_LINK) -o $NXT_BUILD_DIR/${NXT_PERL_MODULE}.unit.so \\
$nxt_objs $NXT_PERL_LIBS $NXT_LD_OPT $nxt_objs $NXT_PERL_LDOPTS $NXT_LD_OPT
install: ${NXT_PERL_MODULE}-install install: ${NXT_PERL_MODULE}-install