[rkward-cvs] SF.net SVN: rkward-code:[4653] trunk/rkward/macports

[m-eik at users.sf.net]

Revision: 4653
          http://sourceforge.net/p/rkward/code/4653
Author:   m-eik
Date:     2013-04-01 15:37:15 +0000 (Mon, 01 Apr 2013)
Log Message:
-----------
MacPorts: forcing the use of the same compiler setting as R-framework; the bundle script now also only removes static libs from /opt/rkward/lib

Modified Paths:
--------------
    trunk/rkward/macports/kde/rkward/Portfile
    trunk/rkward/macports/kde/rkward-devel/Portfile
    trunk/rkward/macports/update_bundle.sh

Modified: trunk/rkward/macports/kde/rkward/Portfile
===================================================================
--- trunk/rkward/macports/kde/rkward/Portfile	2013-03-31 20:52:36 UTC (rev 4652)
+++ trunk/rkward/macports/kde/rkward/Portfile	2013-04-01 15:37:15 UTC (rev 4653)
@@ -38,7 +38,12 @@
 }
 
 if {${configure.compiler} == "clang"} {
-        configure.compiler llvm-gcc-4.2
+#        configure.compiler   llvm-gcc-4.2
+        # force the use of gcc 4.7 to be able to link with R-framework
+        depends_lib-append   port:gcc47
+        configure.compiler   macports-gcc-4.7
+        configure.objc       /usr/bin/gcc
+        configure.env-append "OBJCXX=${configure.objc}"
 }
 
 post-extract {

Modified: trunk/rkward/macports/kde/rkward-devel/Portfile
===================================================================
--- trunk/rkward/macports/kde/rkward-devel/Portfile	2013-03-31 20:52:36 UTC (rev 4652)
+++ trunk/rkward/macports/kde/rkward-devel/Portfile	2013-04-01 15:37:15 UTC (rev 4653)
@@ -38,10 +38,14 @@
         depends_lib-append port:okular
 }
 
-#if {${configure.compiler} == "clang"} {
-#        configure.compiler llvm-gcc-4.2
-##        configure.compiler macports-gcc-4.7
-#}
+if {${configure.compiler} == "clang"} {
+#        configure.compiler   llvm-gcc-4.2
+        # force the use of gcc 4.7 to be able to link with R-framework
+        depends_lib-append   port:gcc47
+        configure.compiler   macports-gcc-4.7
+        configure.objc       /usr/bin/gcc
+        configure.env-append "OBJCXX=${configure.objc}"
+}
 
 post-extract {
         # creates the build dir if it doesn't exist

Modified: trunk/rkward/macports/update_bundle.sh
===================================================================
--- trunk/rkward/macports/update_bundle.sh	2013-03-31 20:52:36 UTC (rev 4652)
+++ trunk/rkward/macports/update_bundle.sh	2013-04-01 15:37:15 UTC (rev 4653)
@@ -191,7 +191,9 @@
   echo "deleting all static libs in ${MPTINST}/lib/..."
   sudo rm ${MPTINST}/lib/*.a
   echo "deleting all static libs in ${MPTINST}/var/macports/build..."
-  find "${MPTINST}/var/macports/build" -name "*.a" -exec sudo rm \{\} \;
+  #find "${MPTINST}/var/macports/build" -name "*.a" -exec sudo rm \{\} \;
+  # only remove libs in destroot/libs/
+  find -E "${MPTINST}/var/macports/build" -type f -regex '.*/destroot'${MPTINST}'/lib/[^/]*\.a' -exec sudo rm \{\} \;
 fi
 
 # list disk usage of ports