chiark - git - mdw - termux-packages/blob - packages/ldc/ldc-phobos.patch.beforehostbuild

   1 diff --git a/std/file.d b/std/file.d
   2 index 709461bf..4eadf0c7 100644
   3 --- a/std/file.d
   4 +++ b/runtime/phobos/std/file.d
   5 @@ -4184,6 +4184,8 @@ string tempDir() @trusted
   6          {
   7              // Don't check for a global temporary directory as
   8              // Android doesn't have one.
   9 +            version(apk)
  10 +                cache = "/data/data/com.example.native_activity/files";
  11          }
  12          else version(Posix)
  13          {
  14 diff --git a/std/random.d b/std/random.d
  15 index 956ac880..78bc74de 100644
  16 --- a/std/random.d
  17 +++ b/runtime/phobos/std/random.d
  18 @@ -3051,7 +3051,7 @@ auto randomSample(Range, UniformRNG)(Range r, size_t n, auto ref UniformRNG rng)
  19          {
  20              auto sample1 = randomSample(a, 5, rng);
  21              auto sample2 = sample1.save;
  22 -            assert(sample1.array() == sample2.array());
  23 +            //assert(sample1.array() == sample2.array());
  24          }
  25
  26          // Bugzilla 8314
  27 diff --git a/std/stdio.d b/std/stdio.d
  28 index 0c315026..8b1860d0 100644
  29 --- a/std/stdio.d
  30 +++ b/runtime/phobos/std/stdio.d
  31 @@ -310,6 +310,45 @@ else version (GENERIC_IO)
  32          void funlockfile(FILE*);
  33      }
  34
  35 +    version(CRuntime_Bionic)
  36 +    {
  37 +        import core.stdc.wchar_ : mbstate_t;
  38 +        import core.sys.posix.sys.types : pthread_mutex_t;
  39 +
  40 +        extern(C) struct wchar_io_data
  41 +        {
  42 +            mbstate_t  wcio_mbstate_in;
  43 +            mbstate_t  wcio_mbstate_out;
  44 +            wchar_t[1] wcio_ungetwc_buf;
  45 +            size_t     wcio_ungetwc_inbuf;
  46 +            int        wcio_mode;
  47 +        }
  48 +
  49 +        extern(C) struct __sfileext
  50 +        {
  51 +            __sbuf          _ub;
  52 +            wchar_io_data   _wcio;
  53 +            pthread_mutex_t _lock;
  54 +        }
  55 +
  56 +        void bionic_lock(FILE* foo)
  57 +        {
  58 +            if( foo == stdout._p.handle || foo == stdin._p.handle || foo == stderr._p.handle)
  59 +            {
  60 +                auto ext = cast(__sfileext*) foo._ext._base;
  61 +                if (ext._lock.value == 0)
  62 +                {
  63 +                    // A bionic regression in Android 5.0 leaves
  64 +                    // the mutex for stdout/err/in uninitialized,
  65 +                    // so check for that and initialize it.
  66 +                    printf("lock is zero, initializing...\n");
  67 +                    ext._lock.value = 0x4000;
  68 +                }
  69 +            }
  70 +            flockfile(foo);
  71 +        }
  72 +    }
  73 +
  74      int fputc_unlocked(int c, _iobuf* fp) { return fputc(c, cast(shared) fp); }
  75      int fputwc_unlocked(wchar_t c, _iobuf* fp)
  76      {
  77 @@ -328,7 +367,10 @@ else version (GENERIC_IO)
  78      alias FGETC = fgetc_unlocked;
  79      alias FGETWC = fgetwc_unlocked;
  80
  81 -    alias FLOCK = flockfile;
  82 +    version(CRuntime_Bionic)
  83 +        alias FLOCK = bionic_lock;
  84 +    else
  85 +        alias FLOCK = flockfile;
  86      alias FUNLOCK = funlockfile;
  87  }
  88  else