Fix PR 31956 causes new --wrap problems

[Nick Clifton]

Hi H.J.

  It seems that your v2 patch for PR 31956 is causing build problems
  for PCP in Fedora Rawhide (BZ 2301454).  At least I have found that
  reverting the patch fixes the PCP build issue.  Could you take a look
  please and see if there is an additional fix that is needed of if the
  v2 patch needs to be removed from upstream.  (Ideally before this
  weekend if possible as I am about to make the 2.43 release...)

  Thanks.

Cheers
  Nick

https://bugzilla.redhat.com/show_bug.cgi?id=2301454

https://sourceware.org/bugzilla/show_bug.cgi?id=31956