[99958] trunk/dports/kde/kdelibs3

[raimue at macports.org]

Revision: 99958
          https://trac.macports.org/changeset/99958
Author:   raimue at macports.org
Date:     2012-11-22 06:56:29 -0800 (Thu, 22 Nov 2012)
Log Message:
-----------
kde/kdelibs3:
Fix build error on Mountain Lion due to private CUPS headers, fixes #35478.
Make sure we are UsingTheRightCompiler.

Modified Paths:
--------------
    trunk/dports/kde/kdelibs3/Portfile
    trunk/dports/kde/kdelibs3/files/CompileScript.sh

Added Paths:
-----------
    trunk/dports/kde/kdelibs3/files/patch-environment-helper.sh.diff

Modified: trunk/dports/kde/kdelibs3/Portfile
===================================================================
--- trunk/dports/kde/kdelibs3/Portfile	2012-11-22 09:35:46 UTC (rev 99957)
+++ trunk/dports/kde/kdelibs3/Portfile	2012-11-22 14:56:29 UTC (rev 99958)
@@ -88,7 +88,8 @@
                         kdelibs-3.5.10-ossl-1.x.patch \
                         patch-kio_misc_kssld_Makefile.am.diff \
                         patch-stdio.diff \
-                        patch-admin_cvs.sh.diff
+                        patch-admin_cvs.sh.diff \
+                        patch-environment-helper.sh.diff
 
 patch {
     foreach f $patchfiles {
@@ -131,7 +132,8 @@
 use_configure           no
 
 use_parallel_build      yes
-build.env               MAKEFLAGS="-j${build.jobs}" AUTOCONF=autoconf263
+build.env               MAKEFLAGS="-j${build.jobs}" AUTOCONF=autoconf263 \
+                        CC=${configure.cc} CXX=${configure.cxx}
 build.cmd               ./CompileScript.sh
 
 destroot.cmd            ./InstallScript.sh

Modified: trunk/dports/kde/kdelibs3/files/CompileScript.sh
===================================================================
--- trunk/dports/kde/kdelibs3/files/CompileScript.sh	2012-11-22 09:35:46 UTC (rev 99957)
+++ trunk/dports/kde/kdelibs3/files/CompileScript.sh	2012-11-22 14:56:29 UTC (rev 99958)
@@ -7,6 +7,9 @@
 		6*|7*)
 			export CPPFLAGS="$CPPFLAGS -DHAVE_SYS_EXEC_H=1"
 			;; 
+                10.8)
+                        export CXXFLAGS="$CXXFLAGS -D_IPP_PRIVATE_STRUCTURES=1"
+                        ;;
 	esac
 
 	export CPPFLAGS="-I/usr/include/gssapi $CPPFLAGS"

Added: trunk/dports/kde/kdelibs3/files/patch-environment-helper.sh.diff
===================================================================
--- trunk/dports/kde/kdelibs3/files/patch-environment-helper.sh.diff	                        (rev 0)
+++ trunk/dports/kde/kdelibs3/files/patch-environment-helper.sh.diff	2012-11-22 14:56:29 UTC (rev 99958)
@@ -0,0 +1,26 @@
+--- kdelibs-3.5.10/environment-helper.sh.orig	2012-11-22 14:34:11.000000000 +0100
++++ kdelibs-3.5.10/environment-helper.sh	2012-11-22 14:35:38.000000000 +0100
+@@ -121,23 +121,6 @@
+ 	find admin -type f | xargs perl -pi -e "s,/usr/X11R6,$PREFIX,g"
+ fi
+ 
+-if [ -x "/usr/bin/gcc-4.2" ]; then
+-	if [ -x "$PREFIX/bin/ccache" ]; then
+-		mkdir -p gcc-root
+-		[ ! -e gcc-root/gcc-4.2 ] && ln -s $PREFIX/bin/ccache gcc-root/gcc-4.2
+-		[ ! -e gcc-root/g++-4.2 ] && ln -s $PREFIX/bin/ccache gcc-root/g++-4.2
+-		export PATH=`pwd`/gcc-root:"$PATH"
+-		export CC="gcc-4.2"
+-		export CXX="g++-4.2"
+-	else
+-		export CC="/usr/bin/gcc-4.2"
+-		export CXX="/usr/bin/g++-4.2"
+-	fi
+-else
+-	export CC="gcc"
+-	export CXX="g++"
+-fi
+-
+ export ALL_LIBRARIES="$LDFLAGS $LIBS"
+ 
+ cat <<END
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121122/1c716699/attachment.html>