mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-12 07:26:58 +02:00
libpcre, libyaml: upgraded packages to upstream
Upgraded dev-libs/libpcre to version 8.30-r2 on amd64, arm, x86 Upgraded dev-libs/libyaml to version 0.1.4 on amd64, arm, x86 BUG=chromium-os:32210, chromium-os:31321 TEST=Trybots on all architectures. Change-Id: I1da2ad3383a34e8afd67a48c1d728cff34ef521d Reviewed-on: https://gerrit.chromium.org/gerrit/37315 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:
David James
Gerrit
parent
c57af1d5be
commit
fa12b91bda
@ -1 +1 @@
|
|||||||
DIST pcre-8.12.tar.bz2 992502 RMD160 ec7978604cdf92d8dbd98e0d0c360fe35eb62021 SHA1 2219b372bff53ee29a7e44ecf5977ad15df01cea SHA256 c63070d461edc451ec9457f2324e152a531e907d5c5d2d8f8121e725acd1aeec
|
DIST pcre-8.30.tar.bz2 1248556 RMD160 bddee68c7e2b8b8224a835a2a9cdadc6b7cc9fd2 SHA1 68d28fb383325b8af9e3d481d30f586b46c56022 SHA256 c1113fd7db934e97ad8b3917d432e5b642e9eb9afd127eb797804937c965f4ac
|
||||||
|
|||||||
@ -0,0 +1,26 @@
|
|||||||
|
https://bugs.gentoo.org/418033
|
||||||
|
|
||||||
|
fix building when zlib is disabled but bzip2 is enabled
|
||||||
|
|
||||||
|
patch by Richard Grenville <pyxlcy@gmail.com>
|
||||||
|
|
||||||
|
--- a/pcregrep.c (revision 970)
|
||||||
|
+++ b/pcregrep.c (working copy)
|
||||||
|
@@ -1618,7 +1618,7 @@ gzFile ingz = NULL;
|
||||||
|
BZFILE *inbz2 = NULL;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
-#if defined SUPPORT_LIBZ || defined SUPPORT_LIBZ2
|
||||||
|
+#if defined SUPPORT_LIBZ || defined SUPPORT_LIBBZ2
|
||||||
|
int pathlen;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
@@ -1701,7 +1701,7 @@ skipping was not requested. The scan pro
|
||||||
|
argument at top level, we don't show the file name, unless we are only showing
|
||||||
|
the file name, or the filename was forced (-H). */
|
||||||
|
|
||||||
|
-#if defined SUPPORT_LIBZ || defined SUPPORT_LIBZ2
|
||||||
|
+#if defined SUPPORT_LIBZ || defined SUPPORT_LIBBZ2
|
||||||
|
pathlen = (int)(strlen(pathname));
|
||||||
|
#endif
|
||||||
|
|
||||||
@ -1,56 +0,0 @@
|
|||||||
# Copyright 1999-2011 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-8.12.ebuild,v 1.6 2011/04/05 05:16:42 maekke Exp $
|
|
||||||
|
|
||||||
EAPI=2
|
|
||||||
|
|
||||||
inherit libtool eutils toolchain-funcs
|
|
||||||
|
|
||||||
DESCRIPTION="Perl-compatible regular expression library"
|
|
||||||
HOMEPAGE="http://www.pcre.org/"
|
|
||||||
if [[ ${PV} == ${PV/_rc} ]]
|
|
||||||
then
|
|
||||||
MY_P="pcre-${PV}"
|
|
||||||
# Only the final releases are available here.
|
|
||||||
SRC_URI="mirror://sourceforge/pcre/${MY_P}.tar.bz2
|
|
||||||
ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${MY_P}.tar.bz2"
|
|
||||||
else
|
|
||||||
MY_P="pcre-${PV/_rc/-RC}"
|
|
||||||
SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Testing/${MY_P}.tar.bz2"
|
|
||||||
fi
|
|
||||||
LICENSE="BSD"
|
|
||||||
SLOT="3"
|
|
||||||
KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
|
|
||||||
IUSE="bzip2 +cxx unicode zlib static-libs +recursion-limit"
|
|
||||||
|
|
||||||
RDEPEND="bzip2? ( app-arch/bzip2 )
|
|
||||||
zlib? ( sys-libs/zlib )"
|
|
||||||
DEPEND="${RDEPEND}
|
|
||||||
dev-util/pkgconfig
|
|
||||||
userland_GNU? ( >=sys-apps/findutils-4.4.0 )"
|
|
||||||
|
|
||||||
S=${WORKDIR}/${MY_P}
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
sed -i -e "s:-lpcre ::" libpcrecpp.pc.in || die "Fixing libpcrecpp pkgconfig files failed"
|
|
||||||
elibtoolize
|
|
||||||
}
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
econf --with-match-limit-recursion=$(use recursion-limit && echo 8192 || echo MATCH_LIMIT) \
|
|
||||||
$(use_enable unicode utf8) $(use_enable unicode unicode-properties) \
|
|
||||||
$(use_enable cxx cpp) \
|
|
||||||
$(use_enable zlib pcregrep-libz) \
|
|
||||||
$(use_enable bzip2 pcregrep-libbz2) \
|
|
||||||
$(use_enable static-libs static) \
|
|
||||||
--enable-shared \
|
|
||||||
--htmldir=/usr/share/doc/${PF}/html \
|
|
||||||
--docdir=/usr/share/doc/${PF} \
|
|
||||||
|| die "econf failed"
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
emake DESTDIR="${D}" install || die "make install failed"
|
|
||||||
gen_usr_ldscript -a pcre
|
|
||||||
find "${D}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
|
|
||||||
}
|
|
||||||
70
sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.30-r2.ebuild
vendored
Normal file
70
sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.30-r2.ebuild
vendored
Normal file
@ -0,0 +1,70 @@
|
|||||||
|
# Copyright 1999-2012 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-8.30-r2.ebuild,v 1.13 2012/07/08 18:32:01 armin76 Exp $
|
||||||
|
|
||||||
|
EAPI="4"
|
||||||
|
|
||||||
|
inherit eutils multilib libtool flag-o-matic toolchain-funcs
|
||||||
|
|
||||||
|
DESCRIPTION="Perl-compatible regular expression library"
|
||||||
|
HOMEPAGE="http://www.pcre.org/"
|
||||||
|
MY_P="pcre-${PV/_rc/-RC}"
|
||||||
|
if [[ ${PV} != *_rc* ]] ; then
|
||||||
|
# Only the final releases are available here.
|
||||||
|
SRC_URI="mirror://sourceforge/pcre/${MY_P}.tar.bz2
|
||||||
|
ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${MY_P}.tar.bz2"
|
||||||
|
else
|
||||||
|
SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Testing/${MY_P}.tar.bz2"
|
||||||
|
fi
|
||||||
|
|
||||||
|
LICENSE="BSD"
|
||||||
|
SLOT="3"
|
||||||
|
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||||
|
IUSE="bzip2 +cxx +jit pcre16 +readline +recursion-limit static-libs unicode zlib"
|
||||||
|
|
||||||
|
RDEPEND="bzip2? ( app-arch/bzip2 )
|
||||||
|
zlib? ( sys-libs/zlib )
|
||||||
|
readline? ( sys-libs/readline )"
|
||||||
|
DEPEND="${RDEPEND}
|
||||||
|
virtual/pkgconfig
|
||||||
|
userland_GNU? ( >=sys-apps/findutils-4.4.0 )"
|
||||||
|
|
||||||
|
S=${WORKDIR}/${MY_P}
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
sed -i -e "s:-lpcre ::" libpcrecpp.pc.in || die
|
||||||
|
epatch "${FILESDIR}"/${P}-bzip2-typo.patch #418033
|
||||||
|
elibtoolize
|
||||||
|
}
|
||||||
|
|
||||||
|
src_configure() {
|
||||||
|
[[ ${CHOST} == *-mint* ]] && append-flags -D_GNU_SOURCE
|
||||||
|
econf \
|
||||||
|
--with-match-limit-recursion=$(usex recursion-limit 8192 MATCH_LIMIT) \
|
||||||
|
$(use_enable bzip2 pcregrep-libbz2) \
|
||||||
|
$(use_enable cxx cpp) \
|
||||||
|
$(use_enable jit) $(use_enable jit pcregrep-jit) \
|
||||||
|
$(use_enable pcre16) \
|
||||||
|
$(use_enable readline pcretest-libreadline) \
|
||||||
|
$(use_enable static-libs static) \
|
||||||
|
$(use_enable unicode utf) $(use_enable unicode unicode-properties) \
|
||||||
|
$(use_enable zlib pcregrep-libz) \
|
||||||
|
--enable-pcre8 \
|
||||||
|
--enable-shared \
|
||||||
|
--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
|
||||||
|
--docdir="${EPREFIX}"/usr/share/doc/${PF}
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
emake DESTDIR="${D}" install
|
||||||
|
gen_usr_ldscript -a pcre
|
||||||
|
find "${D}" -type f -name '*.la' -exec rm -f {} +
|
||||||
|
}
|
||||||
|
|
||||||
|
pkg_preinst() {
|
||||||
|
preserve_old_lib /$(get_libdir)/libpcre.so.0
|
||||||
|
}
|
||||||
|
|
||||||
|
pkg_postinst() {
|
||||||
|
preserve_old_lib_notify /$(get_libdir)/libpcre.so.0
|
||||||
|
}
|
||||||
@ -1 +1 @@
|
|||||||
DIST yaml-0.1.2.tar.gz 460685 RMD160 7da49975832132205efa0a96e1789e48ac341115 SHA1 db151c273474bb0b76b17974e7625d094c8cce53 SHA256 5beb94529cc7ac79b17e354f9b03aea311f5af17be5d48bc39e6f1db5059f70f
|
DIST yaml-0.1.4.tar.gz 471759 RMD160 5051545022ffa4c78e63fed6f3af30f90e931497 SHA1 e0e5e09192ab10a607e3da2970db492118f560f2 SHA256 7bf81554ae5ab2d9b6977da398ea789722e0db75b86bffdaeb4e66d961de6a37
|
||||||
|
|||||||
@ -1,8 +1,10 @@
|
|||||||
# Copyright 1999-2010 Gentoo Foundation
|
# Copyright 1999-2012 Gentoo Foundation
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libyaml/libyaml-0.1.2.ebuild,v 1.8 2010/01/14 21:39:14 fauli Exp $
|
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libyaml/libyaml-0.1.4.ebuild,v 1.10 2012/07/27 12:36:56 grobian Exp $
|
||||||
|
|
||||||
inherit eutils
|
EAPI=4
|
||||||
|
|
||||||
|
inherit eutils autotools-utils
|
||||||
|
|
||||||
MY_P="${P/lib}"
|
MY_P="${P/lib}"
|
||||||
|
|
||||||
@ -12,25 +14,25 @@ SRC_URI="http://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
|
|||||||
|
|
||||||
LICENSE="MIT"
|
LICENSE="MIT"
|
||||||
SLOT="0"
|
SLOT="0"
|
||||||
KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-linux ~x86-macos"
|
KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||||
IUSE="doc examples test"
|
IUSE="doc examples test static-libs"
|
||||||
|
|
||||||
S="${WORKDIR}/${MY_P}"
|
S="${WORKDIR}/${MY_P}"
|
||||||
|
|
||||||
src_unpack() {
|
DOCS="README"
|
||||||
unpack ${A}
|
|
||||||
cd "${S}"
|
src_prepare() {
|
||||||
# conditionally remove tests
|
# conditionally remove tests
|
||||||
if use test ; then
|
if use test; then
|
||||||
sed -i -e 's: tests::g' Makefile*
|
sed -i -e 's: tests::g' Makefile*
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
src_install() {
|
src_install() {
|
||||||
emake DESTDIR="${D}" install || die "emake install failed"
|
autotools-utils_src_install
|
||||||
use doc && dohtml -r doc/html/.
|
use doc && dohtml -r doc/html/.
|
||||||
dodoc README
|
|
||||||
if use examples ; then
|
if use examples ; then
|
||||||
|
docompress -x /usr/share/doc/${PF}/examples
|
||||||
insinto /usr/share/doc/${PF}/examples
|
insinto /usr/share/doc/${PF}/examples
|
||||||
doins tests/example-*.c
|
doins tests/example-*.c
|
||||||
fi
|
fi
|
||||||
@ -1,13 +0,0 @@
|
|||||||
DEFINED_PHASES=configure install prepare
|
|
||||||
DEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) dev-util/pkgconfig userland_GNU? ( >=sys-apps/findutils-4.4.0 )
|
|
||||||
DESCRIPTION=Perl-compatible regular expression library
|
|
||||||
EAPI=2
|
|
||||||
HOMEPAGE=http://www.pcre.org/
|
|
||||||
IUSE=bzip2 +cxx unicode zlib static-libs +recursion-limit
|
|
||||||
KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd
|
|
||||||
LICENSE=BSD
|
|
||||||
RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib )
|
|
||||||
SLOT=3
|
|
||||||
SRC_URI=mirror://sourceforge/pcre/pcre-8.12.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.12.tar.bz2
|
|
||||||
_eclasses_=eutils 33ef77a15337022e05342d2c772a7a5a libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 6526ac6fc9aedf391efb91fcd75ace68 user 9e552f935106ff0bc92af16da64b4b29
|
|
||||||
_md5_=13e6bad9e27980630173f358b4161eb6
|
|
||||||
13
sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libpcre-8.30-r2
vendored
Normal file
13
sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libpcre-8.30-r2
vendored
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
DEFINED_PHASES=configure install postinst preinst prepare
|
||||||
|
DEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) readline? ( sys-libs/readline ) virtual/pkgconfig userland_GNU? ( >=sys-apps/findutils-4.4.0 )
|
||||||
|
DESCRIPTION=Perl-compatible regular expression library
|
||||||
|
EAPI=4
|
||||||
|
HOMEPAGE=http://www.pcre.org/
|
||||||
|
IUSE=bzip2 +cxx +jit pcre16 +readline +recursion-limit static-libs unicode zlib
|
||||||
|
KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
|
||||||
|
LICENSE=BSD
|
||||||
|
RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) readline? ( sys-libs/readline )
|
||||||
|
SLOT=3
|
||||||
|
SRC_URI=mirror://sourceforge/pcre/pcre-8.30.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.30.tar.bz2
|
||||||
|
_eclasses_=eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 6526ac6fc9aedf391efb91fcd75ace68 user 9e552f935106ff0bc92af16da64b4b29
|
||||||
|
_md5_=ee4015e299b83d374708114c7c7f38c5
|
||||||
@ -1,10 +0,0 @@
|
|||||||
DEFINED_PHASES=install unpack
|
|
||||||
DESCRIPTION=YAML 1.1 parser and emitter written in C
|
|
||||||
HOMEPAGE=http://pyyaml.org/wiki/LibYAML
|
|
||||||
IUSE=doc examples test
|
|
||||||
KEYWORDS=amd64 ~arm ppc ppc64 x86 ~x86-linux ~x86-macos
|
|
||||||
LICENSE=MIT
|
|
||||||
SLOT=0
|
|
||||||
SRC_URI=http://pyyaml.org/download/libyaml/yaml-0.1.2.tar.gz
|
|
||||||
_eclasses_=eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 6526ac6fc9aedf391efb91fcd75ace68 user 9e552f935106ff0bc92af16da64b4b29
|
|
||||||
_md5_=0053e7a9617ac46d522b878802a1c093
|
|
||||||
12
sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libyaml-0.1.4
vendored
Normal file
12
sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libyaml-0.1.4
vendored
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
DEFINED_PHASES=compile configure install prepare test unpack
|
||||||
|
DEPEND=|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
|
||||||
|
DESCRIPTION=YAML 1.1 parser and emitter written in C
|
||||||
|
EAPI=4
|
||||||
|
HOMEPAGE=http://pyyaml.org/wiki/LibYAML
|
||||||
|
IUSE=doc examples test static-libs
|
||||||
|
KEYWORDS=~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
|
||||||
|
LICENSE=MIT
|
||||||
|
SLOT=0
|
||||||
|
SRC_URI=http://pyyaml.org/download/libyaml/yaml-0.1.4.tar.gz
|
||||||
|
_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b eutils 33ef77a15337022e05342d2c772a7a5a libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 6526ac6fc9aedf391efb91fcd75ace68 user 9e552f935106ff0bc92af16da64b4b29
|
||||||
|
_md5_=6a798a117101aee2d2ba14eeda4117f2
|
||||||
Loading…
Reference in New Issue
Block a user