Welcome! Log In Create A New Profile

Advanced

[PATCH] Configure: assorted changes.

Piotr Sikora
November 04, 2013 06:42PM
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@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@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

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel
Subject Author Views Posted

[PATCH] Configure: assorted changes.

Piotr Sikora 737 November 04, 2013 06:42PM

Re: [PATCH] Configure: assorted changes. Attachments

Piotr Sikora 412 November 04, 2013 06:50PM

Re: [PATCH] Configure: assorted changes.

Maxim Dounin 379 November 04, 2013 07:34PM

Re: [PATCH] Configure: assorted changes.

Piotr Sikora 397 November 04, 2013 07:42PM

Re: [PATCH] Configure: assorted changes.

Maxim Dounin 333 November 04, 2013 08:18PM

Re: [PATCH] Configure: assorted changes.

Piotr Sikora 354 November 04, 2013 08:24PM

Re: [PATCH] Configure: assorted changes.

Maxim Dounin 388 November 04, 2013 10:14PM

Re: [PATCH] Configure: assorted changes.

Piotr Sikora 391 November 05, 2013 12:42AM



Sorry, you do not have permission to post/reply in this forum.

Online Users

Guests: 136
Record Number of Users: 8 on April 13, 2023
Record Number of Guests: 500 on July 15, 2024
Powered by nginx      Powered by FreeBSD      PHP Powered      Powered by MariaDB      ipv6 ready