Attachment 943710 Details for Bug 1149184 – nginx.spec change

[patch] nginx.spec change

nginx-passenger.patch (text/plain), 2.56 KB, created by Jan Kaluža on 2014-10-03 12:42:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Kaluža

Created: 2014-10-03 12:42:30 UTC

Size: 2.56 KB

patch

obsolete

>diff --git a/nginx.spec b/nginx.spec
>index b3406c2..c3b6577 100644
>--- a/nginx.spec
>+++ b/nginx.spec
>@@ -24,6 +24,9 @@
> %global with_systemd 0
> %endif
> 
>+%global with_passenger 1
>+%global passenger_version 4.0.50
>+
> Name:              nginx
> Epoch:             1
> Version:           1.6.2
>@@ -38,6 +41,7 @@ URL:               http://nginx.org/
> 
> Source0:           http://nginx.org/download/nginx-%{version}.tar.gz
> Source1:           http://nginx.org/download/nginx-%{version}.tar.gz.asc
>+Source2:           http://s3.amazonaws.com/phusion-passenger/releases/passenger-%{passenger_version}.tar.gz
> Source10:          nginx.service
> Source11:          nginx.logrotate
> Source12:          nginx.conf
>@@ -54,6 +58,8 @@ Source104:         50x.html
> # removes -Werror in upstream build scripts.  -Werror conflicts with
> # -D_FORTIFY_SOURCE=2 causing warnings to turn into errors.
> Patch0:            nginx-auto-cc-gcc.patch
>+# Build Passenger against Fedora's (renamed) libeio
>+Patch200:          passenger-4.0.38-libeio.patch
> 
> BuildRequires:     GeoIP-devel
> BuildRequires:     gd-devel
>@@ -108,8 +114,42 @@ directories.
> %setup -q
> %patch0 -p0
> 
>+%if 0%{?with_passenger}
>+tar -xf %{SOURCE2}
>+pushd passenger-%{passenger_version}
>+%patch200 -p1 -b .uselibeio
>+popd
>+%endif
> 
> %build
>+
>+%if 0%{?with_passenger}
>+pushd passenger-%{passenger_version}
>+export USE_VENDORED_LIBEV=false
>+export USE_VENDORED_LIBEIO=false
>+CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ;
>+CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ;
>+FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ;
>+
>+export LANG=en_US.UTF-8
>+export LANGUAGE=en_US.UTF-8
>+export LC_ALL=en_US.UTF-8
>+
>+rake nginx \
>+    NATIVE_PACKAGING_METHOD=rpm \
>+    EXTRA_CFLAGS="-fPIC" \
>+    EXTRA_CXXFLAGS="-fPIC" \
>+    FS_PREFIX=%{_prefix} \
>+    FS_BINDIR=%{_bindir} \
>+    FS_SBINDIR=%{_sbindir} \
>+    FS_DATADIR=%{_datadir} \
>+    FS_LIBDIR=%{_libdir} \
>+    FS_DOCDIR=%{_docdir} \
>+    RUBYLIBDIR=%{_datadir}/passenger/
>+    RUBYARCHDIR=%{_libdir}/passenger/
>+popd
>+%endif
>+
> # nginx does not utilize a standard configure script.  It has its own
> # and the standard configure options cause the nginx configure script
> # to error out.  This is is also the reason for the DESTDIR environment
>@@ -163,6 +203,9 @@ export DESTDIR=%{buildroot}
> %if 0%{?with_gperftools}
>     --with-google_perftools_module \
> %endif
>+%if 0%{?with_passenger}
>+    --add-module="./passenger-%{passenger_version}/ext/nginx" \
>+%endif
>     --with-debug \
>     --with-cc-opt="%{optflags} $(pcre-config --cflags)" \
>     --with-ld-opt="$RPM_LD_FLAGS -Wl,-E" # so the perl module finds its symbols

Actions: View | Diff

Attachments on bug 1149184: 943710 | 1173223 | 1173224