From 1dd653056f5b9e805de8833ff643edcf736e47a0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EC=A1=B0=EC=9B=85=EC=84=9D/Common=20Platform=20Lab=28SR=29?= =?utf8?q?/Principal=20Engineer/=EC=82=BC=EC=84=B1=EC=A0=84=EC=9E=90?= Date: Tue, 16 Jul 2019 19:30:21 +0900 Subject: [PATCH] .NETCore 3.0.0 preview doesnot contains "/BaseAddress" option for crossgen. (#81) So, disable base_addr_support related code with temporal flag. This flag will be removed after merging .NETCore 3.0.0 Release Candidate. And remove change smack command for SYSTEM_BASE_ADDR_FILE The base_addr_file is generated after first ni file generation. So, smack change command is not necessary. --- packaging/dotnet-launcher.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packaging/dotnet-launcher.spec b/packaging/dotnet-launcher.spec index 7cfc1c9..40a7c5e 100644 --- a/packaging/dotnet-launcher.spec +++ b/packaging/dotnet-launcher.spec @@ -116,9 +116,11 @@ cmake \ %if 0%{?use_default_base_addr} -DUSE_DEFAULT_BASE_ADDR="" \ %endif +%if 0%{?enable_base_addr_support} -DUNIQUE_DEFAULT_BASE_ADDR_SUPPORT="" \ -DSYSTEM_BASE_FILE=%{_system_base_addr_file} \ -DDEFAULT_BASE_ADDR_START=%{_default_base_addr_start} \ +%endif NativeLauncher make %{?jobs:-j%jobs} VERBOSE=1 @@ -140,7 +142,6 @@ install -m 0644 %{name}.conf %{buildroot}/etc/tmpfiles.d/%{name}.conf %post mkdir -p /opt/etc/skel/.dotnet chsmack -t -a User::App::Shared /opt/etc/skel/.dotnet -chsmack -a _ %{_system_base_addr_file} %{_bindir}/dotnettool --ni-dll %{_runtime_dir}/System.Private.CoreLib.dll %files -- 2.7.4