Add local build for System.Globalization shim

src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets

@@ -52,7 +52,7 @@ The .NET Foundation licenses this file to you under the MIT license.
 
     <ItemGroup>
       <NetCoreAppNativeLibrary Include="System.Native" />
-      <NetCoreAppNativeLibrary Include="System.Globalization.Native" />
+      <NetCoreAppNativeLibrary Include="System.Globalization.Native" Condition="'$(StaticICULinking)' != 'true'" />
       <NetCoreAppNativeLibrary Include="System.IO.Compression.Native" />
       <NetCoreAppNativeLibrary Include="System.Net.Security.Native" />
       <NetCoreAppNativeLibrary Include="System.Security.Cryptography.Native.Apple" Condition="'$(TargetOS)' == 'OSX'" />
@@ -64,7 +64,10 @@ The .NET Foundation licenses this file to you under the MIT license.
       <NetCoreAppNativeLibrary Include="@(NetCoreAppNativeLibrary->'%(Identity)')">
         <EscapedPath>$(IlcFrameworkNativePath)lib%(Identity).a</EscapedPath>
       </NetCoreAppNativeLibrary>
+      <NativeLibrary Include="$(IntermediateOutputPath)/libs/System.Globalization.Native/build/libSystem.Globalization.Native.a" Condition="'$(StaticICULinking)' == 'true'"/>
+      <DirectPInvoke Include="libSystem.Globalization.Native" Condition="'$(StaticICULinking)' == 'true'"/>
       <NativeLibrary Include="@(NetCoreAppNativeLibrary->'%(EscapedPath)')" />
+      <StaticICULibs Include="-Wl,-Bstatic -licuio -licutu -licui18n -licuuc -licudata -Wl,-Bdynamic" Condition="'$(StaticICULinking)' == 'true'" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(TargetOS)' == 'OSX'">
@@ -74,6 +77,8 @@ The .NET Foundation licenses this file to you under the MIT license.
       <NativeFramework Include="GSS" />
     </ItemGroup>
 
+    <Exec Command="$(IlcHostPackagePath)/native/src/libs/System.Globalization.Native/local-build/build.sh $(IlcHostPackagePath)/ $(IntermediateOutputPath)" Condition="'$(StaticICULinking)' == 'true'"/>
+
     <ItemGroup>
       <LinkerArg Include="@(NativeLibrary)" />
       <LinkerArg Include="--sysroot=$(SysRoot)" Condition="'$(SysRoot)' != ''" />
@@ -91,6 +96,7 @@ The .NET Foundation licenses this file to you under the MIT license.
       <LinkerArg Include="-lz" />
       <LinkerArg Include="-lrt" Condition="'$(TargetOS)' != 'OSX'" />
       <LinkerArg Include="-licucore" Condition="'$(TargetOS)' == 'OSX'" />
+      <LinkerArg Include="@(StaticICULibs)" Condition="'$(StaticICULinking)' == 'true'" />
       <LinkerArg Include="-dynamiclib" Condition="'$(TargetOS)' == 'OSX' and '$(NativeLib)' == 'Shared'" />
       <LinkerArg Include="-shared" Condition="'$(TargetOS)' != 'OSX' and '$(NativeLib)' == 'Shared'" />
       <!-- binskim warning BA3001 PIE disabled on executable -->

src/installer/pkg/projects/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.pkgproj

@@ -21,6 +21,10 @@
       <File Include="$(CoreCLRBuildIntegrationDir)*" TargetPath="build" />
       <File Include="$(CoreCLRILCompilerDir)netstandard\*" TargetPath="tools/netstandard" />
       <File Include="sdk\Sdk.props" TargetPath="Sdk" />
+      <File Include="$(MSBuildThisFileDirectory)\..\..\..\..\native\libs\System.Globalization.Native\*" TargetPath="native/src/libs/System.Globalization.Native"/>
+      <File Include="$(MSBuildThisFileDirectory)\..\..\..\..\native\libs\System.Globalization.Native\local-build\*" TargetPath="native/src/libs/System.Globalization.Native/local-build"/>
+      <File Include="$(MSBuildThisFileDirectory)\..\..\..\..\native\minipal\*" TargetPath="native/src/minipal"/>
+      <File Include="$(MSBuildThisFileDirectory)\..\..\..\..\native\libs\Common\*" TargetPath="native/src/libs/Common"/>
     </ItemGroup>
   </Target>
 

src/native/libs/System.Globalization.Native/local-build/CMakeLists.txt

@@ -0,0 +1,35 @@
+cmake_minimum_required(VERSION 3.6)
+
+project(System.Globalization.Native.Local.Build C)
+
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux") # Only Linux for now
+
+configure_file(../config.h.in config.h)
+
+set(NATIVEGLOBALIZATION_SOURCES
+  ../pal_calendarData.c
+  ../pal_casing.c
+  ../pal_collation.c
+  ../pal_idna.c
+  ../pal_locale.c
+  ../pal_localeNumberData.c
+  ../pal_localeStringData.c
+  ../pal_normalization.c
+  ../pal_icushim_static.c
+  ../pal_timeZoneInfo.c
+)
+
+add_library(System.Globalization.Native
+    STATIC
+    ${NATIVEGLOBALIZATION_SOURCES}
+)
+
+add_definitions(-DPALEXPORT=EXTERN_C -DTARGET_UNIX -DSTATIC_ICU -DSTATIC_SHIM_COMPILE)
+
+target_compile_options(System.Globalization.Native PUBLIC -std=gnu99 -fPIC -fno-omit-frame-pointer -fstack-protector-strong)
+
+target_include_directories (System.Globalization.Native PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../../ ${CMAKE_CURRENT_SOURCE_DIR}/../../../libs/Common ${CMAKE_CURRENT_BINARY_DIR})
+
+else()
+  message( FATAL_ERROR "Static builds are supported only on Linux" )
+endif()

src/native/libs/System.Globalization.Native/local-build/build.sh

@@ -0,0 +1,26 @@
+#!/bin/sh
+
+# Licensed to the .NET Foundation under one or more agreements.
+# The .NET Foundation licenses this file to you under the MIT license.
+#
+
+# This script is used only for building libSystem.Globalization.Native.a
+# in the end-user's computer for NativeAOT purposes (static linking).
+# This file is not used during the dotnet runtime build.
+
+# Currently, only Linux is supported
+
+SHIM_SOURCE_DIR=$1/native/src
+INTERMEDIATE_OUTPUT_PATH=$2
+
+if [ -d "$SHIM_SOURCE_DIR" ]; then
+    LOCAL_SHIM_DIR="$INTERMEDIATE_OUTPUT_PATH"/libs/System.Globalization.Native/build
+    mkdir -p "$LOCAL_SHIM_DIR" && cd "$LOCAL_SHIM_DIR"
+    if [ $? -ne 0 ]; then echo "build.sh::ERROR: Cannot use local build directory"; exit 1; fi
+    cmake -S "$SHIM_SOURCE_DIR/libs/System.Globalization.Native/" "$SHIM_SOURCE_DIR/libs/System.Globalization.Native/local-build"
+    if [ $? -ne 0 ]; then echo "build.sh::ERROR: cmake failed"; exit 1; fi
+    make VERBOSE=1 -j
+    if [ $? -ne 0 ]; then echo "build.sh::ERROR: Build failed"; exit 1; fi
+fi
+
+exit 0

src/native/libs/System.Globalization.Native/pal_icushim_internal.h

@@ -15,7 +15,9 @@
 #include "pal_icushim_internal_android.h"
 #else
 
+#if !defined(STATIC_SHIM_COMPILE)
 #define U_DISABLE_RENAMING 1
+#endif
 
 // All ICU headers need to be included here so that all function prototypes are
 // available before the function pointers are declared below.

src/native/libs/System.Globalization.Native/pal_icushim_static.c

@@ -217,12 +217,17 @@ const char* GlobalizationNative_GetICUDTName(const char* culture)
 
 int32_t GlobalizationNative_LoadICU(void)
 {
+#if !defined(STATIC_SHIM_COMPILE)
+// Static NativeAOT compilation does not have
+// GlobalizationNative_LoadICUData() as entrypoint
     if (!isDataSet)
     {
         // don't try to locate icudt.dat automatically if mono_wasm_load_icu_data wasn't called
         // and fallback to invariant mode
         return 0;
     }
+#endif
+
     UErrorCode status = 0;
     UVersionInfo version;
     // Request the CLDR version to perform basic ICU initialization and find out