Add and update a number of packages

5 files changed, 5 insertions, 44 deletions

diff --git a/data/libtapi/_metadata/version b/data/libtapi/_metadata/version
index f0bb29e76..227cea215 100644
--- a/data/libtapi/_metadata/version
+++ b/data/libtapi/_metadata/version
@@ -1 +1 @@
-1.3.0
+2.0.0
diff --git a/data/libtapi/apple-libtapi.tar.gz b/data/libtapi/apple-libtapi.tar.gz
new file mode 100644
index 000000000..ab2c0202b
--- /dev/null
+++ b/data/libtapi/apple-libtapi.tar.gz
diff --git a/data/libtapi/apple-libtapi.tar.xz b/data/libtapi/apple-libtapi.tar.xz
deleted file mode 100644
index 82cfee300..000000000
--- a/data/libtapi/apple-libtapi.tar.xz
+++ /dev/null
diff --git a/data/libtapi/make.sh b/data/libtapi/make.sh
index ec4aa3547..644d8f6bf 100644
--- a/data/libtapi/make.sh
+++ b/data/libtapi/make.sh
@@ -1,8 +1,8 @@
 pkg:setup
 mkdir native
 cd native
-MACOSX_DEPLOYMENT_TARGET=10.9 CC="$(xcrun -f clang) -stdlib=libc++" CXX="$(xcrun -f clang++) -stdlib=libc++" cmake -j16 -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_SYSTEM_NAME=Darwin -DUSE_NLS=0 -DWITH_DOC=0 -DLLVM_INCLUDE_TESTS=OFF ../src/apple-llvm/src
-make -j16 llvm-tblgen
+MACOSX_DEPLOYMENT_TARGET="$(sw_vers -productVersion | sed -e 's/\.[0-9]*$//')" CC="$(xcrun -f clang)" CXX="$(xcrun -f clang++)" cmake -j16 -DLLVM_BUILD_LLVM_DYLIB=ON -DCMAKE_BUILD_TYPE=RELEASE -DLLVM_INCLUDE_TESTS=OFF ../src/llvm
+make -j16 llvm-tblgen clang-tblgen
 cd ..
 mkdir build
 cd build
@@ -26,11 +26,11 @@ set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 EOF
 
 unset MACOSX_DEPLOYMENT_TARGET
-cmake -j8 -DCMAKE_TOOLCHAIN_FILE=iphoneos_toolchain.cmake -DCMAKE_LOCALSTATEDIR="/private/var" -DCMAKE_INSTALL_NAME_DIR="/usr/lib" -DCMAKE_INSTALL_RPATH="/usr/" -DCMAKE_OSX_SYSROOT="${PKG_ROOT}" -DCMAKE_INSTALL_PREFIX="/usr/" -DCMAKE_SHARED_LINKER_FLAGS="-lresolv" -DCURRENT_VENDOR=debian -DUSE_NLS=0 -DWITH_DOC=0 -DLLVM_INCLUDE_TESTS=OFF -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_SYSTEM_NAME=Darwin -DLLVM_TABLEGEN="$(pwd)/../native/bin/llvm-tblgen" -DLLVM_DEFAULT_TARGET_TRIPLE="${PKG_TARG}" -DLLVM_TARGETS_TO_BUILD=AArch64 ../src/apple-llvm/src
+cmake -j8 -DCMAKE_TOOLCHAIN_FILE=iphoneos_toolchain.cmake -DCMAKE_INSTALL_NAME_DIR="/usr/lib" -DCMAKE_INSTALL_RPATH="/usr/" -DCMAKE_OSX_SYSROOT="${PKG_ROOT}" -DCMAKE_INSTALL_PREFIX="/usr/" -DCMAKE_SHARED_LINKER_FLAGS="-lresolv" -DLLVM_INCLUDE_TESTS=OFF -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_SYSTEM_NAME=Darwin -DLLVM_TABLEGEN="$(pwd)/../native/bin/llvm-tblgen" -DCLANG_TABLEGEN="$(pwd)/../native/bin/clang-tblgen" -DLLVM_DEFAULT_TARGET_TRIPLE="${PKG_TARG}" -DLLVM_TARGETS_TO_BUILD=AArch64 ../src/llvm
 
 make -j16 libtapi
 make install-libtapi DESTDIR="${PKG_DEST}"
 pkg: mkdir -p /usr/include/tapi
-pkg: cp -va ../src/apple-llvm/src/projects/libtapi/include/tapi /usr/include
+pkg: cp -va ../src/libtapi/include/tapi /usr/include
 pkg: cp -va projects/libtapi/include/tapi/Version.inc /usr/include/tapi
 cd ..
diff --git a/data/libtapi/miphone.diff b/data/libtapi/miphone.diff
deleted file mode 100644
index 382ba30af..000000000
--- a/data/libtapi/miphone.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -ur apple-libtapi/src/apple-llvm/src/Makefile.rules apple-libtapi+iPhone/src/apple-llvm/src/Makefile.rules
---- apple-libtapi/src/apple-llvm/src/Makefile.rules	2018-08-05 15:37:17.000000000 -1000
-+++ apple-libtapi+iPhone/src/apple-llvm/src/Makefile.rules	2018-08-05 15:52:24.000000000 -1000
-@@ -576,10 +576,6 @@
-   SharedLinkOptions := -dynamiclib
-   ifdef DEPLOYMENT_TARGET
-     SharedLinkOptions += $(DEPLOYMENT_TARGET)
--  else
--    ifneq ($(ARCH),ARM)
--      SharedLinkOptions += -mmacosx-version-min=$(DARWIN_VERSION)
--    endif
-   endif
- else
-   SharedLinkOptions=-shared
-@@ -588,10 +584,6 @@
- ifeq ($(TARGET_OS),Darwin)
-   ifdef DEPLOYMENT_TARGET
-     TargetCommonOpts += $(DEPLOYMENT_TARGET)
--  else
--    ifneq ($(ARCH),ARM)
--      TargetCommonOpts += -mmacosx-version-min=$(DARWIN_VERSION)
--    endif
-   endif
- endif
- 
-diff -ur apple-libtapi/src/apple-llvm/src/utils/buildit/build_llvm apple-libtapi+iPhone/src/apple-llvm/src/utils/buildit/build_llvm
---- apple-libtapi/src/apple-llvm/src/utils/buildit/build_llvm	2018-08-05 15:37:18.000000000 -1000
-+++ apple-libtapi+iPhone/src/apple-llvm/src/utils/buildit/build_llvm	2018-08-05 15:53:09.000000000 -1000
-@@ -189,10 +189,6 @@
-     export CXX=`xcrun -sdk macosx -find clang++`
- 
-     configure_opts="--enable-targets=arm,arm64,x86"
--    if [ -n "$MACOSX_DEPLOYMENT_TARGET" ]; then
--      COMMON_MAKEFLAGS="$COMMON_MAKEFLAGS \
--        DEPLOYMENT_TARGET=-mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET"
--    fi
-   fi
- 
-   if [ $SDKROOT_PATH ]; then