mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-29 17:41:05 +02:00
Upgraded the pbzip2 Portage package
Upgraded app-arch/pbzip2 to version 1.1.6 on amd64 BUG=chromium-os:32593 TEST=Remote trybot runs on all architectures. Change-Id: Ic6f0b62fa1b7a8fd9ff5bf90c39b1e975b5cc19c Reviewed-on: https://gerrit.chromium.org/gerrit/27454 Tested-by: David James <davidjames@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org> Commit-Ready: David James <davidjames@chromium.org>
This commit is contained in:
parent
8051409928
commit
009a221597
1
sdk_container/src/third_party/portage-stable/app-arch/pbzip2/Manifest
vendored
Normal file
1
sdk_container/src/third_party/portage-stable/app-arch/pbzip2/Manifest
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
DIST pbzip2-1.1.6.tar.gz 54982 RMD160 179b548c72f63555a6d51d9d3bd86e3ab002e6a6 SHA1 3b4d0ffa3ac362c3702793cc5d9e61664d468aeb SHA256 86bd6d58e5a6c13cf8c709620ebfe186fca423c2724225bb30431fa7a453aee2
|
62
sdk_container/src/third_party/portage-stable/app-arch/pbzip2/files/pbzip2-1.1.6-makefile.patch
vendored
Normal file
62
sdk_container/src/third_party/portage-stable/app-arch/pbzip2/files/pbzip2-1.1.6-makefile.patch
vendored
Normal file
@ -0,0 +1,62 @@
|
|||||||
|
--- Makefile.orig 2011-02-21 00:17:16.334746748 +0200
|
||||||
|
+++ Makefile 2011-02-21 00:19:16.504881112 +0200
|
||||||
|
@@ -2,8 +2,6 @@
|
||||||
|
SHELL = /bin/sh
|
||||||
|
|
||||||
|
# Compiler to use
|
||||||
|
-CC = g++
|
||||||
|
-CFLAGS = -O2
|
||||||
|
#CFLAGS += -g -Wall
|
||||||
|
#CFLAGS += -ansi
|
||||||
|
#CFLAGS += -pedantic
|
||||||
|
@@ -12,7 +10,7 @@
|
||||||
|
# Comment out CFLAGS line below for compatability mode for 32bit file sizes
|
||||||
|
# (less than 2GB) and systems that have compilers that treat int as 64bit
|
||||||
|
# natively (ie: modern AIX)
|
||||||
|
-CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
|
||||||
|
+CXXFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
|
||||||
|
|
||||||
|
# Uncomment CFLAGS line below if you want to compile pbzip2 without load
|
||||||
|
# average support for systems that do not support it
|
||||||
|
@@ -22,10 +20,10 @@
|
||||||
|
#CFLAGS += -DPBZIP_DEBUG
|
||||||
|
|
||||||
|
# Comment out CFLAGS line below to disable pthread semantics in code
|
||||||
|
-CFLAGS += -D_POSIX_PTHREAD_SEMANTICS
|
||||||
|
+CXXFLAGS += -D_POSIX_PTHREAD_SEMANTICS
|
||||||
|
|
||||||
|
# Comment out CFLAGS line below to disable Thread stack size customization
|
||||||
|
-CFLAGS += -DUSE_STACKSIZE_CUSTOMIZATION
|
||||||
|
+CXXFLAGS += -DUSE_STACKSIZE_CUSTOMIZATION
|
||||||
|
|
||||||
|
# Comment out CFLAGS line below to explicity set ignore trailing garbage
|
||||||
|
# default behavior: 0 - disabled; 1 - enabled (ignore garbage by default)
|
||||||
|
@@ -34,11 +32,11 @@
|
||||||
|
#CFLAGS += -DIGNORE_TRAILING_GARBAGE=1
|
||||||
|
|
||||||
|
# On some compilers -pthreads
|
||||||
|
-CFLAGS += -pthread
|
||||||
|
+CXXFLAGS += -pthread
|
||||||
|
|
||||||
|
# External libraries
|
||||||
|
-LDFLAGS = -lbz2
|
||||||
|
-LDFLAGS += -lpthread
|
||||||
|
+LIBS = -lbz2
|
||||||
|
+LIBS += -lpthread
|
||||||
|
|
||||||
|
# Where you want pbzip2 installed when you do 'make install'
|
||||||
|
PREFIX = /usr
|
||||||
|
@@ -47,11 +45,11 @@
|
||||||
|
|
||||||
|
# Standard pbzip2 compile
|
||||||
|
pbzip2: pbzip2.cpp BZ2StreamScanner.cpp ErrorContext.cpp
|
||||||
|
- $(CC) $(CFLAGS) $^ -o pbzip2 $(LDFLAGS)
|
||||||
|
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $^ $(LIBS) -o pbzip2
|
||||||
|
|
||||||
|
# Choose this if you want to compile in a static version of the libbz2 library
|
||||||
|
pbzip2-static: pbzip2.cpp BZ2StreamScanner.cpp ErrorContext.cpp libbz2.a
|
||||||
|
- $(CC) $(CFLAGS) $^ -o pbzip2 -I. -L. $(LDFLAGS)
|
||||||
|
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $^ $(LIBS) -o pbzip2 -I. -L.
|
||||||
|
|
||||||
|
# Install the binary pbzip2 program and man page
|
||||||
|
install: pbzip2
|
39
sdk_container/src/third_party/portage-stable/app-arch/pbzip2/pbzip2-1.1.6.ebuild
vendored
Normal file
39
sdk_container/src/third_party/portage-stable/app-arch/pbzip2/pbzip2-1.1.6.ebuild
vendored
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
# Copyright 1999-2011 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/pbzip2-1.1.6.ebuild,v 1.1 2011/11/02 16:13:47 vapier Exp $
|
||||||
|
|
||||||
|
EAPI=4
|
||||||
|
|
||||||
|
inherit flag-o-matic eutils
|
||||||
|
|
||||||
|
DESCRIPTION="Parallel bzip2 (de)compressor using libbz2"
|
||||||
|
HOMEPAGE="http://compression.ca/pbzip2/"
|
||||||
|
SRC_URI="http://compression.ca/${PN}/${P}.tar.gz"
|
||||||
|
|
||||||
|
LICENSE="PBZIP2"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
|
||||||
|
IUSE="static symlink"
|
||||||
|
|
||||||
|
DEPEND="app-arch/bzip2"
|
||||||
|
RDEPEND="${DEPEND}"
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
epatch "${FILESDIR}"/${PN}-1.1.6-makefile.patch
|
||||||
|
tc-export CXX
|
||||||
|
use static && append-ldflags -static
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
dobin pbzip2
|
||||||
|
dodoc AUTHORS ChangeLog README
|
||||||
|
doman pbzip2.1
|
||||||
|
dosym pbzip2 /usr/bin/pbunzip2
|
||||||
|
|
||||||
|
if use symlink ; then
|
||||||
|
local s
|
||||||
|
for s in bzip2 bunzip2 bzcat ; do
|
||||||
|
dosym pbzip2 /usr/bin/${s}
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
}
|
13
sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/pbzip2-1.1.6
vendored
Normal file
13
sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/pbzip2-1.1.6
vendored
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
DEFINED_PHASES=install prepare
|
||||||
|
DEPEND=app-arch/bzip2
|
||||||
|
DESCRIPTION=Parallel bzip2 (de)compressor using libbz2
|
||||||
|
EAPI=4
|
||||||
|
HOMEPAGE=http://compression.ca/pbzip2/
|
||||||
|
IUSE=static symlink
|
||||||
|
KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
|
||||||
|
LICENSE=PBZIP2
|
||||||
|
RDEPEND=app-arch/bzip2
|
||||||
|
SLOT=0
|
||||||
|
SRC_URI=http://compression.ca/pbzip2/pbzip2-1.1.6.tar.gz
|
||||||
|
_eclasses_=eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 6526ac6fc9aedf391efb91fcd75ace68 user 9e552f935106ff0bc92af16da64b4b29
|
||||||
|
_md5_=7d82437c1e404823da46a7aaec6eab4a
|
Loading…
x
Reference in New Issue
Block a user