From 70c84aaf08c81b9239a52dbd611316ee7c2381ce Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mar 01 2022 11:23:09 +0000
Subject: import nvml-1.10.1-2.el9


---

diff --git a/SOURCES/pmdk-1.10.1-use_ddebug_instead_of_debug_cflags.patch b/SOURCES/pmdk-1.10.1-use_ddebug_instead_of_debug_cflags.patch
new file mode 100644
index 0000000..b01e3eb
--- /dev/null
+++ b/SOURCES/pmdk-1.10.1-use_ddebug_instead_of_debug_cflags.patch
@@ -0,0 +1,27 @@
+--- pmdk-1.10.1/src/Makefile.inc.orig	2022-02-01 10:57:54.530694627 -0500
++++ pmdk-1.10.1/src/Makefile.inc	2022-02-01 10:59:19.461777353 -0500
+@@ -67,14 +67,10 @@ DEFAULT_CFLAGS += -DSTRINGOP_TRUNCATION_
+ endif
+ 
+ ifeq ($(DEBUG),1)
+-# Undefine _FORTIFY_SOURCE in case it's set in system-default or
+-# user-defined CFLAGS as it conflicts with -O0.
+-DEBUG_CFLAGS += -Wp,-U_FORTIFY_SOURCE
+-DEBUG_CFLAGS += -O0 -ggdb -DDEBUG
+ LIB_SUBDIR = /pmdk_debug
+ OBJDIR = debug
+ else
+-DEFAULT_CFLAGS += -O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
++DEFAULT_CFLAGS += -O2 -g -D_FORTIFY_SOURCE=2
+ LIB_SUBDIR =
+ OBJDIR = nondebug
+ endif
+@@ -119,7 +115,7 @@ endif
+ CFLAGS += $(EXTRA_CFLAGS)
+ 
+ ifeq ($(DEBUG),1)
+-CFLAGS += $(EXTRA_CFLAGS_DEBUG) $(DEBUG_CFLAGS)
++CFLAGS += $(EXTRA_CFLAGS_DEBUG) -DDEBUG
+ else
+ CFLAGS += $(EXTRA_CFLAGS_RELEASE)
+ endif
diff --git a/SPECS/nvml.spec b/SPECS/nvml.spec
index c47d555..5227a8d 100644
--- a/SPECS/nvml.spec
+++ b/SPECS/nvml.spec
@@ -21,7 +21,7 @@
 
 Name:		nvml
 Version:	1.10.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Persistent Memory Development Kit (formerly NVML)
 License:	BSD
 URL:		http://pmem.io/pmdk
@@ -36,6 +36,7 @@ Source1:	pmdk-%{version}-man.tar.gz
 # but do_open never initializes "attr"
 # may read that object
 Patch0:         Makefile-bypass-check-doc-in-check.patch
+Patch1:         pmdk-1.10.1-use_ddebug_instead_of_debug_cflags.patch
 
 
 BuildRequires:	gcc
@@ -510,6 +511,7 @@ provided in the command line options to check whether files are in a consistent 
 %prep
 %setup -q -n pmdk-%{upstreamversion}
 %patch0 -p1
+%patch1 -p1
 
 
 %build
@@ -592,6 +594,10 @@ mkdir -p %{buildroot}%{_mandir}
 
 
 %changelog
+* Mon Feb 07 2022 Bryan Gurney <bgurney@redhat.com> - 1.10.1-2
+- Use DDEBUG in Makefile.inc instead of DEBUG_CFLAGS
+- Related: rhbz#2044882
+
 * Thu Oct 14 2021 Bryan Gurney <bgurney@redhat.com> - 1.10.1-1
 - Update to PMDK version 1.10.1
 - Related: rhbz#1874208