[PC-BSD Commits] r5182 - in pbibuild/modules/lang/gcc45: . overlay-dir

svn at pcbsd.org svn at pcbsd.org
Tue Dec 1 14:04:20 PST 2009


Author: kris
Date: 2009-12-01 14:04:20 -0800 (Tue, 01 Dec 2009)
New Revision: 5182

Modified:
   pbibuild/modules/lang/gcc45/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/lang/gcc45/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/lang/gcc45/pbi.conf
Log:

Fixed bug in gcc, need to add a new libs to ldconfig, so you can use runtime fortran, and other compiled apps



Modified: pbibuild/modules/lang/gcc45/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/lang/gcc45/overlay-dir/PBI.RemoveScript.sh	2009-12-01 21:47:34 UTC (rev 5181)
+++ pbibuild/modules/lang/gcc45/overlay-dir/PBI.RemoveScript.sh	2009-12-01 22:04:20 UTC (rev 5182)
@@ -7,6 +7,13 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 
+if [ -d "/PCBSD/local/etc/fonts" ]
+then
+  rm /PCBSD/local/libdata/ldconfig/gcc45
+else
+  rm /usr/local/libdata/ldconfig/gcc45
+fi
+
 rm /Programs/bin/c++45
 rm /Programs/bin/cpp45
 rm /Programs/bin/g++45

Modified: pbibuild/modules/lang/gcc45/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/lang/gcc45/overlay-dir/PBI.SetupScript.sh	2009-12-01 21:47:34 UTC (rev 5181)
+++ pbibuild/modules/lang/gcc45/overlay-dir/PBI.SetupScript.sh	2009-12-01 22:04:20 UTC (rev 5182)
@@ -20,11 +20,16 @@
 then
   ln -s /PCBSD/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
   ln -s /PCBSD/local/lib/X11 /Programs/${PROGDIR}/lib/X11
+  # Link in our gcc45 dir, so that fortran apps can run, and others
+  ln -s /Programs/${PROGDIR}/libdata/ldconfig/gcc45 /PCBSD/local/libdata/ldconfig/gcc45
 else
   ln -s /usr/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
   ln -s /usr/local/lib/X11 /Programs/${PROGDIR}/lib/X11
+  # Link in our gcc45 dir, so that fortran apps can run, and others
+  ln -s /Programs/${PROGDIR}/libdata/ldconfig/gcc45 /usr/local/libdata/ldconfig/gcc45
 fi
 
+
 ln -fs /Programs/${PROGDIR}/.sbin/c++45 /Programs/bin/
 ln -fs /Programs/${PROGDIR}/.sbin/cpp45 /Programs/bin/
 ln -fs /Programs/${PROGDIR}/.sbin/g++45 /Programs/bin/

Modified: pbibuild/modules/lang/gcc45/pbi.conf
===================================================================
--- pbibuild/modules/lang/gcc45/pbi.conf	2009-12-01 21:47:34 UTC (rev 5181)
+++ pbibuild/modules/lang/gcc45/pbi.conf	2009-12-01 22:04:20 UTC (rev 5182)
@@ -32,7 +32,7 @@
 
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is still the same ver
-BUILDKEY="01"
+BUILDKEY="02"
 
 # Don't build this PBI on certian processors (i386 / amd64)
 #ARCHIGNORE="amd64" ; export ARCHIGNORE



More information about the Commits mailing list