summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Tang2023-06-25 14:58:01 +0800
committerWilliam Tang2023-06-25 14:58:01 +0800
commit434fd35e354942dc409eb42a69e7b5a7556d1262 (patch)
tree80da271a93ef5ca3692aef0df86c8b4f5db805ba
parent322ff6d81c0b3dcd22f6308467a38805ff3cb591 (diff)
downloadaur-434fd35e354942dc409eb42a69e7b5a7556d1262.tar.gz
Use gcc 12 for now
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD11
-rw-r--r--hadoop.install4
3 files changed, 15 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 78374fee185e..4782d8d083ee 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,19 @@
pkgbase = hadoop
pkgdesc = An open-source software for reliable, scalable, distributed computing
pkgver = 3.3.5
- pkgrel = 1
+ pkgrel = 2
url = https://hadoop.apache.org/
install = hadoop.install
arch = x86_64
- license = apache
+ license = APACHE
makedepends = cmake
- makedepends = gcc
- makedepends = java-environment<=11
+ makedepends = gcc12
+ makedepends = java-environment=11
makedepends = make
makedepends = maven
+ makedepends = pkgconfig
depends = inetutils
- depends = java-runtime-headless-openjdk=11
+ depends = java-runtime-headless=11
depends = openssh
depends = protobuf
conflicts = yarn
diff --git a/PKGBUILD b/PKGBUILD
index 98ad9ba449f5..d424a7c35601 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,14 +4,14 @@
pkgname=hadoop
pkgver=3.3.5
-pkgrel=1
+pkgrel=2
pkgdesc='An open-source software for reliable, scalable, distributed computing'
arch=('x86_64')
url='https://hadoop.apache.org/'
-license=('apache')
+license=('APACHE')
conflicts=('yarn')
-makedepends=('cmake' 'gcc' 'java-environment<=11' 'make' 'maven')
-depends=('inetutils' 'java-runtime-headless-openjdk=11' 'openssh' 'protobuf')
+makedepends=('cmake' 'gcc12' 'java-environment=11' 'make' 'maven' 'pkgconfig')
+depends=('inetutils' 'java-runtime-headless=11' 'openssh' 'protobuf')
source=("https://github.com/apache/hadoop/archive/refs/tags/rel/release-$pkgver.tar.gz"
"${pkgname}" "${pkgname}.sh"
@@ -28,7 +28,10 @@ sha256sums=('004008d5b730253f20b28443c0aa4c38554ee20c58cf954b0512e6453ef91fbf'
install=$pkgname.install
build() {
+ export CC=/usr/bin/gcc-12
+ export CXX=/usr/bin/g++-12
export JAVA_HOME=/usr/lib/jvm/java-11-openjdk
+
cd hadoop-rel-release-${pkgver}
mvn package -Pdist,native \
-Drequire.openssl -Drequire.zstd \
diff --git a/hadoop.install b/hadoop.install
index 477751f66a6c..e152b8395709 100644
--- a/hadoop.install
+++ b/hadoop.install
@@ -12,6 +12,6 @@ pre_remove() {
}
post_remove() {
- userdel hadoop
- rm -rf /var/{lib,log}/hadoop
+ userdel -r hadoop
+ rm -rf /var/log/hadoop
}