summaryrefslogtreecommitdiff
path: root/patches/glibc/2.12.2/140-Fix-combreloc-test-BSD-grep.patch
blob: 530d4ff1569e8f7baf2d899fa74c506ca5583fb8 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
From 61d5f9c09b3157db76bd1a393e248c262a8d9dd4 Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Wed, 8 Mar 2017 14:31:10 -0800
Subject: [PATCH] Fix combreloc test with BSD grep

The test for "-z combreloc" fails when cross-compiling on a machine
that uses BSD grep (e.g. on macos). grep complains about empty
subexpression and exits with non-zero status, which is interpreted
by configure as "not found". As a result, support for "-z combreloc"
(HAVE_Z_COMBRELOC) is not detected, leading to link failure on SPARC.

	* configure.ac: Avoid empty subexpression in grep.

Signed-off-by: Alexey Neyman <stilor@att.net>
---
 ChangeLog    | 5 +++++
 configure    | 2 +-
 configure.ac | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff -urpN glibc-2.12.2.orig/configure glibc-2.12.2/configure
--- glibc-2.12.2.orig/configure	2010-12-13 02:47:26.000000000 -0800
+++ glibc-2.12.2/configure	2017-03-08 21:18:07.000000000 -0800
@@ -6710,7 +6710,7 @@ EOF
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }
   then
-    if readelf -S conftest.so | grep '\.rel\(a\|\)\.dyn' > /dev/null; then
+    if readelf -S conftest.so | grep '\.\(rel\|rela\)\.dyn' > /dev/null; then
       libc_cv_z_combreloc=yes
     else
       libc_cv_z_combreloc=no
diff -urpN glibc-2.12.2.orig/configure.in glibc-2.12.2/configure.in
--- glibc-2.12.2.orig/configure.in	2010-12-13 02:47:26.000000000 -0800
+++ glibc-2.12.2/configure.in	2017-03-08 21:18:17.000000000 -0800
@@ -1671,7 +1671,7 @@ dnl cross-platform since the gcc used ca
 dnl introducing new options this is not easily doable.  Instead use a tool
 dnl which always is cross-platform: readelf.  To detect whether -z combreloc
 dnl look for a section named .rel.dyn.
-    if readelf -S conftest.so | grep '\.rel\(a\|\)\.dyn' > /dev/null; then
+    if readelf -S conftest.so | grep '\.\(rel\|rela\)\.dyn' > /dev/null; then
       libc_cv_z_combreloc=yes
     else
       libc_cv_z_combreloc=no