← Back to branch summary

~ubuntu-branches/ubuntu/raring/nginx/raring-proposed

« back to all changes in this revision

Viewing changes to debian/rules

  • Committer: Package Import Robot
  • Author(s): Kartik Mistry, Cyril Lavier, Kartik Mistry
  • Date: 2012-02-01 17:50:05 UTC
  • mfrom: (1.1.29)
  • Revision ID: package-import@ubuntu.com-20120201175005-nlxgq67v1tumzx29
Tags: 1.1.14-1
http://bugs.debian.org/654593
http://bugs.debian.org/658186
[Cyril Lavier]
* New upstream release.
* debian/rules:
  + Resolved the lintian errors "unstripped-binary-or-object" with a
    cleaner correction (Thanks to Steven Chamberlain for the patch).
  + Added a check on the parallel building to force NUMJOBS to 1 if
    the value 0 is given.
* debian/modules:
  + Updated nginx-lua module to version 0.4.1.

[Kartik Mistry]
* debian/rules, debian/control, debian/copyright,
  debian/modules/nginx-upload-module:
  + Added Upload module to nginx-extras, updated long description and
    copyright. (Closes: #654593)
* debian/modules/README.modules:
  + Added Homepage information for some modules.
* debian/rules:
  + Enable hardened build flags, Thanks to Moritz Muehlenhoff for patch.
    (Closes: #658186)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/rules
1
1
#!/usr/bin/make -f
2
2
 
3
 
CFLAGS = -Wall -g
 
3
CFLAGS = `dpkg-buildflags --get CFLAGS`
 
4
CFLAGS += -Wall
 
5
CFLAGS += `dpkg-buildflags --get CPPFLAGS`
 
6
LDFLAGS = `dpkg-buildflags --get LDFLAGS`
4
7
 
5
8
FLAVOURS:=full light extras
6
9
 
15
18
        CONFIGURE_OPTS = --with-cc-opt="-m32 -mcpu=ultrasparc"
16
19
endif
17
20
 
18
 
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
19
 
        CFLAGS += -O0
20
 
else
21
 
        CFLAGS += -O2
22
 
endif
23
21
 
24
22
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
25
23
        NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 
24
        ifeq (${NUMJOBS}, 0)
 
25
                NUMJOBS = 1
 
26
        endif
26
27
        MAKEFLAGS += -j$(NUMJOBS)
27
28
endif
28
29
 
49
50
        cp -Pa $(CURDIR)/man $(BUILDDIR_$*)/
50
51
 
51
52
config.status.full: config.env.full config.sub config.guess
52
 
        cd $(BUILDDIR_full) && ./configure \
 
53
        cd $(BUILDDIR_full) && CFLAGS="$(CFLAGS)" CORE_LINK="$(LDFLAGS)" ./configure  \
53
54
            --prefix=/etc/nginx \
54
55
            --conf-path=/etc/nginx/nginx.conf \
55
56
            --error-log-path=/var/log/nginx/error.log \
83
84
        touch $@
84
85
 
85
86
config.status.light: config.env.light config.sub config.guess
86
 
        cd $(BUILDDIR_light) && ./configure \
 
87
        cd $(BUILDDIR_light) && CFLAGS="$(CFLAGS)" CORE_LINK="$(LDFLAGS)" ./configure  \
87
88
            --prefix=/etc/nginx \
88
89
            --conf-path=/etc/nginx/nginx.conf \
89
90
            --error-log-path=/var/log/nginx/error.log \
113
114
        touch $@
114
115
 
115
116
config.status.extras: config.env.extras config.sub config.guess
116
 
        cd $(BUILDDIR_extras) && ./configure \
 
117
        cd $(BUILDDIR_extras) && CFLAGS="$(CFLAGS)" CORE_LINK="$(LDFLAGS)" ./configure  \
117
118
            --prefix=/etc/nginx \
118
119
            --conf-path=/etc/nginx/nginx.conf \
119
120
            --error-log-path=/var/log/nginx/error.log \
151
152
            --add-module=$(MODULESDIR)/nginx-echo \
152
153
            --add-module=$(MODULESDIR)/nginx-lua \
153
154
            --add-module=$(MODULESDIR)/nginx-http-push \
 
155
            --add-module=$(MODULESDIR)/nginx-upload-module \
154
156
            --add-module=$(MODULESDIR)/nginx-upload-progress \
155
157
            --add-module=$(MODULESDIR)/headers-more-nginx-module \
156
158
            --add-module=$(MODULESDIR)/chunkin-nginx-module \
169
171
        dh_testdir
170
172
        touch $@
171
173
 
172
 
build-dbg.%:
 
174
build-dbg.%: install
173
175
        dh_testdir
174
176
        dh_strip --package=nginx-$(*) --dbg-package=nginx-$(*)-dbg
175
177