[PC-BSD Commits] r3211 - pbibuild/pbibuilder/scripts

[svn at pcbsd.org]

Author: kris
Date: 2009-01-09 07:26:07 -0800 (Fri, 09 Jan 2009)
New Revision: 3211

Modified:
   pbibuild/pbibuilder/scripts/2.1.startmake.sh
Log:

Updated our pbi build script to unset QMAKESPEC, which can cause some errors during compiles of QT4 apps



Modified: pbibuild/pbibuilder/scripts/2.1.startmake.sh
===================================================================
--- pbibuild/pbibuilder/scripts/2.1.startmake.sh	2009-01-09 14:52:31 UTC (rev 3210)
+++ pbibuild/pbibuilder/scripts/2.1.startmake.sh	2009-01-09 15:26:07 UTC (rev 3211)
@@ -119,14 +119,15 @@
   echo "BATCH=yes
 ${MAKEOPTS}" >${PDESTDIR}/etc/make.conf
   echo "#!/bin/sh
-  PATH="${PATH}:/usr/local/kde4/bin"
-  export PATH
-
-  LD_LIBRARY_PATH="/usr/local/lib/qt4:/usr/local/kde4/lib"
-  export LD_LIBRARY_PATH
+PATH="${PATH}:/usr/local/kde4/bin"
+export PATH
+QMAKESPEC=""
+export QMAKESPEC
+LD_LIBRARY_PATH="/usr/local/lib/qt4:/usr/local/kde4/lib"
+export LD_LIBRARY_PATH
 FORCE_PKG_REGISTER=\"Y\"
 export FORCE_PKG_REGISTER
-  " >${PDESTDIR}/source.sh
+" >${PDESTDIR}/source.sh
 
 else
 # We are running a regular PBI make
@@ -156,6 +157,8 @@
 
 LD_LIBRARY_PATH=\"${PBILOCALBASE}/lib:${PBILOCALBASE}/lib/qt4:${PBILOCALBASE}/kde4/lib\"
 export LD_LIBRARY_PATH
+QMAKESPEC=""
+export QMAKESPEC
 FORCE_PKG_REGISTER=\"Y\"
 export FORCE_PKG_REGISTER" >${PDESTDIR}/source.sh