mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-28 09:01:55 +02:00
libgpg-error: import newer version from upstream
A fix went into upstream for amd64 multilib installs which we need: `gpg-error-config` likes to display -L/usr/lib64 when cross-compiling. BUG=chromium-os:20636 TEST=`emerge-x86-generic libgpg-error`; `/build/x86-generic/usr/bin/gpg-error-config --libs` shows correct output (no -L flag) TEST=`emerge-x86-generic libgcrypt` still works TEST=`emerge-amd64-generic libgpg-error`; `/build/amd64-generic/usr/bin/gpg-error-config --libs` shows correct output (no -L flag) TEST=`emerge-x86-generic libgcrypt` now works Change-Id: I7a869789c8eb65b99ea9a907912b0befdf81887e Reviewed-on: http://gerrit.chromium.org/gerrit/8286 Reviewed-by: Raymes Khoury <raymes@chromium.org> Commit-Ready: Mike Frysinger <vapier@chromium.org> Tested-by: Mike Frysinger <vapier@chromium.org> Reviewed-by: David James <davidjames@chromium.org>
This commit is contained in:
parent
2ecfe96bec
commit
dcb99d0f9d
@ -0,0 +1,40 @@
|
||||
From 078a9a026db2043718abca4207b93d73666bb907 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu>
|
||||
Date: Thu, 22 Sep 2011 15:28:34 +0200
|
||||
Subject: [PATCH] gpg-error-config: handle /usr/lib64, /lib64 just like
|
||||
/usr/lib and /lib
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Distributions such as Gentoo Linux use /usr/lib64 for system libraries on
|
||||
multilib setups, so in those cases, ignore the libraries as well.
|
||||
|
||||
Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
|
||||
---
|
||||
src/gpg-error-config.in | 9 ++++++---
|
||||
1 files changed, 6 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/gpg-error-config.in b/src/gpg-error-config.in
|
||||
index 14f0625..df27f0a 100644
|
||||
--- a/src/gpg-error-config.in
|
||||
+++ b/src/gpg-error-config.in
|
||||
@@ -69,9 +69,12 @@ while test $# -gt 0; do
|
||||
output="$output @GPG_ERROR_CONFIG_CFLAGS@"
|
||||
;;
|
||||
--libs)
|
||||
- if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/lib"; then
|
||||
- output="$output -L$libdir"
|
||||
- fi
|
||||
+ case "$libdir" in
|
||||
+ /usr/lib|/usr/lib64|/lib|/lib64) ;;
|
||||
+ *)
|
||||
+ output="$output -L$libdir"
|
||||
+ ;;
|
||||
+ esac
|
||||
output="$output @GPG_ERROR_CONFIG_LIBS@"
|
||||
;;
|
||||
--host)
|
||||
--
|
||||
1.7.6.1
|
||||
|
41
sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/libgpg-error-1.10-r1.ebuild
vendored
Normal file
41
sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/libgpg-error-1.10-r1.ebuild
vendored
Normal file
@ -0,0 +1,41 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgpg-error/libgpg-error-1.10-r1.ebuild,v 1.2 2011/09/26 18:33:32 vapier Exp $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
inherit eutils libtool
|
||||
|
||||
DESCRIPTION="Contains error handling functions used by GnuPG software"
|
||||
HOMEPAGE="http://www.gnupg.org/related_software/libgpg-error"
|
||||
SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2 LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="common-lisp nls static-libs"
|
||||
|
||||
RDEPEND="nls? ( virtual/libintl )"
|
||||
DEPEND="nls? ( sys-devel/gettext )"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${PN}-multilib-syspaths.patch
|
||||
epunt_cxx
|
||||
elibtoolize
|
||||
}
|
||||
|
||||
DOCS=( AUTHORS ChangeLog NEWS README )
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
$(use_enable nls) \
|
||||
$(use_enable static-libs static) \
|
||||
$(use_enable common-lisp languages)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
# library has no dependencies, so it does not need the .la file
|
||||
find "${D}" -name '*.la' -delete
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user