Просмотр исходного кода

Patching Druntime for sambamba

gn-stable
pjotrp 3 лет назад
Родитель
Сommit
ea1ce997a5
3 измененных файлов: 30 добавлений и 5 удалений
  1. +1
    -1
      gn/packages/bioinformatics.scm
  2. +5
    -4
      gn/packages/ldc.scm
  3. +24
    -0
      ldc-druntime-finiTLSRanges.patch

+ 1
- 1
gn/packages/bioinformatics.scm Просмотреть файл

@@ -924,7 +924,7 @@ association studies (GWAS).")
(let ((commit "91096e78c81162f855b1044a4b2d41895bd27262"))
(package
(name "sambamba")
(version (string-append "0.6.6-pre1-" (string-take commit 7)))
(version (string-append "0.6.6-pre2-" (string-take commit 7)))
(source (origin
(method git-fetch)
(uri (git-reference


+ 5
- 4
gn/packages/ldc.scm Просмотреть файл

@@ -177,6 +177,7 @@
"https://github.com/ldc-developers/druntime/archive/ldc-v"
version2 ".tar.gz"))
(file-name (string-append "ldc-druntime-" version2 ".tar.gz"))
(patches (search-patches "ldc-druntime-finiTLSRanges.patch"))
(sha256
(base32
"07qvrqj6vgakd6qr4x5f70w6zwkzd1li5x8i1b5ywnds1z5lnfp6"))))
@@ -202,10 +203,10 @@
(uri (string-append
"https://github.com/dlang/tools/archive/"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0ryn4fv1mj8c8d7y4lrr43baahl3z7sk5bryj9kd829paz573va6"))))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0ryn4fv1mj8c8d7y4lrr43baahl3z7sk5bryj9kd829paz573va6"))))
(build-system gnu-build-system)
(arguments
'(#:phases


+ 24
- 0
ldc-druntime-finiTLSRanges.patch Просмотреть файл

@@ -0,0 +1,24 @@
diff --git a/src/rt/sections_elf_shared.d b/src/rt/sections_elf_shared.d
index a1ea73a..243e3f6 100644
--- a/src/rt/sections_elf_shared.d
+++ b/src/rt/sections_elf_shared.d
@@ -149,7 +149,8 @@ version (Shared)
void finiTLSRanges(Array!(ThreadDSO)* tdsos)
{
- tdsos.reset();
+ // Disabling like static version - not sure this one is misbehaving though
+ // tdsos.reset();
}
void scanTLSRanges(Array!(ThreadDSO)* tdsos, scope ScanDG dg) nothrow
@@ -234,7 +235,8 @@ else
void finiTLSRanges(Array!(void[])* rngs)
{
- rngs.reset();
+ // Throws exception, see https://github.com/lomereiter/sambamba/issues/219#issuecomment-275838455
+ // rngs.reset();
}
void scanTLSRanges(Array!(void[])* rngs, scope ScanDG dg) nothrow

Загрузка…
Отмена
Сохранить