Skip to content

Commit f955af7

Browse files
committed
build: bump Cabal pin to aa57a49 (musl T14304 $ORIGIN rpath fix)
aa57a49 is 8b8433b plus a Link.hs fix to always include the artifact own dir ($ORIGIN / @loader_path) in emitted rpaths, so a same-dir sibling (Backpack signature impl libHSp next to libHSindef) is found by musl loader. Fixes backpack/cabal/T14304 on Alpine; no-op on glibc.
1 parent ddd2b73 commit f955af7

4 files changed

Lines changed: 9 additions & 4 deletions

File tree

cabal.project.stage0

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,13 @@ source-repository-package
1212
-- ("ld: cannot find -lHSbytestring-...-ghc9.8.4", incl. glibc deb11/Mac).
1313
-- 8b8433b carries that fix — it is the pin stable-haskell/ghc #181 uses
1414
-- and builds green on all platforms with DYNAMIC=1.
15+
-- 3. aa57a49 adds, on top of 8b8433b, a fix to always include the
16+
-- artifact's own dir ($ORIGIN/@loader_path) in emitted rpaths, so a
17+
-- same-dir sibling (e.g. a Backpack signature impl) is found by musl's
18+
-- loader (GHC testsuite T14304 on Alpine; glibc masked it via runtime
19+
-- LD_LIBRARY_PATH, which musl ignores).
1520
-- Revisit (move back to master) once the host-only handling lands there.
16-
tag: 8b8433b736d45ec53a103baf4e4aabb8010ca2ed
21+
tag: aa57a49b187b067f060eb9f87499edefe5d05120
1722
subdir: Cabal
1823
Cabal-syntax
1924
cabal-install

cabal.project.stage1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ source-repository-package
4646
type: git
4747
location: https://github.com/stable-haskell/Cabal.git
4848
-- Pinned to 8b8433b (feature/wasm-cross-ghcup-stack); see cabal.project.stage0.
49-
tag: 8b8433b736d45ec53a103baf4e4aabb8010ca2ed
49+
tag: aa57a49b187b067f060eb9f87499edefe5d05120
5050
subdir: Cabal
5151
Cabal-syntax
5252

cabal.project.stage2.common

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ source-repository-package
8585
type: git
8686
location: https://github.com/stable-haskell/Cabal.git
8787
-- Pinned to 8b8433b (feature/wasm-cross-ghcup-stack); see cabal.project.stage0.
88-
tag: 8b8433b736d45ec53a103baf4e4aabb8010ca2ed
88+
tag: aa57a49b187b067f060eb9f87499edefe5d05120
8989
subdir: Cabal
9090
Cabal-syntax
9191

cabal.project.stage3

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ source-repository-package
6868
type: git
6969
location: https://github.com/stable-haskell/Cabal.git
7070
-- Pinned to 8b8433b (feature/wasm-cross-ghcup-stack); see cabal.project.stage0.
71-
tag: 8b8433b736d45ec53a103baf4e4aabb8010ca2ed
71+
tag: aa57a49b187b067f060eb9f87499edefe5d05120
7272
subdir: Cabal
7373
Cabal-syntax
7474

0 commit comments

Comments
 (0)