3.18.00

3 files changed, 83 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b6b1d28ba6de..eda902724980 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,28 @@
 pkgbase = eastl
 	pkgdesc = Electronic Arts Standard Template Library. It is an extensive and robust implementation that has an emphasis on high performance.
-	pkgver = 3.12.01
+	pkgver = 3.18.00
 	pkgrel = 1
 	url = https://github.com/electronicarts/EASTL
 	arch = any
-	license = BSD,
-	license = other
+	license = BSD
+	license = custom
 	makedepends = cmake
-	source = https://github.com/electronicarts/EASTL/archive/3.12.01.tar.gz
-	sha384sums = 68defff99706f975158d2ae19c1889831eab2df39619c22193c08a98db2928d48c11a82ff9e3d8cde11de7e6529397e7
+	makedepends = git
+	source = EASTL-3.18.00.tar.gz::https://github.com/electronicarts/EASTL/archive/refs/tags/3.18.00.tar.gz
+	source = EABase::git+https://github.com/electronicarts/EABase.git
+	source = EAAssert::git+https://github.com/electronicarts/EAAssert.git
+	source = EAMain::git+https://github.com/electronicarts/EAMain.git
+	source = EAStdC::git+https://github.com/electronicarts/EAStdC.git
+	source = EATest::git+https://github.com/electronicarts/EATest.git
+	source = EAThread::git+https://github.com/electronicarts/EAThread.git
+	source = eastl-fix-cmake-install.patch
+	sha256sums = a3c5b970684be02e81fb16fbf92ed2584e055898704fde87c72d0331afdea12b
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = 148b64dcb56cb7e2e7c2f37a2329b41f41c65b718fa794c13a0400965787e9f2
 
 pkgname = eastl
-
diff --git a/PKGBUILD b/PKGBUILD
index 1d0d3d5fca62..7b65927bc2f9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,61 @@
+# Maintainer: Kino <cybao292261@163.com>
+
 pkgname=eastl
-pkgname_=EASTL
-pkgver=3.12.01
+_pkgname=EASTL
+pkgver=3.18.00
 pkgrel=1
 pkgdesc="Electronic Arts Standard Template Library. It is an extensive and robust implementation that has an emphasis on high performance."
-arch=(any)
+arch=('any')
 url="https://github.com/electronicarts/EASTL"
-license=("BSD", "other")
+license=('BSD' 'custom')
 depends=()
-makedepends=("cmake")
-source=("https://github.com/electronicarts/EASTL/archive/${pkgver}.tar.gz")
-sha384sums=("68defff99706f975158d2ae19c1889831eab2df39619c22193c08a98db2928d48c11a82ff9e3d8cde11de7e6529397e7")
+makedepends=("cmake" "git")
+source=(
+  "${_pkgname}-${pkgver}.tar.gz::https://github.com/electronicarts/EASTL/archive/refs/tags/${pkgver}.tar.gz"
+  "EABase::git+https://github.com/electronicarts/EABase.git"
+  "EAAssert::git+https://github.com/electronicarts/EAAssert.git"
+  "EAMain::git+https://github.com/electronicarts/EAMain.git"
+  "EAStdC::git+https://github.com/electronicarts/EAStdC.git"
+  "EATest::git+https://github.com/electronicarts/EATest.git"
+  "EAThread::git+https://github.com/electronicarts/EAThread.git"
+  "eastl-fix-cmake-install.patch")
+
+sha256sums=('a3c5b970684be02e81fb16fbf92ed2584e055898704fde87c72d0331afdea12b'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            '148b64dcb56cb7e2e7c2f37a2329b41f41c65b718fa794c13a0400965787e9f2')
+
+prepare() {
+  cd ${_pkgname}-${pkgver}
+  cp -r ../EABase/* test/packages/EABase
+  cp -r ../EAAssert/* test/packages/EAAssert
+  cp -r ../EAMain/* test/packages/EAMain
+  cp -r ../EAStdC/* test/packages/EAStdC
+  cp -r ../EATest/* test/packages/EATest
+  cp -r ../EAThread/* test/packages/EAThread
+  patch -p1 < ../eastl-fix-cmake-install.patch
+}
 
 build() {
-  cmake -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -B"${srcdir}/${pkgname_}-${pkgver}" \
-        -H"${srcdir}/${pkgname_}-${pkgver}"
-  cmake --build "${srcdir}/${pkgname_}-${pkgver}"
+  mkdir -p "${_pkgname}-${pkgver}/build"
+
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DEASTL_BUILD_TESTS=OFF \
+        -DEASTL_BUILD_BENCHMARK=OFF \
+        -B"${srcdir}/${_pkgname}-${pkgver}/build" \
+        -H"${srcdir}/${_pkgname}-${pkgver}"
+
+  cmake --build "${srcdir}/${_pkgname}-${pkgver}/build"
 }
 
 package() {
-  make DESTDIR="${pkgdir}" -C "${srcdir}/${pkgname_}-${pkgver}" install
+  make DESTDIR="${pkgdir}" -C "${srcdir}/${_pkgname}-${pkgver}/build" install
   mkdir -p "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -Dm644 "${srcdir}/${pkgname_}-${pkgver}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -Dm644 "${srcdir}/${pkgname_}-${pkgver}/3RDPARTYLICENSES.TXT" "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -Dm644 "${srcdir}/${_pkgname}-${pkgver}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -Dm644 "${srcdir}/${_pkgname}-${pkgver}/3RDPARTYLICENSES.TXT" "${pkgdir}/usr/share/licenses/${pkgname}"
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/eastl-fix-cmake-install.patch b/eastl-fix-cmake-install.patch
new file mode 100644
index 000000000000..14d70a930d42
--- /dev/null
+++ b/eastl-fix-cmake-install.patch
@@ -0,0 +1,14 @@
+diff -ruN EASTL-3.18.00/CMakeLists.txt EASTL-3.18.00_/CMakeLists.txt
+--- EASTL-3.18.00/CMakeLists.txt	2021-10-21 07:36:23.000000000 +0800
++++ EASTL-3.18.00_/CMakeLists.txt	2023-01-27 20:24:46.168104709 +0800
+@@ -52,3 +52,10 @@
+ 
+ target_link_libraries(EASTL EABase)
+ 
++#-------------------------------------------------------------------------------------------
++# Installation
++#-------------------------------------------------------------------------------------------
++install(TARGETS EASTL DESTINATION lib)
++install(DIRECTORY include/EASTL DESTINATION include)
++install(DIRECTORY test/packages/EABase/include/Common/EABase DESTINATION include)
++