| Subject: | [PATCH] Android support |
Saving LD_LIBRARY_PATH is necessary to get the relevant test to pass, and for the module to install cleanly.
| Subject: | 0001-Save-LD_LIBRARY_PATH-for-Android-on-t-51-threads-tea.patch |
From 40ab41495a8afe710b677ac3f8e00ba78786f182 Mon Sep 17 00:00:00 2001
From: Brian Fraser <fraserbn@gmail.com>
Date: Sat, 2 Aug 2014 17:42:24 +0200
Subject: [PATCH] Save LD_LIBRARY_PATH for Android on t/51-threads-teardown.t
In Android, LD_LIBRARY_PATH must have the location of
libperl.so, otherwise perl will have a linking error
and simply won't work.
---
t/51-threads-teardown.t | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/t/51-threads-teardown.t b/t/51-threads-teardown.t
index 164a047..b853a67 100644
--- a/t/51-threads-teardown.t
+++ b/t/51-threads-teardown.t
@@ -2,6 +2,7 @@
use strict;
use warnings;
+use Config;
use lib 't/lib';
use autovivification::TestThreads;
@@ -11,10 +12,13 @@ use Test::Leaner tests => 1;
sub run_perl {
my $code = shift;
+ my $ld_name = $Config{ldlibpthname};
my ($SystemRoot, $PATH) = @ENV{qw<SystemRoot PATH>};
+ my $ldlibpth = $ENV{$ld_name};
local %ENV;
$ENV{SystemRoot} = $SystemRoot if $^O eq 'MSWin32' and defined $SystemRoot;
$ENV{PATH} = $PATH if $^O eq 'cygwin' and defined $PATH;
+ $ENV{$ld_name} = $ldlibpth if $^O eq 'android' and defined $ldlibpth;
system { $^X } $^X, '-T', map("-I$_", @INC), '-e', $code;
}
--
1.7.12.4 (Apple Git-37)