From 8264c2101f12599721221a92bc7f2eeeba9649dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 13 Sep 2020 10:30:21 +0700
Subject: [PATCH] elfutils: update to 0.181.

sgn: There are some test failure due to the order of output.
Close: #24861
---
 .../elfutils/patches/fix-uninitialized.patch  |  6 -----
 srcpkgs/elfutils/patches/musl-cdefs.patch     |  2 +-
 srcpkgs/elfutils/patches/musl-macros.patch    | 13 +++++++++
 srcpkgs/elfutils/template                     | 27 ++++++++-----------
 4 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/srcpkgs/elfutils/patches/fix-uninitialized.patch b/srcpkgs/elfutils/patches/fix-uninitialized.patch
index 5c9efbc8dcb..6ab15e50e2b 100644
--- a/srcpkgs/elfutils/patches/fix-uninitialized.patch
+++ b/srcpkgs/elfutils/patches/fix-uninitialized.patch
@@ -1,12 +1,6 @@
 
 --- libcpu/i386_disasm.c	2015-08-21 14:22:37.000000000 +0200
 +++ libcpu/i386_disasm.c	2015-11-20 06:30:59.250629957 +0100
-@@ -1,4 +1,4 @@
--/* Disassembler for x86.
-+/* Disassembler for x86.
-    Copyright (C) 2007, 2008, 2009, 2011 Red Hat, Inc.
-    This file is part of elfutils.
-    Written by Ulrich Drepper <drepper@redhat.com>, 2007.
 @@ -710,6 +710,7 @@
  
  		case 'm':
diff --git a/srcpkgs/elfutils/patches/musl-cdefs.patch b/srcpkgs/elfutils/patches/musl-cdefs.patch
index 439794df3b6..65ef9f4d23c 100644
--- a/srcpkgs/elfutils/patches/musl-cdefs.patch
+++ b/srcpkgs/elfutils/patches/musl-cdefs.patch
@@ -4,7 +4,7 @@
  
  #include <features.h>
  
-+#if !defined(__GLIBC__)
++#if !defined(__BEGIN_DECLS)
 +/* C++ needs to know that types and declarations are C, not C++.  */
 +#ifdef  __cplusplus
 +# define __BEGIN_DECLS  extern "C" {
diff --git a/srcpkgs/elfutils/patches/musl-macros.patch b/srcpkgs/elfutils/patches/musl-macros.patch
index b4ae5e3c3da..8ce586b2930 100644
--- a/srcpkgs/elfutils/patches/musl-macros.patch
+++ b/srcpkgs/elfutils/patches/musl-macros.patch
@@ -51,3 +51,16 @@
  typedef uint8_t GElf_Byte;
  
  /* Name and version of program.  */
+--- tests/elfstrmerge.c.orig	2020-09-13 08:20:50.538492600 +0700
++++ tests/elfstrmerge.c	2020-09-13 08:21:40.205734827 +0700
+@@ -33,6 +33,10 @@
+ #include ELFUTILS_HEADER(dwelf)
+ #include "elf-knowledge.h"
+ 
++#if !defined(ALLPERMS)
++# define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO) /* 07777 */
++#endif
++
+ /* The original ELF file.  */
+ static int fd = -1;
+ static Elf *elf = NULL;
diff --git a/srcpkgs/elfutils/template b/srcpkgs/elfutils/template
index bac9453f757..02e6e20c64b 100644
--- a/srcpkgs/elfutils/template
+++ b/srcpkgs/elfutils/template
@@ -1,9 +1,9 @@
 # Template file for 'elfutils'
 pkgname=elfutils
-version=0.180
-revision=4
+version=0.181
+revision=1
 build_style=gnu-configure
-configure_args="--program-prefix=eu- --disable-debuginfod"
+configure_args="--program-prefix=eu- --disable-debuginfod --disable-libdebuginfod"
 hostmakedepends="automake libtool pkg-config"
 makedepends="bzip2-devel liblzma-devel zlib-devel"
 short_desc="Utilities to handle ELF object files"
@@ -11,24 +11,19 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://sourceware.org/elfutils/"
 distfiles="https://sourceware.org/${pkgname}/ftp/${version}/${pkgname}-${version}.tar.bz2"
-checksum=b827b6e35c59d188ba97d7cf148fa8dc6f5c68eb6c5981888dfdbb758c0b569d
+checksum=29a6ad7421ec2acfee489bb4a699908281ead2cb63a20a027ce8804a165f0eb3
 
-CFLAGS="-Wno-error -Wno-error=null-dereference"
+CFLAGS="-Wno-error"
 
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) makedepends+=" argp-standalone musl-fts-devel musl-obstack-devel" ;;
-esac
-
-if [ "$CROSS_BUILD" ]; then
-	# kernel headers in our cross-* packages are too old (need >= 4.1)
-	CFLAGS+=" -DBPF_PSEUDO_MAP_FD=1"
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	makedepends+=" argp-standalone musl-fts-devel musl-obstack-devel"
 fi
 
 post_extract() {
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl) cp ${FILESDIR}/error.h lib
-			cp ${FILESDIR}/error.h src
-	esac
+	if [ "$XBPS_TARGET_LIBC" = musl ]; then
+		cp ${FILESDIR}/error.h lib
+		cp ${FILESDIR}/error.h src
+	fi
 }
 
 pre_configure() {