[PATCH] Configure: assorted changes.
Piotr Sikora
piotr at cloudflare.com
Mon Nov 4 23:41:32 UTC 2013
Hey,
attached patch with a few configure changes for 3rd party libs
that were in my local tree.
I didn't want to spam you with one-line commits, so I squashed
them as one, hopefully that's OK as they are kind of related.
Best regards,
Piotr Sikora
# HG changeset patch
# User Piotr Sikora <piotr at cloudflare.com>
# Date 1383608221 28800
# Mon Nov 04 15:37:01 2013 -0800
# Node ID e204bf14905a0471f6efaeecb9690147983c3841
# Parent dea321e5c0216efccbb23e84bbce7cf3e28f130c
Configure: assorted changes.
Libatomic:
- pass CC to the configure script,
- call "make clean" before rebuild.
OpenSSL:
- pass CC to the configure script,
- call "make clean" only if Makefile exists (allows build from git),
- don't build man pages (25% faster build time).
Signed-off-by: Piotr Sikora <piotr at cloudflare.com>
diff -r dea321e5c021 -r e204bf14905a auto/lib/libatomic/make
--- a/auto/lib/libatomic/make Thu Oct 31 18:23:49 2013 +0400
+++ b/auto/lib/libatomic/make Mon Nov 04 15:37:01 2013 -0800
@@ -6,9 +6,11 @@
cat << END >> $NGX_MAKEFILE
$NGX_LIBATOMIC/src/libatomic_ops.a: $NGX_LIBATOMIC/Makefile
- cd $NGX_LIBATOMIC && \$(MAKE)
+ cd $NGX_LIBATOMIC \\
+ && \$(MAKE) clean \\
+ && \$(MAKE)
$NGX_LIBATOMIC/Makefile: $NGX_MAKEFILE
- cd $NGX_LIBATOMIC && ./configure
+ cd $NGX_LIBATOMIC && CC="\$(CC)" ./configure
END
diff -r dea321e5c021 -r e204bf14905a auto/lib/openssl/make
--- a/auto/lib/openssl/make Thu Oct 31 18:23:49 2013 +0400
+++ b/auto/lib/openssl/make Mon Nov 04 15:37:01 2013 -0800
@@ -55,10 +55,10 @@ END
$OPENSSL/.openssl/include/openssl/ssl.h: $NGX_MAKEFILE
cd $OPENSSL \\
- && \$(MAKE) clean \\
- && ./config --prefix=$ngx_prefix no-shared $OPENSSL_OPT \\
+ && if [ -f Makefile ]; then \$(MAKE) clean; fi \\
+ && CC="\$(CC)" ./config --prefix=$ngx_prefix no-shared $OPENSSL_OPT \\
&& \$(MAKE) \\
- && \$(MAKE) install LIBDIR=lib
+ && \$(MAKE) install_sw LIBDIR=lib
END
More information about the nginx-devel
mailing list