Commit 605aaed5 authored by Rafael Monnerat's avatar Rafael Monnerat

Fix zlib-nginx definition.

parent 1b7d9e7f
...@@ -8,7 +8,7 @@ parts = nginx ...@@ -8,7 +8,7 @@ parts = nginx
[zlib-nginx] [zlib-nginx]
<= zlib <= zlib
recipe = hexagonit.recipe.download recipe = hexagonit.recipe.download
source-code-location = ${:location}/zlib-1.2.6 source-code-location = zlib-1.2.6
[nginx] [nginx]
recipe = hexagonit.recipe.cmmi recipe = hexagonit.recipe.cmmi
...@@ -16,12 +16,12 @@ url = http://nginx.org/download/nginx-1.0.14.tar.gz ...@@ -16,12 +16,12 @@ url = http://nginx.org/download/nginx-1.0.14.tar.gz
configure-options= configure-options=
--with-ipv6 --with-ipv6
--with-zlib=${zlib-nginx:source-code-location} --with-zlib=${zlib-nginx:location}/${zlib-nginx:source-code-location}
--with-ld-opt="-L ${pcre:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${zlib-nginx:source-code-location}/lib" --with-ld-opt="-L ${pcre:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${zlib-nginx:location}/${zlib-nginx:source-code-location}/lib"
--with-cc-opt="-I ${pcre:location}/include" --with-cc-opt="-I ${pcre:location}/include"
environment = environment =
PATH=${pkgconfig:location}/bin:%(PATH)s PATH=${pkgconfig:location}/bin:%(PATH)s
PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig
CPPFLAGS =-I${libuuid:location}/include CPPFLAGS =-I${libuuid:location}/include
LDFLAGS =-Wl,-rpath=${zlib-nginx:source-code-location}/lib -Wl,-rpath=${openssl:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${gdbm:location}/lib LDFLAGS =-Wl,-rpath=${zlib-nginx:location}/${zlib-nginx:source-code-location}/lib -Wl,-rpath=${openssl:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${gdbm:location}/lib
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment