summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD26
-rw-r--r--eastl-fix-cmake-install.patch13
3 files changed, 14 insertions, 33 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d8c19326f6e7..be8d5f969ccf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = eastl
pkgdesc = Electronic Arts Standard Template Library. It is an extensive and robust implementation that has an emphasis on high performance.
- pkgver = 3.20.02
+ pkgver = 3.21.12
pkgrel = 1
url = https://github.com/electronicarts/EASTL
arch = any
@@ -8,13 +8,11 @@ pkgbase = eastl
license = custom
makedepends = cmake
makedepends = git
- source = EASTL::git+https://github.com/electronicarts/EASTL.git#commit=1aa784643081404783ce6494eb2fcaba99d8f6a5
+ source = https://github.com/electronicarts/EASTL/archive/3.21.12.tar.gz
source = EABase::git+https://github.com/electronicarts/EABase.git
- source = eastl-fix-cmake-install.patch
source = eastl-implement-allocator.patch
+ sha256sums = 2a4d77e5eda23ec52fea8b22abbf2ea8002f38396d2a3beddda3ff2e17f7db2e
sha256sums = SKIP
- sha256sums = SKIP
- sha256sums = 47b65685430a7af2dec6bbf0a4c52e775f1ab23891f100c2db340bc57bd7b758
sha256sums = cabc604045be6f901bc40c62f87e791af7a5f84b4857cfe1a149a653c8ed1166
pkgname = eastl
diff --git a/PKGBUILD b/PKGBUILD
index 8bdc6470cfae..de5f8a44aa76 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,7 @@
pkgname=eastl
_pkgname=EASTL
-_commit=1aa784643081404783ce6494eb2fcaba99d8f6a5
-pkgver=3.20.02
+pkgver=3.21.12
pkgrel=1
pkgdesc="Electronic Arts Standard Template Library. It is an extensive and robust implementation that has an emphasis on high performance."
arch=('any')
@@ -12,41 +11,38 @@ license=('BSD' 'custom')
depends=()
makedepends=("cmake" "git")
source=(
- "${_pkgname}::git+https://github.com/electronicarts/EASTL.git#commit=${_commit}"
+ "https://github.com/electronicarts/EASTL/archive/${pkgver}.tar.gz"
"EABase::git+https://github.com/electronicarts/EABase.git"
- "eastl-fix-cmake-install.patch"
"eastl-implement-allocator.patch"
)
-sha256sums=('SKIP'
+sha256sums=('2a4d77e5eda23ec52fea8b22abbf2ea8002f38396d2a3beddda3ff2e17f7db2e'
'SKIP'
- '47b65685430a7af2dec6bbf0a4c52e775f1ab23891f100c2db340bc57bd7b758'
'cabc604045be6f901bc40c62f87e791af7a5f84b4857cfe1a149a653c8ed1166')
prepare() {
- cd ${_pkgname}
+ cd ${_pkgname}-${pkgver}
cp -r ../EABase/* test/packages/EABase
- patch -p1 < ../eastl-fix-cmake-install.patch
patch -p1 < ../eastl-implement-allocator.patch
}
build() {
- mkdir -p "${_pkgname}/build"
+ mkdir -p "${_pkgname}-${pkgver}/build"
cmake -DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
-DEASTL_BUILD_TESTS=OFF \
-DEASTL_BUILD_BENCHMARK=OFF \
-DBUILD_SHARED_LIBS=ON \
- -B"${srcdir}/${_pkgname}/build" \
- -H"${srcdir}/${_pkgname}"
+ -B"${srcdir}/${_pkgname}-${pkgver}/build" \
+ -H"${srcdir}/${_pkgname}-${pkgver}"
- cmake --build "${srcdir}/${_pkgname}/build"
+ cmake --build "${srcdir}/${_pkgname}-${pkgver}/build"
}
package() {
- make DESTDIR="${pkgdir}" -C "${srcdir}/${_pkgname}/build" install
+ make DESTDIR="${pkgdir}" -C "${srcdir}/${_pkgname}-${pkgver}/build" install
mkdir -p "${pkgdir}/usr/share/licenses/${pkgname}"
- install -Dm644 "${srcdir}/${_pkgname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}"
- install -Dm644 "${srcdir}/${_pkgname}/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}"
}
diff --git a/eastl-fix-cmake-install.patch b/eastl-fix-cmake-install.patch
deleted file mode 100644
index ed172ef71fd5..000000000000
--- a/eastl-fix-cmake-install.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ruN EASTL/CMakeLists.txt EASTL_/CMakeLists.txt
---- EASTL/CMakeLists.txt 2023-02-01 22:13:16.277102675 +0800
-+++ EASTL_/CMakeLists.txt 2023-02-01 22:13:24.290381488 +0800
-@@ -56,3 +56,9 @@
-
- target_link_libraries(EASTL EABase)
-
-+#-------------------------------------------------------------------------------------------
-+# Installation
-+#-------------------------------------------------------------------------------------------
-+install(TARGETS EASTL DESTINATION lib)
-+install(DIRECTORY include/EASTL DESTINATION include)
-+