Using system libs instead of additional (now, superfluous) sources

Removed pic patch
Replaced FP16 source with dependency

Author: stemann

X/XNNPACK/build_tarballs.jl

@@ -24,18 +24,11 @@ pthreadpool_compat = [
 sources = [
     GitSource("https://github.com/google/XNNPACK.git", "79cd5f9e18ad0925ac9a050b00ea5a36230072db"),
     DirectorySource("./bundled"),
-    GitSource("https://github.com/pytorch/cpuinfo.git", "5916273f79a21551890fd3d56fc5375a78d1598d"), # Referenced by https://github.com/google/XNNPACK/blob/79cd5f9e18ad0925ac9a050b00ea5a36230072db/cmake/DownloadCpuinfo.cmake#L15 - conflicts with https://github.com/google/XNNPACK/blob/79cd5f9e18ad0925ac9a050b00ea5a36230072db/WORKSPACE#L71
-    GitSource("https://github.com/pytorch/cpuinfo.git", "d5e37adf1406cf899d7d9ec1d317c47506ccb970"; unpack_target="clog"), # Referenced by https://github.com/google/XNNPACK/blob/79cd5f9e18ad0925ac9a050b00ea5a36230072db/WORKSPACE#L59
-    GitSource("https://github.com/Maratyszcza/FP16.git", "0a92994d729ff76a58f692d3028ca1b64b145d91"), # Referenced by https://github.com/google/XNNPACK/blob/79cd5f9e18ad0925ac9a050b00ea5a36230072db/WORKSPACE#L32
-    GitSource("https://github.com/Maratyszcza/FXdiv.git", "b408327ac2a15ec3e43352421954f5b1967701d1"), # Referenced by https://github.com/google/XNNPACK/blob/79cd5f9e18ad0925ac9a050b00ea5a36230072db/WORKSPACE#L42
-    # psimd 072586a71b55b7f8c584153d223e95687148a900
-    GitSource("https://github.com/Maratyszcza/pthreadpool.git", "b8374f80e42010941bda6c85b0e3f1a1bd77a1e0"), # Referenced by https://github.com/google/XNNPACK/blob/79cd5f9e18ad0925ac9a050b00ea5a36230072db/WORKSPACE#L50
 ]
 
 # Bash recipe for building across all platforms
 script = raw"""
 cd $WORKSPACE/srcdir/XNNPACK
-atomic_patch -p1 ../patches/xnnpack-pic.patch
 atomic_patch -p1 ../patches/xnnpack-soversion.patch
 atomic_patch -p1 ../patches/xnnpack-freebsd.patch
 C_FLAGS=()
@@ -53,27 +46,17 @@ elif [[ $bb_full_target == aarch64-apple-*march+apple_m1* ]]; then
     atomic_patch -p1 ../patches/xnnpack-aarch64-exclude-microkernel-srcs.patch
     C_FLAGS+="-DXNN_NO_F16_OPERATORS "
 fi
-if [[ $target == x86_64-apple-darwin* ]]; then
-    PTHREADPOOL_SYNC_PRIMITIVE=condvar
-else
-    PTHREADPOOL_SYNC_PRIMITIVE=default
-fi
 mkdir build
 cd build
 cmake \
     -DCMAKE_INSTALL_PREFIX=$prefix \
     -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TARGET_TOOLCHAIN} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_LIBDIR=$libdir \
-    -DCPUINFO_SOURCE_DIR=$WORKSPACE/srcdir/cpuinfo \
-    -DCLOG_SOURCE_DIR=$WORKSPACE/srcdir/clog/cpuinfo \
-    -DFP16_SOURCE_DIR=$WORKSPACE/srcdir/FP16 \
-    -DFXDIV_SOURCE_DIR=$WORKSPACE/srcdir/FXdiv \
-    -DPTHREADPOOL_SOURCE_DIR=$WORKSPACE/srcdir/pthreadpool \
-    -DPTHREADPOOL_SYNC_PRIMITIVE=$PTHREADPOOL_SYNC_PRIMITIVE \
     -DXNNPACK_LIBRARY_TYPE=shared \
     -DXNNPACK_BUILD_TESTS=OFF \
     -DXNNPACK_BUILD_BENCHMARKS=OFF \
+    -DXNNPACK_USE_SYSTEM_LIBS=ON \
     -DCMAKE_C_FLAGS="$C_FLAGS" \
     ..
 cmake --build . -- -j $nproc
@@ -100,8 +83,9 @@ products = [
 ]
 
 # Dependencies that must be installed before this package can be built
-dependencies = Dependency[
+dependencies = [
     Dependency("CPUInfo_jll", cpuinfo_build_version; compat=join(string.(cpuinfo_compat), ", ")),
+    BuildDependency(PackageSpec("FP16_jll", v"0.0.20210320")),
     Dependency("PThreadPool_jll", pthreadpool_build_version; compat=join(string.(pthreadpool_compat), ", ")),
 ]