[129437] trunk/dports/lang

[larryv at macports.org]

Revision: 129437
          https://trac.macports.org/changeset/129437
Author:   larryv at macports.org
Date:     2014-12-12 23:53:49 -0800 (Fri, 12 Dec 2014)
Log Message:
-----------
clang-3.{4,5}: Don't change build directory for resources

I only meant to fiddle with the install location.

Modified Paths:
--------------
    trunk/dports/lang/llvm-3.4/files/move-clang-resources.patch
    trunk/dports/lang/llvm-3.5/files/fix-libclang_rt-dylib-ids.patch
    trunk/dports/lang/llvm-3.5/files/move-clang-resources.patch

Modified: trunk/dports/lang/llvm-3.4/files/move-clang-resources.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/move-clang-resources.patch	2014-12-13 06:42:38 UTC (rev 129436)
+++ trunk/dports/lang/llvm-3.4/files/move-clang-resources.patch	2014-12-13 07:53:49 UTC (rev 129437)
@@ -29,9 +29,8 @@
  	$(PROJ_OBJ_DIR)/$(CLANG_LEVEL)/include/clang/Basic/Version.inc))
 +LLVM_VERSION := $(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)
  
--ResourceDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)
+ ResourceDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)
 -PROJ_resources := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(CLANG_VERSION)
-+ResourceDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(LLVM_VERSION)
 +PROJ_resources := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(LLVM_VERSION)
  
  ResourceLibDir := $(ResourceDir)/lib

Modified: trunk/dports/lang/llvm-3.5/files/fix-libclang_rt-dylib-ids.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/fix-libclang_rt-dylib-ids.patch	2014-12-13 06:42:38 UTC (rev 129436)
+++ trunk/dports/lang/llvm-3.5/files/fix-libclang_rt-dylib-ids.patch	2014-12-13 07:53:49 UTC (rev 129437)
@@ -2,7 +2,7 @@
 ===================================================================
 --- llvm-3.5.0.src.orig/tools/clang/runtime/compiler-rt/Makefile
 +++ llvm-3.5.0.src/tools/clang/runtime/compiler-rt/Makefile
-@@ -221,8 +221,6 @@ $(ResourceLibDir)/$1/libclang_rt.%.dylib
+@@ -222,8 +222,6 @@ $(ResourceLibDir)/$1/libclang_rt.%.dylib
  		$(ResourceLibDir)/$1/.dir
  	$(Echo) Copying runtime library $1/$$* to build dir
  	$(Verb) cp $(PROJ_OBJ_DIR)/clang_$1/$$*/libcompiler_rt.dylib $$@
@@ -11,7 +11,7 @@
  RuntimeLibrary.$1: \
  		$(RuntimeLibrary.$1.Configs:%=$(ResourceLibDir)/$1/libclang_rt.%)
  .PHONY: RuntimeLibrary.$1
-@@ -242,6 +240,7 @@ $(PROJ_resources_lib)/$1/libclang_rt.%.d
+@@ -243,6 +241,7 @@ $(PROJ_resources_lib)/$1/libclang_rt.%.d
  		$(ResourceLibDir)/$1/libclang_rt.%.dylib | $(PROJ_resources_lib)/$1
  	$(Echo) Installing compiler runtime library: $1/$$*
  	$(Verb) $(DataInstall) $$< $(PROJ_resources_lib)/$1

Modified: trunk/dports/lang/llvm-3.5/files/move-clang-resources.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/move-clang-resources.patch	2014-12-13 06:42:38 UTC (rev 129436)
+++ trunk/dports/lang/llvm-3.5/files/move-clang-resources.patch	2014-12-13 07:53:49 UTC (rev 129437)
@@ -29,9 +29,8 @@
  	$(PROJ_OBJ_DIR)/$(CLANG_LEVEL)/include/clang/Basic/Version.inc))
 +LLVM_VERSION := $(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)
  
--ResourceDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)
+ ResourceDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)
 -PROJ_resources := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(CLANG_VERSION)
-+ResourceDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(LLVM_VERSION)
 +PROJ_resources := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(LLVM_VERSION)
  
  ResourceLibDir := $(ResourceDir)/lib
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141212/4b684520/attachment-0001.html>