6f159dfc4f
(Portage version: 2.2.0_alpha41/svn/Linux x86_64, RepoMan options: --force) git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/opsi@2973 6952d904-891a-0410-993b-d76249ca496b
53 lines
1.7 KiB
Diff
53 lines
1.7 KiB
Diff
http://bugs.gentoo.org/309079
|
|
http://lists.gnu.org/archive/html/bug-gzip/2010-02/msg00032.html
|
|
|
|
From 61af16213a488af3a8e994399ebd0859d390edb6 Mon Sep 17 00:00:00 2001
|
|
From: Jim Meyering <meyering@redhat.com>
|
|
Date: Sat, 20 Mar 2010 13:05:58 +0100
|
|
Subject: [PATCH] use assembly code matcher when possible
|
|
|
|
* configure.ac (ASCPPPOST): Backslash-escape "#" in AC_SUBST'd
|
|
variable, to keep make from seeing it as a comment-introducer.
|
|
Based on a patch by Petr Pisar.
|
|
* lib/Makefile.am (match.$(OBJEXT)): Use AM_V_GEN and AM_V_at.
|
|
* lib/match.c: Don't include <config.h>.
|
|
It would impede configure-time assembler test.
|
|
* .x-sc_require_config_h: Exempt lib/match.c from syntax-check.
|
|
* .x-sc_require_config_h_first: Likewise.
|
|
---
|
|
.x-sc_require_config_h | 1 +
|
|
.x-sc_require_config_h_first | 1 +
|
|
THANKS | 1 +
|
|
configure.ac | 2 +-
|
|
lib/Makefile.am | 12 ++++++------
|
|
lib/match.c | 2 --
|
|
6 files changed, 10 insertions(+), 9 deletions(-)
|
|
create mode 100644 .x-sc_require_config_h
|
|
create mode 100644 .x-sc_require_config_h_first
|
|
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -22588,5 +22588,5 @@
|
|
|
|
# cc -E produces incorrect asm files on SVR4, so postprocess it.
|
|
-ASCPPPOST="sed '/^ *#/d; s,//.*,,; s/% /%/g; s/\\. /./g'"
|
|
+ASCPPPOST="sed '/^ *\\#/d; s,//.*,,; s/% /%/g; s/\\. /./g'"
|
|
|
|
|
|
diff --git a/lib/match.c b/lib/match.c
|
|
index 4ef6128..5dd8d64 100644
|
|
--- a/lib/match.c
|
|
+++ b/lib/match.c
|
|
@@ -28,8 +28,6 @@
|
|
* David Mosberger-Tang <davidm@hpl.hp.com>.
|
|
*/
|
|
|
|
-#include <config.h>
|
|
-
|
|
/* Preprocess with -DNO_UNDERLINE if your C compiler does not prefix
|
|
* external symbols with an underline character '_'.
|
|
*/
|
|
--
|
|
1.7.1.1
|
|
|