[2.23] Desupport regexp.h (bug 18681)

Message ID CAKCAbMhzyp8gTcn073+a7R7Hgz3t=ntYKouWH-AfhWPr8OnQqQ@mail.gmail.com
State Committed
Headers

Commit Message

Zack Weinberg Aug. 17, 2015, 2:37 p.m. UTC
  Do you mean like this?  I can't test it as the problem is invisible to me.
  

Comments

Andreas Schwab Aug. 17, 2015, 2:51 p.m. UTC | #1
Zack Weinberg <zackw@panix.com> writes:

> Do you mean like this?  I can't test it as the problem is invisible to me.

Are you building from a clean tree?

Andreas.
  
Zack Weinberg Aug. 17, 2015, 3:08 p.m. UTC | #2
On Mon, Aug 17, 2015 at 10:51 AM, Andreas Schwab <schwab@suse.de> wrote:
> Zack Weinberg <zackw@panix.com> writes:
>
>> Do you mean like this?  I can't test it as the problem is invisible to me.
>
> Are you building from a clean tree?

Yes, I have erased the entire build directory and re-run configure
several times during testing of this patch. It didn't compile till
Carlos cut the 2.22 branch but then it magically started working, so I
assumed that the release process did whatever was necessary.

Just now I did this again and also ran `git clean -dxf` in the source
tree (which deleted only editor backups) and -- this is a little weird
-- it compiles without complaint, but the VERSION_libc_GLIBC_2_xx
#defines in abi-versions.h only go up to 2_22.

I'm using gcc 5.2 (because Debian's 4.9 refused to compile the library
last month, with errors I didn't bother digging into), is that
possibly relevant?

zw
  

Patch

diff --git a/misc/Versions b/misc/Versions
index 534d1a3..178bb76 100644
--- a/misc/Versions
+++ b/misc/Versions
@@ -149,6 +149,9 @@  libc {
   GLIBC_2.16 {
     __getauxval; getauxval;
   }
+  GLIBC_2.23 {
+    # stub for SHLIB_COMPAT(GLIBC_2_0, GLIBC_2_23) in regexp.c
+  }
   GLIBC_PRIVATE {
     __madvise;
     __mktemp;