Skip to content

Commit

Permalink
Update Lazarus and FPC (#128)
Browse files Browse the repository at this point in the history
Bump FPC to tip of release_3_2_4-branch, Lazarus to 4.0-rc2
  • Loading branch information
lighterowl authored Jan 29, 2025
1 parent 0455057 commit 099ad63
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
9 changes: 5 additions & 4 deletions .github/build_macos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,11 @@ fpc_lazarus_build_install() {
mkdir -p "$sdk_dir"
cd "$sdk_dir"

readonly fpc324_rc1_commit='d78e2897014a69f56a1cfb53c75335c4cc37ba0e'
curl -L -o fpc-src.tar.bz2 "https://gitlab.com/freepascal.org/fpc/source/-/archive/${fpc324_rc1_commit}/source-${fpc324_rc1_commit}.tar.bz2"
# use a private fork which includes a fix for compilation under Sequoia
readonly fpc324_rc1_commit='dae96b96a1839e1a3624c664d6293661cc4bed67'
curl -L -o fpc-src.tar.bz2 "https://gitlab.com/dkk089/fpc-src/-/archive/${fpc324_rc1_commit}/fpc-src-${fpc324_rc1_commit}.tar.bz2"
tar xf fpc-src.tar.bz2
mv "source-${fpc324_rc1_commit}" fpc-src
mv "fpc-src-${fpc324_rc1_commit}" fpc-src
cd fpc-src

mkdir -p "${fpc_installdir}"
Expand All @@ -59,7 +60,7 @@ fpc_lazarus_build_install() {
make_fpc_cfg

cd "$sdk_dir"
local -r lazarus_commit='4e69368d79e3801ad26a7bc7c1eda0ad3cf7dcc4'
local -r lazarus_commit='dab5c509c6fd70f8fac2144e468291899286616f'
curl -L -o lazarus-src.tar.bz2 "https://gitlab.com/dkk089/lazarus/-/archive/${lazarus_commit}/lazarus-${lazarus_commit}.tar.bz2"
tar xf lazarus-src.tar.bz2
mv "lazarus-${lazarus_commit}" lazarus
Expand Down
4 changes: 2 additions & 2 deletions .github/build_windows.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ function FPC-Lazarus-Build-Install {

$env:Path = "${fpc322}\bin\i386-win32;" + $env:Path

$fpc324_commit = 'd78e2897014a69f56a1cfb53c75335c4cc37ba0e'
$fpc324_commit = 'cd84c2d5cd1f7b17de0ca0b62c3d35c661f535b1'
My-Download -Uri "https://gitlab.com/freepascal.org/fpc/source/-/archive/${fpc324_commit}/source-${fpc324_commit}.zip" -OutFile fpc-324-rc1.zip

# we could use Expand-Archive but it takes an eternity and then some
Expand All @@ -43,7 +43,7 @@ function FPC-Lazarus-Build-Install {
fpcmkcfg -d basepath=${fpc324} -o "${fpc324}\bin\i386-win32\fpc.cfg"

cd "$sdk_dir"
$lazarus_commit = '4e69368d79e3801ad26a7bc7c1eda0ad3cf7dcc4'
$lazarus_commit = 'dab5c509c6fd70f8fac2144e468291899286616f'
My-Download -Uri "https://gitlab.com/dkk089/lazarus/-/archive/${lazarus_commit}/lazarus-${lazarus_commit}.zip" -OutFile lazarus-src.zip
7z x lazarus-src.zip

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
build-linux:

runs-on: ubuntu-latest
container: lighterowl/transgui-sdk:1.1
container: lighterowl/transgui-sdk:1.2

steps:
- uses: actions/checkout@v1
Expand Down

0 comments on commit 099ad63

Please sign in to comment.