]>
Commit | Line | Data |
---|---|---|
c6f543f2 JB |
1 | --- mod_perl-1.30/Makefile.PL.orig 2007-11-04 18:50:38.513973519 +0100 |
2 | +++ mod_perl-1.30/Makefile.PL 2007-11-04 18:54:54.052535832 +0100 | |
3 | @@ -1458,16 +1458,16 @@ | |
fce89d50 | 4 | (cd ./apaci && $(MAKE) distclean) |
5 | ||
6 | apxs_libperl: | |
c6f543f2 JB |
7 | - (cd ./apaci && $(PERL5LIB_ENV) $(MAKE)) |
8 | + (cd ./apaci && $(PERL5LIB_ENV) $(MAKE) OPTIMIZE="$(OPTIMIZE)") | |
fce89d50 | 9 | |
10 | apxs_install: apxs_libperl | |
11 | (cd ./apaci && $(MAKE) install;) | |
12 | ||
13 | apache_httpd: $(APACHE_SRC)/Makefile.tmpl | |
c6f543f2 JB |
14 | - (cd $(APACHE_SRC) && $(PERL5LIB_ENV) $(SHRPENV) $(MAKE) CC="$(CC)";) |
15 | + (cd $(APACHE_SRC) && $(PERL5LIB_ENV) $(SHRPENV) $(MAKE) CC="$(CC)" OPTIMIZE="$(OPTIMIZE)";) | |
fce89d50 | 16 | |
17 | apaci_httpd: | |
c6f543f2 JB |
18 | - (cd $(APACHE_ROOT) && $(PERL5LIB_ENV) $(MAKE)) |
19 | + (cd $(APACHE_ROOT) && $(PERL5LIB_ENV) $(MAKE) OPTIMIZE="$(OPTIMIZE)") | |
fce89d50 | 20 | |
21 | apaci_install: | |
22 | (cd $(APACHE_ROOT) && $(MAKE) install) | |
fce89d50 | 23 | diff -ur mod_perl-1.29.orig/apaci/Makefile.tmpl mod_perl-1.29/apaci/Makefile.tmpl |
24 | --- mod_perl-1.29.orig/apaci/Makefile.tmpl 2001-02-11 15:33:12.000000000 +0000 | |
25 | +++ mod_perl-1.29/apaci/Makefile.tmpl 2003-11-21 15:23:36.000000000 +0000 | |
26 | @@ -13,8 +13,8 @@ | |
27 | # Reassemble mod_perl parameters | |
28 | # from Perl and Apache parameters | |
29 | MP_CC=$(PERL_CC) | |
30 | -MP_CFLAGS=$(PERL_OPTIMIZE) -I$(PERL_INC) $(PERL_CCFLAGS) \ | |
31 | - $(PERL_DEFS) $(INCLUDES) $(AP_CFLAGS) $(CFLAGS) | |
32 | +MP_CFLAGS=-I$(PERL_INC) $(PERL_CCFLAGS) \ | |
33 | + $(PERL_DEFS) $(INCLUDES) $(AP_CFLAGS) $(CFLAGS) $(OPTIMIZE) | |
34 | MP_CFLAGS_SHLIB=$(PERL_CCCDLFLAGS) $(MP_CFLAGS) | |
35 | MP_LD=$(PERL_LD) | |
36 | MP_LDFLAGS_SHLIB=$(PERL_LDDLFLAGS) | |
37 | @@ -99,7 +99,7 @@ | |
38 | depend: | |
39 | cp Makefile.tmpl Makefile.tmpl.bak \ | |
40 | && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl > Makefile.new \ | |
41 | - && gcc -MM $(INCLUDES) $(AP_CFLAGS) $(CFLAGS) *.c >> Makefile.new \ | |
42 | + && gcc -MM $(INCLUDES) $(AP_CFLAGS) $(CFLAGS) $(OPTIMIZE) *.c >> Makefile.new \ | |
43 | && sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' \ | |
44 | -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' Makefile.new \ | |
45 | > Makefile.tmpl \ |