Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Alexander Tsamutali (a171254122d0caac480672f20d065fd4aa77fa41)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Alexander Tsamutali <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Alexander Tsamutali (a171254122d0caac480672f20d065fd4aa77fa41)
  • Date: Wed, 30 Jul 2008 05:02:56 -0500

GIT changes to master grimoire by Alexander Tsamutali <astsmtl AT gmail.com>:

devel/fpc/BUILD | 20 ++------------------
devel/fpc/DETAILS | 7 ++++---
devel/fpc/HISTORY | 6 ++++++
devel/fpc/INSTALL | 6 ++----
4 files changed, 14 insertions(+), 25 deletions(-)

New commits:
commit a171254122d0caac480672f20d065fd4aa77fa41
Author: Alexander Tsamutali <astsmtl AT gmail.com>
Commit: Alexander Tsamutali <astsmtl AT gmail.com>

devel/fpc: simplified BUILD, fixed fpc.cfg

diff --git a/devel/fpc/BUILD b/devel/fpc/BUILD
index 9402bfc..132dd0c 100755
--- a/devel/fpc/BUILD
+++ b/devel/fpc/BUILD
@@ -7,24 +7,8 @@ else
fi &&

if ! spell_ok fpc ; then
-#
-# First compile a local version with the bootstrap
-#
-make PP=$SOURCE_DIRECTORY/bootstrap/lib/fpc/$VERSION/ppc$ARCH compiler_cycle
&&
-cp $SOURCE_DIRECTORY/compiler/ppc$ARCH \
- $SOURCE_DIRECTORY/bootstrap/ppc$ARCH.local &&
-
-#
-# Now recompile our new bootstrap with our local compiler
-#
-make PP=$SOURCE_DIRECTORY/bootstrap/ppc$ARCH.local compiler_cycle &&
-rm -f $SOURCE_DIRECTORY/bootstrap/ppc$ARCH.local &&
-#
-# Build all with our newly forged local FPC
-#
- PP=$SOURCE_DIRECTORY/compiler/ppc$ARCH
+ PP=$SOURCE_DIRECTORY/bootstrap/lib/fpc/$VERSIONB/ppc$ARCH
else
-# use installed fpc
PP=$INSTALL_ROOT/usr/bin/fpc
fi &&
-make PP=$PP build
+make PP=$PP build
diff --git a/devel/fpc/DETAILS b/devel/fpc/DETAILS
index 674667f..d21936c 100755
--- a/devel/fpc/DETAILS
+++ b/devel/fpc/DETAILS
@@ -1,6 +1,7 @@
- SPELL=fpc
+ SPELL=fpc
VERSION=2.2.2.rc2
- VX=beta
+ PATCHLEVEL=1
+ VX=beta

SOURCE_HASH=sha512:de974cb6fa146a5dc9b4a73b73d1fc6d941227c4c625bc8b1b4085d353b008b29a24efa83952c1802fce4242b428b54e9d69f3504eb4c3aa94f3d838919cd029
SOURCE=$SPELL-$VERSION.source.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
@@ -8,7 +9,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=ftp://ftp.freepascal.org/fpc/$VX/${VERSION/\.r/r}/source/$SOURCE
WEB_SITE=http://www.freepascal.org
if ! spell_ok fpc ; then
- VERSIONB=2.2.0
+ VERSIONB=2.2.0
if [[ "${SMGL_COMPAT_ARCHS[1]}" == "ia32" ]]; then
SOURCE2=$SPELL-$VERSIONB.i386-linux.tar
elif [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]; then
diff --git a/devel/fpc/HISTORY b/devel/fpc/HISTORY
index e879dbc..6fe88d4 100644
--- a/devel/fpc/HISTORY
+++ b/devel/fpc/HISTORY
@@ -1,3 +1,9 @@
+2008-07-30 Alexander Tsamutali <astsmtl AT gmail.com>
+ * DETAILS: PATCHLEVEL++
+ * BUILD: No need to build compiler several times by hand, upstream
+ build system does it
+ * INSTALL: Define 'basepath' for fpc.cfg
+
2008-07-19 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.2.2.rc2
leave bootstrap version as 2.2.0, as not always needed
diff --git a/devel/fpc/INSTALL b/devel/fpc/INSTALL
index f76f49e..ef67995 100755
--- a/devel/fpc/INSTALL
+++ b/devel/fpc/INSTALL
@@ -12,14 +12,12 @@ FPCDIR=$FPCDEST/lib/fpc/${VERSION//\.rc?}
&
FPC_COMP=$SOURCE_DIRECTORY/compiler/ppc$ARCH
&&
FPC_MAKE=$SOURCE_DIRECTORY/utils/fpcm/fpcmake
&&
mkdir -p $FPCDIR
&&
-#make PP=$FPC_COMP INSTALL_PREFIX=$FPCDEST FPCMAKE=$FPC_MAKE
compiler_install \
-# rtl_install packages_install fv_install utils_install
&&
-make PP=$FPC_COMP INSTALL_PREFIX=$FPCDEST FPCMAKE=$FPC_MAKE distinstall &&
+make PP=$FPC_COMP INSTALL_PREFIX=$FPCDEST FPCMAKE=$FPC_MAKE install &&
ln -sf $FPCDIR/ppc$ARCH $FPCDEST/bin &&

#
# Generate a default /etc/fpc.cfg
#
-fpcmkcfg > $SOURCE_DIRECTORY/fpc.cfg &&
+fpcmkcfg -d basepath=$FPCDIR > $SOURCE_DIRECTORY/fpc.cfg &&
install_config_file $SOURCE_DIRECTORY/fpc.cfg \
$INSTALL_ROOT/etc/fpc.cfg



  • [SM-Commit] GIT changes to master grimoire by Alexander Tsamutali (a171254122d0caac480672f20d065fd4aa77fa41), Alexander Tsamutali, 07/30/2008

Archive powered by MHonArc 2.6.24.

Top of Page