From 949548da293fa30ef200d07c3e4ff108174404b7 Mon Sep 17 00:00:00 2001
From: Igor Sysoev <igor@sysoev.ru>
Date: Thu, 17 Aug 2017 21:47:19 +0300
Subject: The new module configuration interface.

Configuration and building example:

  ./configure
  ./configure python
  ./configure php
  ./configure go
  make all

or

  ./configure
  make nginext
  ./configure python
  make python
  ./configure php
  make php
  ./configure go
  make go

Modules configuration options and building examples:

  ./configure python --module=python2 --config=python2.7-config
  make python2

  ./configure php --module=php7 --config=php7.0-config
                  --lib-path=/usr/local/php7.0
  make php7

  ./configure go --go=go1.6 --go-path=${HOME}/go1.6
  make go1.6
---
 auto/os/conf | 8 ++++----
 auto/os/test | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'auto/os')

diff --git a/auto/os/conf b/auto/os/conf
index 3db382c6..6d86a849 100644
--- a/auto/os/conf
+++ b/auto/os/conf
@@ -26,7 +26,6 @@ case "$NXT_SYSTEM" in
         NXT_SHARED_LOCAL_LINK="\$(CC) -shared \
                                -Wl,-soname,\\\$\$ORIGIN/libnxt.so"
         NXT_MODULE_LINK="\$(CC) -shared"
-        NXT_MODULE_LINK="\$(CC) -shared"
 
         # "-Wl,-E" exports symbols of executable file.
         NXT_EXEC_LINK="\$(CC) -Wl,-E"
@@ -104,8 +103,8 @@ case "$NXT_SYSTEM" in
         # MacOSX 10.6 (Snow Leopard) has deprecated ucontext(3).
         # MacOSX 10.7 (Lion) has deprecated system OpenSSL.
         # MAC_OS_X_VERSION_MIN_REQUIRED macro does not help.
-        # The minimum version allowed for i386 is 10.4 (Tiger).
-        NXT_CFLAGS="$NXT_CFLAGS -mmacosx-version-min=10.4"
+        # "-rpath" is supported since MacOSX 10.5 (Leopard).
+        NXT_CFLAGS="$NXT_CFLAGS -mmacosx-version-min=10.5"
 
         NXT_STATIC_LINK="ar -r -c"
         NXT_SHARED_LINK="\$(CC) -dynamiclib"
@@ -113,7 +112,8 @@ case "$NXT_SYSTEM" in
                                -install_name @executable_path/libnxt.dylib"
 
         # Prior to MacOSX 10.5 (Leopard) only bundles could be unloaded.
-        NXT_MODULE_LINK="\$(CC) -bundle -undefined dynamic_lookup"
+        # NXT_MODULE_LINK="\$(CC) -bundle -undefined dynamic_lookup"
+        NXT_MODULE_LINK="\$(CC) -dynamiclib -undefined dynamic_lookup"
 
         NXT_EXEC_LINK="\$(CC)"
         NXT_SHARED_LOCAL_EXEC_LINK=
diff --git a/auto/os/test b/auto/os/test
index 36ce50ae..0332fcfa 100644
--- a/auto/os/test
+++ b/auto/os/test
@@ -41,7 +41,7 @@ case "$NXT_SYSTEM" in
         echo=echo
         CC=${CC:-cc}
 
-        NXT_TEST_CFLAGS="$NXT_TEST_CFLAGS -mmacosx-version-min=10.4"
+        NXT_TEST_CFLAGS="$NXT_TEST_CFLAGS -mmacosx-version-min=10.5"
         ;;
 
     AIX)
-- 
cgit