Mercurial > hg > nginx

annotate auto/lib/perl/make @ 6700:0d2956dfc4e6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Perl: pass additional linker options to perl module. Previously flags passed by --with-ld-opt were not used when building perl module, which meant hardening flags provided by package build systems were not applied.
author Konstantin Pavlov <thresh@nginx.com>
date Tue, 20 Sep 2016 22:11:23 +0300
parents 39a806ccf21e
children 53ea5694d1cc
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
599
869b6444d234 nginx-0.3.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
1
869b6444d234 nginx-0.3.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
2 # Copyright (C) Igor Sysoev
4412
d620f497c50f Copyright updated.
Maxim Konovalov <maxim@nginx.com>
parents: 1187
diff changeset
3 # Copyright (C) Nginx, Inc.
599
869b6444d234 nginx-0.3.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
4
869b6444d234 nginx-0.3.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
5
5146
f45b83d20cfb Simplified nginx version maintenance.
Ruslan Ermilov <ru@nginx.com>
parents: 5145
diff changeset
6 v=`grep 'define NGINX_VERSION' src/core/nginx.h | sed -e 's/^.*"\(.*\)".*/\1/'`
f45b83d20cfb Simplified nginx version maintenance.
Ruslan Ermilov <ru@nginx.com>
parents: 5145
diff changeset
7
f45b83d20cfb Simplified nginx version maintenance.
Ruslan Ermilov <ru@nginx.com>
parents: 5145
diff changeset
8
599
869b6444d234 nginx-0.3.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
9 cat << END >> $NGX_MAKEFILE
869b6444d234 nginx-0.3.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
10
6419
39a806ccf21e Dynamic modules: perl.
Ruslan Ermilov <ru@nginx.com>
parents: 5265
diff changeset
11 $NGX_OBJS/src/http/modules/perl/ngx_http_perl_module.o: \\
39a806ccf21e Dynamic modules: perl.
Ruslan Ermilov <ru@nginx.com>
parents: 5265
diff changeset
12 $NGX_OBJS/$ngx_perl_module
39a806ccf21e Dynamic modules: perl.
Ruslan Ermilov <ru@nginx.com>
parents: 5265
diff changeset
13
39a806ccf21e Dynamic modules: perl.
Ruslan Ermilov <ru@nginx.com>
parents: 5265
diff changeset
14 $NGX_OBJS/$ngx_perl_module: \\
5143
6dd4875eb526 Configure: improved layout of the generated makefile.
Ruslan Ermilov <ru@nginx.com>
parents: 5070
diff changeset
15 \$(CORE_DEPS) \$(HTTP_DEPS) \\
6dd4875eb526 Configure: improved layout of the generated makefile.
Ruslan Ermilov <ru@nginx.com>
parents: 5070
diff changeset
16 src/http/modules/perl/ngx_http_perl_module.h \\
599
869b6444d234 nginx-0.3.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
17 $NGX_OBJS/src/http/modules/perl/Makefile
4841
95ce3172493e Configure: fixed make macros to use parentheses instead of braces.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4740
diff changeset
18 cd $NGX_OBJS/src/http/modules/perl && \$(MAKE)
599
869b6444d234 nginx-0.3.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
19
740
5187a63d9fca force perl modules reinstallation after rebuilding
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
20 rm -rf $NGX_OBJS/install_perl
5187a63d9fca force perl modules reinstallation after rebuilding
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
21
599
869b6444d234 nginx-0.3.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
22
5143
6dd4875eb526 Configure: improved layout of the generated makefile.
Ruslan Ermilov <ru@nginx.com>
parents: 5070
diff changeset
23 $NGX_OBJS/src/http/modules/perl/Makefile: \\
5265
9f17e765a21e Configure: perl Makefile rebuild after configure.
Maxim Dounin <mdounin@mdounin.ru>
parents: 5180
diff changeset
24 $NGX_AUTO_CONFIG_H \\
5146
f45b83d20cfb Simplified nginx version maintenance.
Ruslan Ermilov <ru@nginx.com>
parents: 5145
diff changeset
25 src/core/nginx.h \\
5143
6dd4875eb526 Configure: improved layout of the generated makefile.
Ruslan Ermilov <ru@nginx.com>
parents: 5070
diff changeset
26 src/http/modules/perl/Makefile.PL \\
5144
273754fad787 Configure: improved make dependencies for perl module.
Ruslan Ermilov <ru@nginx.com>
parents: 5143
diff changeset
27 src/http/modules/perl/nginx.pm \\
273754fad787 Configure: improved make dependencies for perl module.
Ruslan Ermilov <ru@nginx.com>
parents: 5143
diff changeset
28 src/http/modules/perl/nginx.xs \\
273754fad787 Configure: improved make dependencies for perl module.
Ruslan Ermilov <ru@nginx.com>
parents: 5143
diff changeset
29 src/http/modules/perl/typemap
5146
f45b83d20cfb Simplified nginx version maintenance.
Ruslan Ermilov <ru@nginx.com>
parents: 5145
diff changeset
30 sed "s/%%VERSION%%/$v/" src/http/modules/perl/nginx.pm > \\
f45b83d20cfb Simplified nginx version maintenance.
Ruslan Ermilov <ru@nginx.com>
parents: 5145
diff changeset
31 $NGX_OBJS/src/http/modules/perl/nginx.pm
f45b83d20cfb Simplified nginx version maintenance.
Ruslan Ermilov <ru@nginx.com>
parents: 5145
diff changeset
32 cp -p src/http/modules/perl/nginx.xs $NGX_OBJS/src/http/modules/perl/
599
869b6444d234 nginx-0.3.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
33 cp -p src/http/modules/perl/typemap $NGX_OBJS/src/http/modules/perl/
869b6444d234 nginx-0.3.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
34 cp -p src/http/modules/perl/Makefile.PL $NGX_OBJS/src/http/modules/perl/
869b6444d234 nginx-0.3.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
35
5143
6dd4875eb526 Configure: improved layout of the generated makefile.
Ruslan Ermilov <ru@nginx.com>
parents: 5070
diff changeset
36 cd $NGX_OBJS/src/http/modules/perl \\
6dd4875eb526 Configure: improved layout of the generated makefile.
Ruslan Ermilov <ru@nginx.com>
parents: 5070
diff changeset
37 && NGX_PM_CFLAGS="\$(NGX_PM_CFLAGS) -g $NGX_CC_OPT" \\
6700
0d2956dfc4e6 Perl: pass additional linker options to perl module.
Konstantin Pavlov <thresh@nginx.com>
parents: 6419
diff changeset
38 NGX_PM_LDFLAGS="$NGX_LD_OPT \$(NGX_PM_LDFLAGS)" \\
5180
2db6bdcaedc0 Configure: fixed perl Makefile generation (ticket #334).
Maxim Dounin <mdounin@mdounin.ru>
parents: 5168
diff changeset
39 NGX_INCS="$CORE_INCS $NGX_OBJS $HTTP_INCS" \\
5168
482fda984556 Configure: fixed nginx.so rebuild (broken by r5145).
Maxim Dounin <mdounin@mdounin.ru>
parents: 5146
diff changeset
40 NGX_DEPS="\$(CORE_DEPS) \$(HTTP_DEPS)" \\
5143
6dd4875eb526 Configure: improved layout of the generated makefile.
Ruslan Ermilov <ru@nginx.com>
parents: 5070
diff changeset
41 $NGX_PERL Makefile.PL \\
6dd4875eb526 Configure: improved layout of the generated makefile.
Ruslan Ermilov <ru@nginx.com>
parents: 5070
diff changeset
42 LIB=$NGX_PERL_MODULES \\
950
9581fba9ea12 fix for nginx.pm default installation
Igor Sysoev <igor@sysoev.ru>
parents: 948
diff changeset
43 INSTALLSITEMAN3DIR=$NGX_PERL_MODULES_MAN
599
869b6444d234 nginx-0.3.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
44
869b6444d234 nginx-0.3.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
45 END