[108565] trunk/dports/lang

26 Jul 2013

Revision: 108565
          https://trac.macports.org/changeset/108565
Author:   larryv@macports.org
Date:     2013-07-26 12:39:16 -0700 (Fri, 26 Jul 2013)
Log Message:
-----------
clang-{3.0,3.1,3.2}: Fix libcxx destroot for non-privileged users (#39230).

Modified Paths:
--------------
    trunk/dports/lang/llvm-3.0/Portfile
    trunk/dports/lang/llvm-3.1/Portfile
    trunk/dports/lang/llvm-3.2/Portfile

Added Paths:
-----------
    trunk/dports/lang/llvm-3.0/files/remove-chown-libcxx.patch
    trunk/dports/lang/llvm-3.1/files/0001-PR12597-Remove-chown-R-root-wheel-from-the-makefile.patch
    trunk/dports/lang/llvm-3.2/files/0002-PR12597-Remove-chown-R-root-wheel-from-the-makefile.patch

Modified: trunk/dports/lang/llvm-3.0/Portfile
===================================================================

--- trunk/dports/lang/llvm-3.0/Portfile	2013-07-26 18:26:30 UTC (rev 108564)
+++ trunk/dports/lang/llvm-3.0/Portfile	2013-07-26 19:39:16 UTC (rev 108565)
@@ -100,7 +100,8 @@
         distfiles-append     clang-${version}${extract.suffix}
     }
 
-    patchfiles-append    tiger-shlib-clang.patch scan-build-PR-35006.patch
+    patchfiles-append    tiger-shlib-clang.patch scan-build-PR-35006.patch \
+                         remove-chown-libcxx.patch
 
     build.target        clang-only
     destroot.target     install-clang

Added: trunk/dports/lang/llvm-3.0/files/remove-chown-libcxx.patch
===================================================================
--- trunk/dports/lang/llvm-3.0/files/remove-chown-libcxx.patch	                        (rev 0)
+++ trunk/dports/lang/llvm-3.0/files/remove-chown-libcxx.patch	2013-07-26 19:39:16 UTC (rev 108565)
@@ -0,0 +1,15 @@
+diff --git a/projects/libcxx/Makefile b/projects/libcxx/Makefile
+index 9b1396d..9172208 100644
+--- a/projects/libcxx/Makefile
++++ b/projects/libcxx/Makefile
+@@ -37,10 +37,6 @@ installhdrs::
+ 	rsync -r --exclude=".*" $(SRCDIRS)/include/* $(DSTROOT)/$(INSTALL_PREFIX)/usr/clang-ide/lib/c++/v1/
+ 	rsync -r --exclude=".*" $(SRCDIRS)/include/* $(DSTROOT)/$(INSTALL_PREFIX)/Developer/usr/lib/c++/v1/
+ 	rsync -r --exclude=".*" $(SRCDIRS)/include/* $(DSTROOT)/$(INSTALL_PREFIX)/Developer/Platforms/iPhoneOS.platform/usr/lib/c++/v1/
+-	chown -R root:wheel $(DSTROOT)/$(INSTALL_PREFIX)/usr/lib/c++
+-	chown -R root:wheel $(DSTROOT)/$(INSTALL_PREFIX)/usr/clang-ide/lib/c++
+-	chown -R root:wheel $(DSTROOT)/$(INSTALL_PREFIX)/Developer/usr/lib/c++
+-	chown -R root:wheel $(DSTROOT)/$(INSTALL_PREFIX)/Developer/Platforms/iPhoneOS.platform/usr/lib/c++
+ 	chmod 755 $(DSTROOT)/$(INSTALL_PREFIX)/usr/lib/c++/v1
+ 	chmod 755 $(DSTROOT)/$(INSTALL_PREFIX)/usr/clang-ide/lib/c++/v1
+ 	chmod 755 $(DSTROOT)/$(INSTALL_PREFIX)/Developer/usr/lib/c++/v1

Modified: trunk/dports/lang/llvm-3.1/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.1/Portfile	2013-07-26 18:26:30 UTC (rev 108564)
+++ trunk/dports/lang/llvm-3.1/Portfile	2013-07-26 19:39:16 UTC (rev 108565)
@@ -104,7 +104,8 @@
         distfiles-append     clang-${version}.src${extract.suffix} compiler-rt-${version}.src${extract.suffix}
     }
 
-    patchfiles-append    tiger-shlib-clang.patch tiger-libclang.patch scan-build-PR-35006.patch
+    patchfiles-append    tiger-shlib-clang.patch tiger-libclang.patch scan-build-PR-35006.patch \
+                         0001-PR12597-Remove-chown-R-root-wheel-from-the-makefile.patch
 
     build.target        clang-only
     destroot.target     install-clang

Added: trunk/dports/lang/llvm-3.1/files/0001-PR12597-Remove-chown-R-root-wheel-from-the-makefile.patch
===================================================================
--- trunk/dports/lang/llvm-3.1/files/0001-PR12597-Remove-chown-R-root-wheel-from-the-makefile.patch	                        (rev 0)
+++ trunk/dports/lang/llvm-3.1/files/0001-PR12597-Remove-chown-R-root-wheel-from-the-makefile.patch	2013-07-26 19:39:16 UTC (rev 108565)
@@ -0,0 +1,25 @@
+From c52fb8d7bf3cbe29f25c7da3d9896ff0bb92b2f0 Mon Sep 17 00:00:00 2001
+From: Bob Wilson <bob.wilson@apple.com>
+Date: Tue, 23 Apr 2013 17:30:35 +0000
+Subject: [PATCH] PR12597: Remove "chown -R root:wheel" from the makefile.
+
+git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@180122 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ Makefile | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/projects/libcxx/Makefile b/projects/libcxx/Makefile
+index 182dcc3..fd32603 100644
+--- a/projects/libcxx/Makefile
++++ b/projects/libcxx/Makefile
+@@ -35,7 +35,6 @@ installheaders::
+ 	mkdir -p $(HEADER_DIR)/c++/v1/ext
+ 	rsync -r --exclude=".*" --exclude="support" $(SRCDIRS)/include/* \
+ 	  $(HEADER_DIR)/c++/v1/
+-	chown -R root:wheel $(HEADER_DIR)/c++
+ 	chmod 755 $(HEADER_DIR)/c++/v1
+ 	chmod 644 $(HEADER_DIR)/c++/v1/*
+ 	chmod 755 $(HEADER_DIR)/c++/v1/ext
+-- 
+1.8.3.3
+

Modified: trunk/dports/lang/llvm-3.2/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.2/Portfile	2013-07-26 18:26:30 UTC (rev 108564)
+++ trunk/dports/lang/llvm-3.2/Portfile	2013-07-26 19:39:16 UTC (rev 108565)
@@ -105,7 +105,8 @@
 
     patchfiles-append    tiger-shlib-clang.patch tiger-libclang.patch scan-build-PR-35006.patch \
                          0001-Comment-out-SL-cctools-workaround.patch \
-                         asan-pthread_workqueue.patch
+                         asan-pthread_workqueue.patch \
+                         0002-PR12597-Remove-chown-R-root-wheel-from-the-makefile.patch
 
     build.target        clang-only
     destroot.target     install-clang

Added: trunk/dports/lang/llvm-3.2/files/0002-PR12597-Remove-chown-R-root-wheel-from-the-makefile.patch
===================================================================
--- trunk/dports/lang/llvm-3.2/files/0002-PR12597-Remove-chown-R-root-wheel-from-the-makefile.patch	                        (rev 0)
+++ trunk/dports/lang/llvm-3.2/files/0002-PR12597-Remove-chown-R-root-wheel-from-the-makefile.patch	2013-07-26 19:39:16 UTC (rev 108565)
@@ -0,0 +1,25 @@
+From c52fb8d7bf3cbe29f25c7da3d9896ff0bb92b2f0 Mon Sep 17 00:00:00 2001
+From: Bob Wilson <bob.wilson@apple.com>
+Date: Tue, 23 Apr 2013 17:30:35 +0000
+Subject: [PATCH] PR12597: Remove "chown -R root:wheel" from the makefile.
+
+git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@180122 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ Makefile | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/projects/libcxx/Makefile b/projects/libcxx/Makefile
+index 182dcc3..fd32603 100644
+--- a/projects/libcxx/Makefile
++++ b/projects/libcxx/Makefile
+@@ -35,7 +35,6 @@ installheaders::
+ 	mkdir -p $(HEADER_DIR)/c++/v1/ext
+ 	rsync -r --exclude=".*" --exclude="support" $(SRCDIRS)/include/* \
+ 	  $(HEADER_DIR)/c++/v1/
+-	chown -R root:wheel $(HEADER_DIR)/c++
+ 	chmod 755 $(HEADER_DIR)/c++/v1
+ 	chmod 644 $(HEADER_DIR)/c++/v1/*
+ 	chmod 755 $(HEADER_DIR)/c++/v1/ext
+-- 
+1.8.3.3
+

    

larryv＠macports.org

tags

participants (1)