[150994] trunk/dports/lang

jeremyhu at macports.org jeremyhu at macports.org
Fri Aug 5 00:03:42 PDT 2016 

Revision: 150994
          https://trac.macports.org/changeset/150994
Author:   jeremyhu at macports.org
Date:     2016-08-05 00:03:42 -0700 (Fri, 05 Aug 2016)
Log Message:
-----------
clang-3.[89]: Address llvm.org bug #28855 to fix linking i386 binaries

Modified Paths:
--------------
    trunk/dports/lang/llvm-3.8/Portfile
    trunk/dports/lang/llvm-3.9/Portfile
    trunk/dports/lang/llvm-3.9/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch
    trunk/dports/lang/llvm-3.9/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch
    trunk/dports/lang/llvm-3.9/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch
    trunk/dports/lang/llvm-3.9/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch
    trunk/dports/lang/llvm-3.9/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch
    trunk/dports/lang/llvm-3.9/files/2006-MacPorts-Only-Fix-regression-introduced-when-fixing-.patch
    trunk/dports/lang/llvm-3.9/files/2007-MacPorts-Only-Don-t-check-for-the-macosx.internal-SD.patch

Added Paths:
-----------
    trunk/dports/lang/llvm-3.8/files/2008-darwin-Don-t-include-eprintf-in-libclang_rt.osx.a.patch

Modified: trunk/dports/lang/llvm-3.8/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.8/Portfile	2016-08-04 23:14:39 UTC (rev 150993)
+++ trunk/dports/lang/llvm-3.8/Portfile	2016-08-05 07:03:42 UTC (rev 150994)
@@ -13,7 +13,7 @@
 set llvm_version_no_dot 38
 name                    llvm-${llvm_version}
 revision                0
-subport                 clang-${llvm_version} { revision 2 }
+subport                 clang-${llvm_version} { revision 3 }
 set suffix              mp-${llvm_version}
 set sub_prefix          ${prefix}/libexec/llvm-${llvm_version}
 dist_subdir             llvm
@@ -147,6 +147,7 @@
         2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch \
         2006-MacPorts-Only-Fix-regression-introduced-when-fixing-.patch \
         2007-MacPorts-Only-Don-t-check-for-the-macosx.internal-SD.patch \
+        2008-darwin-Don-t-include-eprintf-in-libclang_rt.osx.a.patch \
         3001-buildit-build-fix-for-Leopard.patch \
         3002-buildit-Set-compatibility-version-to-RC_ProjectSourc.patch \
         3003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch \

Added: trunk/dports/lang/llvm-3.8/files/2008-darwin-Don-t-include-eprintf-in-libclang_rt.osx.a.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/2008-darwin-Don-t-include-eprintf-in-libclang_rt.osx.a.patch	                        (rev 0)
+++ trunk/dports/lang/llvm-3.8/files/2008-darwin-Don-t-include-eprintf-in-libclang_rt.osx.a.patch	2016-08-05 07:03:42 UTC (rev 150994)
@@ -0,0 +1,19 @@
+From bb7d87c427f55413e67b7f20d8093b9692bb75da Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Thu, 4 Aug 2016 22:10:31 -0700
+Subject: [PATCH 2008/2008] darwin: Don't include eprintf in libclang_rt.osx.a
+
+https://llvm.org/bugs/show_bug.cgi?id=28855
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ lib/builtins/Darwin-excludes/osx.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git llvm_master/projects/compiler-rt/lib/builtins/Darwin-excludes/osx.txt macports_master/projects/compiler-rt/lib/builtins/Darwin-excludes/osx.txt
+index 6f9d0a7..a248b81 100644
+--- llvm/projects/compiler-rt/lib/builtins/Darwin-excludes/osx.txt
++++ macports/projects/compiler-rt/lib/builtins/Darwin-excludes/osx.txt
+@@ -1 +1,2 @@
+ apple_versioning
++eprintf

Modified: trunk/dports/lang/llvm-3.9/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.9/Portfile	2016-08-04 23:14:39 UTC (rev 150993)
+++ trunk/dports/lang/llvm-3.9/Portfile	2016-08-05 07:03:42 UTC (rev 150994)
@@ -69,7 +69,7 @@
 }
 
 fetch.type              svn
-svn.revision            277311
+svn.revision            277798
 
 set compiler_rt_rev     ${svn.revision}
 set libcxx_rev          ${svn.revision}
@@ -120,6 +120,7 @@
         2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch \
         2006-MacPorts-Only-Fix-regression-introduced-when-fixing-.patch \
         2007-MacPorts-Only-Don-t-check-for-the-macosx.internal-SD.patch \
+        2008-darwin-Don-t-include-eprintf-in-libclang_rt.osx.a.patch \
         3001-buildit-build-fix-for-Leopard.patch \
         3002-buildit-Set-compatibility-version-to-RC_ProjectSourc.patch \
         3003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch \

Modified: trunk/dports/lang/llvm-3.9/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch
===================================================================
--- trunk/dports/lang/llvm-3.9/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch	2016-08-04 23:14:39 UTC (rev 150993)
+++ trunk/dports/lang/llvm-3.9/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch	2016-08-05 07:03:42 UTC (rev 150994)
@@ -1,7 +1,7 @@
-From 8b70cbd901ce1bb5774c924fa4e57ed2c842976f Mon Sep 17 00:00:00 2001
+From 8566f8d5f9bf2fc212e097a6342763acaa68884b Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
 Date: Mon, 15 Apr 2013 22:38:18 -0700
-Subject: [PATCH 2001/2007] MacPorts Only: Comment out SL cctools workaround
+Subject: [PATCH 2001/2008] MacPorts Only: Comment out SL cctools workaround
 
 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
 ---
@@ -28,5 +28,5 @@
  # If RC_SUPPORTED_ARCHS is defined, treat it as a list of the architectures we
  # are intended to support and limit what we try to build to that.
 -- 
-2.8.2
+2.9.1
 

Modified: trunk/dports/lang/llvm-3.9/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch
===================================================================
--- trunk/dports/lang/llvm-3.9/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch	2016-08-04 23:14:39 UTC (rev 150993)
+++ trunk/dports/lang/llvm-3.9/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch	2016-08-05 07:03:42 UTC (rev 150994)
@@ -1,7 +1,7 @@
-From a9a797a3bb3785e6a2449f43ce6bd143522c45c5 Mon Sep 17 00:00:00 2001
+From d043f88a11e51c4c75ad45280cc1f9598d6bea35 Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
 Date: Sat, 10 Jan 2015 03:34:51 -0800
-Subject: [PATCH 2002/2007] Update CheckArches to fallback on Intel/ppc if ld
+Subject: [PATCH 2002/2008] Update CheckArches to fallback on Intel/ppc if ld
  -v doesn't report supported architectures
 
 Older versions of ld64 (eg: Xcode 3.x) do not report this.
@@ -28,5 +28,5 @@
              -integrated-as \
              $(ProjSrcRoot)/make/platform/clang_darwin_test_input.c \
 -- 
-2.8.2
+2.9.1
 

Modified: trunk/dports/lang/llvm-3.9/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch
===================================================================
--- trunk/dports/lang/llvm-3.9/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch	2016-08-04 23:14:39 UTC (rev 150993)
+++ trunk/dports/lang/llvm-3.9/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch	2016-08-05 07:03:42 UTC (rev 150994)
@@ -1,7 +1,7 @@
-From 8cb3eae17403b597bf92c23b8e55279f2f9804bf Mon Sep 17 00:00:00 2001
+From 80f23079b4938b93d295c9894a3063afca13ebb9 Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
 Date: Sat, 17 Jan 2015 17:45:27 -0800
-Subject: [PATCH 2003/2007] Fall back on xcodebuild -sdk when xcrun --sdk is
+Subject: [PATCH 2003/2008] Fall back on xcodebuild -sdk when xcrun --sdk is
  not supported
 
 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
@@ -25,5 +25,5 @@
      fi; \
      echo $$result)
 -- 
-2.8.2
+2.9.1
 

Modified: trunk/dports/lang/llvm-3.9/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch
===================================================================
--- trunk/dports/lang/llvm-3.9/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch	2016-08-04 23:14:39 UTC (rev 150993)
+++ trunk/dports/lang/llvm-3.9/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch	2016-08-05 07:03:42 UTC (rev 150994)
@@ -1,7 +1,7 @@
-From a0e10640fb2ba363a37cf42963390329c1b0d948 Mon Sep 17 00:00:00 2001
+From 26832f8491fc67547c1b7402d5592a3b0b1ef9cf Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
 Date: Sat, 17 Jan 2015 19:55:19 -0800
-Subject: [PATCH 2004/2007] On darwin, build ppc slices of the compiler runtime
+Subject: [PATCH 2004/2008] On darwin, build ppc slices of the compiler runtime
  if requested and supported by the SDK and toolchain
 
 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
@@ -42,5 +42,5 @@
  # Configuration for use with iOS kernel/kexts
  Configs += cc_kext_ios
 -- 
-2.8.2
+2.9.1
 

Modified: trunk/dports/lang/llvm-3.9/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch
===================================================================
--- trunk/dports/lang/llvm-3.9/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch	2016-08-04 23:14:39 UTC (rev 150993)
+++ trunk/dports/lang/llvm-3.9/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch	2016-08-05 07:03:42 UTC (rev 150994)
@@ -1,7 +1,7 @@
-From 5cd0c1dd156d7cab50a2f3ea1877a39d2ab5e02a Mon Sep 17 00:00:00 2001
+From f02debe2d50ee30024dad9903406b34ee33d41c1 Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
 Date: Wed, 14 Jan 2015 19:55:19 -0800
-Subject: [PATCH 2005/2007] MacPorts Only: Don't build x86_64h slice of
+Subject: [PATCH 2005/2008] MacPorts Only: Don't build x86_64h slice of
  compiler-rt
 
 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
@@ -28,5 +28,5 @@
  # Configuration for use with iOS kernel/kexts
  Configs += cc_kext_ios
 -- 
-2.8.2
+2.9.1
 

Modified: trunk/dports/lang/llvm-3.9/files/2006-MacPorts-Only-Fix-regression-introduced-when-fixing-.patch
===================================================================
--- trunk/dports/lang/llvm-3.9/files/2006-MacPorts-Only-Fix-regression-introduced-when-fixing-.patch	2016-08-04 23:14:39 UTC (rev 150993)
+++ trunk/dports/lang/llvm-3.9/files/2006-MacPorts-Only-Fix-regression-introduced-when-fixing-.patch	2016-08-05 07:03:42 UTC (rev 150994)
@@ -1,7 +1,7 @@
-From d2f79f7421d9569c74b41c5e2ab56539a7d1ca8b Mon Sep 17 00:00:00 2001
+From f7e7a42bf0175ed9728c771a36961097072905ed Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
 Date: Sun, 11 Oct 2015 09:02:26 -0700
-Subject: [PATCH 2006/2007] MacPorts Only: Fix regression introduced when
+Subject: [PATCH 2006/2008] MacPorts Only: Fix regression introduced when
  fixing PR24776
 
 Partially reverts commit efecb2c285bd444b6def43ac62e5f0278df387eb
@@ -25,5 +25,5 @@
              $(ProjSrcRoot)/make/platform/clang_darwin_test_input.c \
              -isysroot $(3) \
 -- 
-2.8.2
+2.9.1
 

Modified: trunk/dports/lang/llvm-3.9/files/2007-MacPorts-Only-Don-t-check-for-the-macosx.internal-SD.patch
===================================================================
--- trunk/dports/lang/llvm-3.9/files/2007-MacPorts-Only-Don-t-check-for-the-macosx.internal-SD.patch	2016-08-04 23:14:39 UTC (rev 150993)
+++ trunk/dports/lang/llvm-3.9/files/2007-MacPorts-Only-Don-t-check-for-the-macosx.internal-SD.patch	2016-08-05 07:03:42 UTC (rev 150994)
@@ -1,7 +1,7 @@
-From 91997de1eb89cc74eff93582f71269574d946afd Mon Sep 17 00:00:00 2001
+From 6baaa6b274749a25e82ad3b1ec3350664b69dbcc Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
 Date: Mon, 30 Nov 2015 00:52:14 -0500
-Subject: [PATCH 2007/2007] MacPorts Only: Don't check for the macosx.internal
+Subject: [PATCH 2007/2008] MacPorts Only: Don't check for the macosx.internal
  SDK
 
 https://llvm.org/bugs/show_bug.cgi?id=25677
@@ -12,7 +12,7 @@
  1 file changed, 11 deletions(-)
 
 diff --git llvm_master/projects/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake macports_master/projects/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake
-index 3287717..956693b 100644
+index fd19ff9..b3fdcb8 100644
 --- llvm_master/projects/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake
 +++ macports_master/projects/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake
 @@ -4,23 +4,12 @@ include(CMakeParseArguments)
@@ -40,5 +40,5 @@
  endfunction()
  
 -- 
-2.8.2
+2.9.1
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160805/109aa32f/attachment.html>

More information about the macports-changes mailing list