diff options
author | Jiyoung Yun <jy910.yun@samsung.com> | 2017-03-21 13:35:49 +0900 |
---|---|---|
committer | Jiyoung Yun <jy910.yun@samsung.com> | 2017-06-13 18:52:37 +0900 |
commit | 672ac8c17e67d727c2ecf63b44df35807e95e7e2 (patch) | |
tree | d64c0c54c1d58e913f2721b5d022cd7d63641ec9 /packaging/coreclr.spec | |
parent | d72dc53c0dfc95356fff8c03ffb815529196d04d (diff) | |
download | coreclr-672ac8c17e67d727c2ecf63b44df35807e95e7e2.tar.gz coreclr-672ac8c17e67d727c2ecf63b44df35807e95e7e2.tar.bz2 coreclr-672ac8c17e67d727c2ecf63b44df35807e95e7e2.zip |
Enable x86 build by using -64bit dependencies
Change-Id: If74f0db1f09e20694dcd066bed5c7d04b5cb118b
Signed-off-by: Jiyoung Yun <jy910.yun@samsung.com>
Diffstat (limited to 'packaging/coreclr.spec')
-rw-r--r-- | packaging/coreclr.spec | 41 |
1 files changed, 26 insertions, 15 deletions
diff --git a/packaging/coreclr.spec b/packaging/coreclr.spec index e4bf3479a0..ae7b038798 100644 --- a/packaging/coreclr.spec +++ b/packaging/coreclr.spec @@ -1,15 +1,10 @@ %{!?dotnet_buildtype: %define dotnet_buildtype Release} -%ifarch x86_64 -%define support_test 1 -%define skipnative 0 -%define skipmscorlib 0 -%endif - -%ifarch %{arm} %define support_test 1 %define skipnative 0 %define skipmscorlib 0 +%ifarch %{ix86} +%define dotnet_buildtype Debug %endif %define dotnet_version 1.0.0 @@ -32,7 +27,7 @@ Source1003: dep_libs.tar.gz Patch0: Add-Tizen-RuntimeID-case.patch Patch1: Add-project.lock.json-files.patch -ExclusiveArch: %{arm} x86_64 +ExcludeArch: aarch64 BuildRequires: python BuildRequires: python-xml @@ -55,7 +50,6 @@ Requires: libuuid BuildRequires: cmake BuildRequires: llvm >= 3.8 BuildRequires: llvm-devel >= 3.8 -#BuildRequires: libllvm >= 3.8 BuildRequires: clang >= 3.8 BuildRequires: clang-devel >= 3.8 BuildRequires: lldb >= 3.8 @@ -74,6 +68,16 @@ BuildRequires: pkgconfig(lttng-ust) %ifarch %{arm} BuildRequires: patchelf %endif +%ifarch %{ix86} +BuildRequires: patchelf +BuildRequires: glibc-64bit +BuildRequires: libgcc-64bit +BuildRequires: libstdc++-64bit +BuildRequires: libunwind-64bit +BuildRequires: libuuid-64bit +BuildRequires: zlib-64bit +BuildRequires: libopenssl-64bit +%endif %endif %description @@ -110,13 +114,13 @@ cp %{SOURCE1001} . %patch1 -p1 cp %{SOURCE1000} ./ tar xf %{SOURCE1000} -%ifarch %{arm} +%ifarch %{arm} %{ix86} %setup -T -D -a 1002 %setup -T -D -a 1003 +%ifarch %{arm} # Detect interpreter name from cross-gcc LD_INTERPRETER=$(patchelf --print-interpreter /emul/usr/bin/gcc) LD_RPATH=$(patchelf --print-rpath /emul/usr/bin/gcc) - for file in $( find ./Tools -name "dotnet" ) do patchelf --set-interpreter ${LD_INTERPRETER} ${file} @@ -127,6 +131,13 @@ do patchelf --set-rpath ${LD_RPATH}:%{_builddir}/%{name}-%{version}/libicu/ ${file} done %endif +%ifarch %{ix86} +for file in $( find ./Tools ./libicu -iname "*.so" -or -iname "*.so.*" ) +do + patchelf --set-rpath %{_builddir}/%{name}-%{version}/libicu/ ${file} +done +%endif +%endif %endif %build @@ -148,9 +159,9 @@ export CLANG_HEADERS=$(clang++ -print-search-dirs 2>&1 | sed -ne '/libraries: /s %else export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${LLVM_LIBDIR}:${GCC_INSTALL_DIR} export LIBRARY_PATH=$LIBRARY_PATH:${LLVM_LIBDIR}:${GCC_INSTALL_DIR} -export CFLAGS=" -B${LLVM_LIBDIR} -B${GCC_INSTALL_DIR} -Wno-deprecated-declarations " -export CPPFLAGS=" -B${LLVM_LIBDIR} -B${GCC_INSTALL_DIR} -Wno-deprecated-declarations " -export CXXFLAGS=" -B${LLVM_LIBDIR} -B${GCC_INSTALL_DIR} -Wno-deprecated-declarations " +export CFLAGS=" -B${LLVM_LIBDIR} -B${GCC_INSTALL_DIR} -Wno-deprecated-declarations -D__extern_always_inline=inline" +export CPPFLAGS=" -B${LLVM_LIBDIR} -B${GCC_INSTALL_DIR} -Wno-deprecated-declarations -D__extern_always_inline=inline" +export CXXFLAGS=" -B${LLVM_LIBDIR} -B${GCC_INSTALL_DIR} -Wno-deprecated-declarations -D__extern_always_inline=inline" export CPLUS_INCLUDE_PATH="${LLVM_INCLUDEDIR}/llvm/:${LLVM_INCLUDEDIR}/llvm-c/:${CLANG_HEADERS}:${GPP_INCLUDE_PATHS}:${CLANG_INCLUDE_PATHS}" export C_INCLUDE_PATH="${LLVM_INCLUDEDIR}/llvm-c/:%{_includedir}" %endif @@ -165,7 +176,7 @@ export C_INCLUDE_PATH="${LLVM_INCLUDEDIR}/llvm-c/:%{_includedir}" %define _barch arm64 %else -%ifarch i586 +%ifarch %{ix86} %define _barch x86 %else |