Ticket #39773: patch-nginx-Portfile.google_perftools.diff

Portfile

@@ -5 +5 @@
 
 name                nginx
 version             1.4.1
-revision            1
+revision            5
 categories          www mail
 platforms           darwin
 license             BSD
@@ -60 +60 @@
                     --with-ipv6
 
 # remove --disable-dependency-tracking
-configure.universal_args
+configure.universal_args-delete   --disable-dependency-tracking
 
 build.target        build
 destroot.keepdirs   ${destroot}${nginx_logdir} \
@@ -109 +109 @@
 }
 
 variant google_perftools description {Enable Google Performance Tools profiling for workers} {
-    configure.args-append   --with-google_perftools_module
     depends_lib-append      port:google-perftools
+
+    # If 'google_perftools' port doesn't find headers needed for the profiler lib, it just quietly skips it.
+    # Check if "-lprofiler" will fail -- if so, pre-empt configure-stage error with a more useful error msg.
+    if {    [file exists "${prefix}/lib/libprofiler.dylib"] ||
+                    [file exists "${prefix}/lib/libprofiler.a"]
+    } {
+        configure.args-append   --with-google_perftools_module
+    } \
+    else {
+        ui_warn [ join   [list                                                                       \
+            "On some OSX versions, the 'google_perftools' port is installed without library files "   \
+            "needed by the \"google_perftools\" variant ( libprofiler.dylib or libprofiler.a ). \n"   \
+            "Until the 'google_perftools' port is fixed, this variant is incompatible with these "    \
+            "OSX versions. \n\n"                                                                      \
+            "If the 'google_perftools' port HAS BEEN updated, running the command: \n"                \
+            "    port -f upgrade --enforce-variants nginx +google_perftools \n"                       \
+            "will indicate if this bug was fixed, based on whether it installs successfully and "     \
+            "DOES NOT display this message again. \n\n"                                               \
+            "Aborting 'nginx' port installation... "                                                  \
+        ] "" ]
+
+        return -code error   "Variant \"+google_perftools\" does not support current 'google_perftools' port."
+    }
 }
 
 variant gzip_static description {Avoids compressing the same file each time it is requested} {