[135179] trunk/dports/science/root6

mojca at macports.org mojca at macports.org
Sat Apr 18 04:54:33 PDT 2015


Revision: 135179
          https://trac.macports.org/changeset/135179
Author:   mojca at macports.org
Date:     2015-04-18 04:54:33 -0700 (Sat, 18 Apr 2015)
Log Message:
-----------
root6: a patch for a llvm bug (#47494)

Modified Paths:
--------------
    trunk/dports/science/root6/Portfile

Added Paths:
-----------
    trunk/dports/science/root6/files/patch-interpreter-llvm-src-lib-Support-Unix-Program.inc.diff

Modified: trunk/dports/science/root6/Portfile
===================================================================
--- trunk/dports/science/root6/Portfile	2015-04-18 10:31:18 UTC (rev 135178)
+++ trunk/dports/science/root6/Portfile	2015-04-18 11:54:33 UTC (rev 135179)
@@ -63,6 +63,8 @@
 # port specific location
 set install_prefix ${prefix}/libexec/root${version_major}
 
+patchfiles          patch-interpreter-llvm-src-lib-Support-Unix-Program.inc.diff
+
 configure.args-append \
                     -Dgnuinstall=ON \
                     -DCMAKE_INSTALL_PREFIX="${install_prefix}" \

Added: trunk/dports/science/root6/files/patch-interpreter-llvm-src-lib-Support-Unix-Program.inc.diff
===================================================================
--- trunk/dports/science/root6/files/patch-interpreter-llvm-src-lib-Support-Unix-Program.inc.diff	                        (rev 0)
+++ trunk/dports/science/root6/files/patch-interpreter-llvm-src-lib-Support-Unix-Program.inc.diff	2015-04-18 11:54:33 UTC (rev 135179)
@@ -0,0 +1,23 @@
+https://sft.its.cern.ch/jira/browse/ROOT-7271
+http://trac.macports.org/ticket/47494
+
+--- interpreter/llvm/src/lib/Support/Unix/Program.inc.orig
++++ interpreter/llvm/src/lib/Support/Unix/Program.inc
+@@ -45,7 +45,7 @@
+ #if defined(__APPLE__)
+ #include <TargetConditionals.h>
+ #endif
+-#if !defined(__APPLE__) || defined(TARGET_OS_IPHONE)
++#if !defined(__APPLE__) || TARGET_OS_IPHONE
+   extern char **environ;
+ #else
+ #include <crt_externs.h> // _NSGetEnviron
+@@ -220,7 +220,7 @@ static bool Execute(ProcessInfo &PI, StringRef Program, const char **args,
+     }
+ 
+     if (!envp)
+-#if !defined(__APPLE__) || defined(TARGET_OS_IPHONE)
++#if !defined(__APPLE__) || TARGET_OS_IPHONE
+       envp = const_cast<const char **>(environ);
+ #else
+       // environ is missing in dylibs.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150418/bc3303de/attachment.html>


More information about the macports-changes mailing list