Revert "gzip: update to latest stable"

This reverts commit 8bc7c957f81c7783fb502649df90a85ec2bcd616

Upgrading gzip broke the tree because it accidentally caused
gzip to no longer be included in the chroot.

BUG=chromium-os:29828
TEST=Remote trybot run.

Change-Id: Icc27b38414dbabb3714998ef310472b7a9823b45
Reviewed-on: https://gerrit.chromium.org/gerrit/20803
Reviewed-by: Peter Mayo <petermayo@chromium.org>
Tested-by: David James <davidjames@chromium.org>
This commit is contained in:
David James 2012-04-21 11:32:58 -07:00
parent 673fe072de
commit d87e85979a
3 changed files with 5 additions and 56 deletions

View File

@ -1,52 +0,0 @@
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

View File

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/gzip-1.4.ebuild,v 1.8 2011/04/03 11:15:56 ulm Exp $
# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/gzip-1.4.ebuild,v 1.6 2010/02/11 19:19:32 armin76 Exp $
inherit eutils flag-o-matic
@ -18,13 +18,13 @@ IUSE="nls pic static"
RDEPEND=""
DEPEND="${RDEPEND}
nls? ( sys-devel/gettext )"
PROVIDE="virtual/gzip"
src_unpack() {
unpack ${A}
cd "${S}"
#epatch "${FILESDIR}"/${PN}-1.3.5-rsync.patch
epatch "${FILESDIR}"/${PN}-1.3.8-install-symlinks.patch
epatch "${FILESDIR}"/${P}-assembler.patch #309079
}
src_compile() {

View File

@ -5,7 +5,8 @@ HOMEPAGE=http://www.gnu.org/software/gzip/
IUSE=nls pic static
KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
LICENSE=GPL-2
PROVIDE=virtual/gzip
SLOT=0
SRC_URI=ftp://alpha.gnu.org/gnu/gzip/gzip-1.4.tar.gz mirror://gnu/gzip/gzip-1.4.tar.gz mirror://gentoo/gzip-1.4.tar.gz
_eclasses_=eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 6526ac6fc9aedf391efb91fcd75ace68 user 9e552f935106ff0bc92af16da64b4b29
_md5_=61a63417b952511ea8330b642bf392ad
_md5_=f1ead9a00882a433ffc044baddfe7928