| 1 |
ssuominen 14/07/29 07:58:43 |
| 2 |
|
| 3 |
Modified: pkgconfig-9999.ebuild ChangeLog |
| 4 |
Added: pkgconfig-0.28-r2.ebuild |
| 5 |
Log: |
| 6 |
Strip system library directories reliably wrt #512336 by Mike Frysinger |
| 7 |
|
| 8 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.14 dev-util/pkgconfig/pkgconfig-9999.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig/pkgconfig-9999.ebuild?rev=1.14&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig/pkgconfig-9999.ebuild?rev=1.14&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig/pkgconfig-9999.ebuild?r1=1.13&r2=1.14 |
| 16 |
|
| 17 |
Index: pkgconfig-9999.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-9999.ebuild,v |
| 20 |
retrieving revision 1.13 |
| 21 |
retrieving revision 1.14 |
| 22 |
diff -u -r1.13 -r1.14 |
| 23 |
--- pkgconfig-9999.ebuild 24 Jun 2014 21:56:52 -0000 1.13 |
| 24 |
+++ pkgconfig-9999.ebuild 29 Jul 2014 07:58:43 -0000 1.14 |
| 25 |
@@ -1,10 +1,10 @@ |
| 26 |
# Copyright 1999-2014 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-9999.ebuild,v 1.13 2014/06/24 21:56:52 mgorny Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-9999.ebuild,v 1.14 2014/07/29 07:58:43 ssuominen Exp $ |
| 30 |
|
| 31 |
EAPI=5 |
| 32 |
|
| 33 |
-inherit flag-o-matic libtool multilib multilib-minimal |
| 34 |
+inherit eutils flag-o-matic libtool multilib multilib-minimal |
| 35 |
|
| 36 |
MY_P=pkg-config-${PV} |
| 37 |
|
| 38 |
@@ -36,6 +36,8 @@ |
| 39 |
src_prepare() { |
| 40 |
sed -i -e "s|^prefix=/usr\$|prefix=${EPREFIX}/usr|" check/simple.pc || die #434320 |
| 41 |
|
| 42 |
+ epatch_user |
| 43 |
+ |
| 44 |
if [[ ${PV} == *9999* ]]; then |
| 45 |
eautoreconf |
| 46 |
else |
| 47 |
|
| 48 |
|
| 49 |
|
| 50 |
1.157 dev-util/pkgconfig/ChangeLog |
| 51 |
|
| 52 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig/ChangeLog?rev=1.157&view=markup |
| 53 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig/ChangeLog?rev=1.157&content-type=text/plain |
| 54 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig/ChangeLog?r1=1.156&r2=1.157 |
| 55 |
|
| 56 |
Index: ChangeLog |
| 57 |
=================================================================== |
| 58 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/ChangeLog,v |
| 59 |
retrieving revision 1.156 |
| 60 |
retrieving revision 1.157 |
| 61 |
diff -u -r1.156 -r1.157 |
| 62 |
--- ChangeLog 22 Jul 2014 12:41:29 -0000 1.156 |
| 63 |
+++ ChangeLog 29 Jul 2014 07:58:43 -0000 1.157 |
| 64 |
@@ -1,6 +1,13 @@ |
| 65 |
# ChangeLog for dev-util/pkgconfig |
| 66 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 67 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/ChangeLog,v 1.156 2014/07/22 12:41:29 ssuominen Exp $ |
| 68 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/ChangeLog,v 1.157 2014/07/29 07:58:43 ssuominen Exp $ |
| 69 |
+ |
| 70 |
+*pkgconfig-0.28-r2 (29 Jul 2014) |
| 71 |
+ |
| 72 |
+ 29 Jul 2014; Samuli Suominen <ssuominen@g.o> |
| 73 |
+ +files/pkgconfig-0.28-strip_system_library_dirs_reliably.patch, |
| 74 |
+ +pkgconfig-0.28-r2.ebuild, pkgconfig-9999.ebuild: |
| 75 |
+ Strip system library directories reliably wrt #512336 by Mike Frysinger |
| 76 |
|
| 77 |
22 Jul 2014; Samuli Suominen <ssuominen@g.o> -pkgconfig-0.28.ebuild: |
| 78 |
old |
| 79 |
|
| 80 |
|
| 81 |
|
| 82 |
1.1 dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild |
| 83 |
|
| 84 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild?rev=1.1&view=markup |
| 85 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild?rev=1.1&content-type=text/plain |
| 86 |
|
| 87 |
Index: pkgconfig-0.28-r2.ebuild |
| 88 |
=================================================================== |
| 89 |
# Copyright 1999-2014 Gentoo Foundation |
| 90 |
# Distributed under the terms of the GNU General Public License v2 |
| 91 |
# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild,v 1.1 2014/07/29 07:58:43 ssuominen Exp $ |
| 92 |
|
| 93 |
EAPI=5 |
| 94 |
|
| 95 |
inherit eutils flag-o-matic libtool multilib multilib-minimal |
| 96 |
|
| 97 |
MY_P=pkg-config-${PV} |
| 98 |
|
| 99 |
if [[ ${PV} == *9999* ]]; then |
| 100 |
EGIT_REPO_URI="git://anongit.freedesktop.org/pkg-config" |
| 101 |
inherit autotools git-2 |
| 102 |
else |
| 103 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 104 |
SRC_URI="http://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz" |
| 105 |
fi |
| 106 |
|
| 107 |
DESCRIPTION="Package config system that manages compile/link flags" |
| 108 |
HOMEPAGE="http://pkgconfig.freedesktop.org/wiki/" |
| 109 |
|
| 110 |
LICENSE="GPL-2" |
| 111 |
SLOT="0" |
| 112 |
IUSE="elibc_FreeBSD elibc_glibc hardened internal-glib" |
| 113 |
|
| 114 |
RDEPEND="!internal-glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] ) |
| 115 |
!dev-util/pkgconf[pkg-config] |
| 116 |
!dev-util/pkg-config-lite |
| 117 |
!dev-util/pkgconfig-openbsd[pkg-config]" |
| 118 |
DEPEND="${RDEPEND}" |
| 119 |
|
| 120 |
S=${WORKDIR}/${MY_P} |
| 121 |
|
| 122 |
DOCS=( AUTHORS NEWS README ) |
| 123 |
|
| 124 |
src_prepare() { |
| 125 |
epatch "${FILESDIR}"/${P}-strip_system_library_dirs_reliably.patch |
| 126 |
|
| 127 |
sed -i -e "s|^prefix=/usr\$|prefix=${EPREFIX}/usr|" check/simple.pc || die #434320 |
| 128 |
|
| 129 |
epatch_user |
| 130 |
|
| 131 |
if [[ ${PV} == *9999* ]]; then |
| 132 |
eautoreconf |
| 133 |
else |
| 134 |
elibtoolize # Required for FreeMiNT wrt #333429 |
| 135 |
fi |
| 136 |
} |
| 137 |
|
| 138 |
multilib_src_configure() { |
| 139 |
local myconf |
| 140 |
|
| 141 |
if use internal-glib; then |
| 142 |
myconf+=' --with-internal-glib' |
| 143 |
# non-glibc platforms use GNU libiconv, but configure needs to |
| 144 |
# know about that not to get confused when it finds something |
| 145 |
# outside the prefix too |
| 146 |
if use prefix && use !elibc_glibc ; then |
| 147 |
myconf+=" --with-libiconv=gnu" |
| 148 |
# add the libdir for libtool, otherwise it'll make love with system |
| 149 |
# installed libiconv |
| 150 |
append-ldflags "-L${EPREFIX}/usr/$(get_libdir)" |
| 151 |
fi |
| 152 |
else |
| 153 |
if ! has_version dev-util/pkgconfig; then |
| 154 |
export GLIB_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include" |
| 155 |
export GLIB_LIBS="-lglib-2.0" |
| 156 |
fi |
| 157 |
fi |
| 158 |
|
| 159 |
use ppc64 && use hardened && replace-flags -O[2-3] -O1 |
| 160 |
|
| 161 |
# Force using all the requirements when linking, so that needed -pthread |
| 162 |
# lines are inherited between libraries |
| 163 |
use elibc_FreeBSD && myconf+=' --enable-indirect-deps' |
| 164 |
|
| 165 |
[[ ${PV} == *9999* ]] && myconf+=' --enable-maintainer-mode' |
| 166 |
|
| 167 |
ECONF_SOURCE=${S} \ |
| 168 |
econf \ |
| 169 |
--docdir="${EPREFIX}"/usr/share/doc/${PF}/html \ |
| 170 |
--with-system-include-path="${EPREFIX}"/usr/include \ |
| 171 |
--with-system-library-path="${EPREFIX}"/usr/$(get_libdir) \ |
| 172 |
${myconf} |
| 173 |
} |
| 174 |
|
| 175 |
multilib_src_install() { |
| 176 |
emake DESTDIR="${D}" install |
| 177 |
|
| 178 |
if use prefix; then |
| 179 |
# Add an explicit reference to $EPREFIX to PKG_CONFIG_PATH to |
| 180 |
# simplify cross-prefix builds |
| 181 |
echo "PKG_CONFIG_PATH=${EPREFIX}/usr/$(get_libdir)/pkgconfig:${EPREFIX}/usr/share/pkgconfig" >> "${T}"/99${PN} |
| 182 |
doenvd "${T}"/99${PN} |
| 183 |
fi |
| 184 |
} |
Archives