From fec85721c3d45455e0fd6f5fa962bc7efa2dc602 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= <asm@redhat.com>
Date: Tue, 23 Jan 2024 13:36:21 +0100
Subject: [PATCH] Rebase to 1.21.2

Add support for ppc64le and aarch64
Enable the test suite
Resolves: RHEL-22429
---
 .gitignore |  1 +
 delve.spec | 28 +++++++++++++++++++---------
 sources    |  2 +-
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 01348a9..f9910ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /delve-1.8.3.tar.gz
 /delve-1.9.1.tar.gz
 /delve-1.20.2.tar.gz
+/delve-1.21.2.tar.gz
diff --git a/delve.spec b/delve.spec
index f320755..7819e7a 100644
--- a/delve.spec
+++ b/delve.spec
@@ -1,5 +1,5 @@
 Name:                   delve
-Version:                1.20.2
+Version:                1.21.2
 Release:                1%{?dist}
 Summary:                A debugger for the Go programming language
 
@@ -7,7 +7,7 @@ License:                MIT
 URL:                    https://github.com/go-delve/delve
 Source0:                https://github.com/go-delve/delve/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
-ExcludeArch:            ppc64le s390x aarch64 %{ix86} armv7hl
+ExcludeArch:            s390x %{ix86} armv7hl
 
 BuildRequires:          compiler(go-compiler)
 BuildRequires:          git
@@ -38,7 +38,11 @@ mv %{_builddir}/src %{_builddir}/%{name}-%{version}/_build/src
 %build
 export GO111MODULE=off
 export GOPATH="%{_builddir}/%{name}-%{version}/_build"
+%ifarch ppc64le
+%gobuild '-tags=exp.linuxppc64le' -o bin/dlv github.com/go-delve/delve/cmd/dlv
+%else
 %gobuild -o bin/dlv github.com/go-delve/delve/cmd/dlv
+%endif
 
 
 %install
@@ -48,13 +52,13 @@ install -Dpm 0755 bin/dlv %{buildroot}%{_bindir}/dlv
 
 
 %check
-## Related: rhbz#1922455
-# export GO111MODULE=off
-# export GOPATH="%{_builddir}/%{name}-%{version}/_build"
-# cd "_build/src/github.com/go-delve/%{name}"
-# for d in $(go list ./... | grep -v cmd | grep -v scripts); do
-#     go test ${d}
-# done
+# Related: rhbz#1922455
+export GO111MODULE=off
+export GOPATH="%{_builddir}/%{name}-%{version}/_build"
+cd "_build/src/github.com/go-delve/%{name}"
+for d in $(go list ./... | grep -v cmd | grep -v scripts); do
+    go test ${d}
+done
 
 
 %files
@@ -65,6 +69,12 @@ install -Dpm 0755 bin/dlv %{buildroot}%{_bindir}/dlv
 
 
 %changelog
+* Tue Jan 23 2024 Alejandro Sáez <asm@redhat.com> - 1.21.2-1
+- Rebase to 1.21.2
+- Add support for ppc64le and aarch64
+- Enable the test suite
+- Resolves: RHEL-22429
+
 * Fri May 26 2023 Alejandro Sáez <asm@redhat.com> - 1.20.2-1
 - Rebase to 1.20.2
 - Resolves: rhbz#2186496
diff --git a/sources b/sources
index fa13bed..9a49de1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (delve-1.20.2.tar.gz) = c48027d200257d0a979fbf2ea3a65f6dc645d1c231264023b10c216de1e3d80db86ac775cdb02f4dcd261756c8e26bbdce598cce709eb2aa4c9853f2e0cf6cf8
+SHA512 (delve-1.21.2.tar.gz) = 78953099b1ba79d04136b037d1fd45dc2f9013428a9eed77bb0bba7c43a00370d701d0576e9c1367e5e45f236ceb4bcdfc1c3366db95999dbe9e758e54225541