Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-arch/gzip/files: gzip-1.4-assembler.patch
Date: Sat, 31 Jul 2010 18:03:01
Message-Id: 20100731173258.AA3CD2CF37@corvid.gentoo.org
1 vapier 10/07/31 17:32:58
2
3 Added: gzip-1.4-assembler.patch
4 Log:
5 Add fix from upstream for USE=-pic building on x86 #309079.
6 (Portage version: 2.2_rc67/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 app-arch/gzip/files/gzip-1.4-assembler.patch
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/gzip/files/gzip-1.4-assembler.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/gzip/files/gzip-1.4-assembler.patch?rev=1.1&content-type=text/plain
13
14 Index: gzip-1.4-assembler.patch
15 ===================================================================
16 http://bugs.gentoo.org/309079
17 http://lists.gnu.org/archive/html/bug-gzip/2010-02/msg00032.html
18
19 From 61af16213a488af3a8e994399ebd0859d390edb6 Mon Sep 17 00:00:00 2001
20 From: Jim Meyering <meyering@××××××.com>
21 Date: Sat, 20 Mar 2010 13:05:58 +0100
22 Subject: [PATCH] use assembly code matcher when possible
23
24 * configure.ac (ASCPPPOST): Backslash-escape "#" in AC_SUBST'd
25 variable, to keep make from seeing it as a comment-introducer.
26 Based on a patch by Petr Pisar.
27 * lib/Makefile.am (match.$(OBJEXT)): Use AM_V_GEN and AM_V_at.
28 * lib/match.c: Don't include <config.h>.
29 It would impede configure-time assembler test.
30 * .x-sc_require_config_h: Exempt lib/match.c from syntax-check.
31 * .x-sc_require_config_h_first: Likewise.
32 ---
33 .x-sc_require_config_h | 1 +
34 .x-sc_require_config_h_first | 1 +
35 THANKS | 1 +
36 configure.ac | 2 +-
37 lib/Makefile.am | 12 ++++++------
38 lib/match.c | 2 --
39 6 files changed, 10 insertions(+), 9 deletions(-)
40 create mode 100644 .x-sc_require_config_h
41 create mode 100644 .x-sc_require_config_h_first
42
43 --- a/configure
44 +++ b/configure
45 @@ -22588,5 +22588,5 @@
46
47 # cc -E produces incorrect asm files on SVR4, so postprocess it.
48 -ASCPPPOST="sed '/^ *#/d; s,//.*,,; s/% /%/g; s/\\. /./g'"
49 +ASCPPPOST="sed '/^ *\\#/d; s,//.*,,; s/% /%/g; s/\\. /./g'"
50
51
52 diff --git a/lib/match.c b/lib/match.c
53 index 4ef6128..5dd8d64 100644
54 --- a/lib/match.c
55 +++ b/lib/match.c
56 @@ -28,8 +28,6 @@
57 * David Mosberger-Tang <davidm@××××××.com>.
58 */
59
60 -#include <config.h>
61 -
62 /* Preprocess with -DNO_UNDERLINE if your C compiler does not prefix
63 * external symbols with an underline character '_'.
64 */
65 --
66 1.7.1.1