summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiyoung Yun <jy910.yun@samsung.com>2016-12-09 11:33:50 +0900
committerJiyoung Yun <jy910.yun@samsung.com>2017-02-21 14:47:00 +0900
commita5e135ae11654c4922a10cb24bb7ca06b09d0b24 (patch)
tree1cec7bb2d9372b0e38310ed44c69eacc22348ea4
parent4f88514f89d269df4d8e66ed5baaa607786fbeec (diff)
downloadcoreclr-a5e135ae11654c4922a10cb24bb7ca06b09d0b24.tar.gz
coreclr-a5e135ae11654c4922a10cb24bb7ca06b09d0b24.tar.bz2
coreclr-a5e135ae11654c4922a10cb24bb7ca06b09d0b24.zip
Embed libicu in Tools directory
Change-Id: If9adc8cb617783101d11a2a564c663ff8bebb21d Signed-off-by: Jiyoung Yun <jy910.yun@samsung.com>
-rw-r--r--packaging/coreclr.spec10
-rw-r--r--packaging/downloaded_files.tar.gzbin156610475 -> 156518381 bytes
-rw-r--r--packaging/libicu.tar.gzbin0 -> 12152902 bytes
3 files changed, 6 insertions, 4 deletions
diff --git a/packaging/coreclr.spec b/packaging/coreclr.spec
index e8f5a0aa97..419ccbd616 100644
--- a/packaging/coreclr.spec
+++ b/packaging/coreclr.spec
@@ -22,6 +22,7 @@ URL: http://github.com/dotnet/coreclr
Source0: %{name}-%{version}.tar.gz
Source1000: downloaded_files.tar.gz
Source1001: %{name}.manifest
+Source1002: libicu.tar.gz
# Gbp-Ignore-Patches: 0 1 2
Patch0: Add-Tizen-distro.patch
Patch1: Do-not-ignore-project.lock.json.patch
@@ -103,13 +104,14 @@ cp %{SOURCE1001} .
cp %{SOURCE1000} ./
tar xf %{SOURCE1000}
%ifarch armv7l
+%setup -T -D -a 1002
patchelf --set-interpreter /emul/lib64/ld-linux-x86-64.so.2 ./Tools/dotnetcli/dotnet
-patchelf --set-rpath /emul/usr/lib64/ ./Tools/dotnetcli/dotnet
+patchelf --set-rpath /emul/usr/lib64/:%{_builddir}/%{name}-%{version}/libicu/ ./Tools/dotnetcli/dotnet
patchelf --set-interpreter /emul/lib64/ld-linux-x86-64.so.2 ./Tools/dotnetcli/shared/Microsoft.NETCore.App/1.0.0-rc3-002733/dotnet
-patchelf --set-rpath /emul/usr/lib64/ ./Tools/dotnetcli/shared/Microsoft.NETCore.App/1.0.0-rc3-002733/dotnet
-for file in $( find ./Tools -iname "*.so" )
+patchelf --set-rpath /emul/usr/lib64/:%{_builddir}/%{name}-%{version}/libicu/ ./Tools/dotnetcli/shared/Microsoft.NETCore.App/1.0.0-rc3-002733/dotnet
+for file in $( find ./Tools ./libicu -iname "*.so" -or -iname "*.so.*" )
do
- patchelf --set-rpath /emul/usr/lib64/ $file
+ patchelf --set-rpath /emul/usr/lib64/:%{_builddir}/%{name}-%{version}/libicu/ $file
done
%endif
%endif
diff --git a/packaging/downloaded_files.tar.gz b/packaging/downloaded_files.tar.gz
index 56a4954627..876bf199d1 100644
--- a/packaging/downloaded_files.tar.gz
+++ b/packaging/downloaded_files.tar.gz
Binary files differ
diff --git a/packaging/libicu.tar.gz b/packaging/libicu.tar.gz
new file mode 100644
index 0000000000..949308e754
--- /dev/null
+++ b/packaging/libicu.tar.gz
Binary files differ