bircoph 15/07/18 09:40:19
Modified: ChangeLog root-5.34.26.ebuild
root-5.34.28-r1.ebuild
Log:
avoid unconditional pg_config sourcing by usex
Signed-off-by: Andrew Savchenko <[email protected]>
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key
565953B95372756C)
Revision Changes Path
1.150 sci-physics/root/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/ChangeLog?rev=1.150&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/ChangeLog?rev=1.150&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/ChangeLog?r1=1.149&r2=1.150
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- ChangeLog 16 Jul 2015 22:16:37 -0000 1.149
+++ ChangeLog 18 Jul 2015 09:40:19 -0000 1.150
@@ -1,6 +1,11 @@
# ChangeLog for sci-physics/root
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.149
2015/07/16 22:16:37 bircoph Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.150
2015/07/18 09:40:19 bircoph Exp $
+
+ 18 Jul 2015; Andrew Savchenko <[email protected]> root-5.34.26.ebuild,
+ root-5.34.28-r1.ebuild:
+ Do not use usex for postgres to avoid pg_config unconditional
+ sourcing. See bug 555246.
16 Jul 2015; Andrew Savchenko <[email protected]> root-5.34.28-r1.ebuild:
root-5.34.xx can't be used with >=pythia-8.2, see
1.6 sci-physics/root/root-5.34.26.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/root-5.34.26.ebuild?rev=1.6&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/root-5.34.26.ebuild?rev=1.6&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/root-5.34.26.ebuild?r1=1.5&r2=1.6
Index: root-5.34.26.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.26.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- root-5.34.26.ebuild 16 Jul 2015 21:22:10 -0000 1.5
+++ root-5.34.26.ebuild 18 Jul 2015 09:40:19 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.26.ebuild,v 1.5
2015/07/16 21:22:10 bircoph Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.26.ebuild,v 1.6
2015/07/18 09:40:19 bircoph Exp $
EAPI=5
@@ -327,7 +327,6 @@
$(use_enable opengl)
$(use_enable oracle)
$(use_enable postgres pgsql)
- $(usex postgres "--with-pgsql-incdir=$(pg_config
--includedir)" "")
$(use_enable prefix rpath)
$(use_enable pythia6)
$(use_enable pythia8)
@@ -345,6 +344,10 @@
)
fi
+ # usex can't be used here, because pg_config may be not
+ # installed with USE="-postgres"
+ use postgres && myconf+=( --with-pgsql-incdir=$(pg_config --includedir)
)
+
./configure ${myconf[@]} || die "configure failed"
}
1.4 sci-physics/root/root-5.34.28-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/root-5.34.28-r1.ebuild?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/root-5.34.28-r1.ebuild?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/root-5.34.28-r1.ebuild?r1=1.3&r2=1.4
Index: root-5.34.28-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.28-r1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- root-5.34.28-r1.ebuild 16 Jul 2015 22:16:37 -0000 1.3
+++ root-5.34.28-r1.ebuild 18 Jul 2015 09:40:19 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.28-r1.ebuild,v
1.3 2015/07/16 22:16:37 bircoph Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.28-r1.ebuild,v
1.4 2015/07/18 09:40:19 bircoph Exp $
EAPI=5
@@ -311,7 +311,6 @@
$(use_enable opengl)
$(use_enable oracle)
$(use_enable postgres pgsql)
- $(usex postgres "--with-pgsql-incdir=$(pg_config --includedir)"
"")
$(use_enable prefix rpath)
$(use_enable pythia6)
$(use_enable pythia8)
@@ -331,6 +330,10 @@
${EXTRA_ECONF}
)
+ # usex can't be used here, because pg_config may be not
+ # installed with USE="-postgres"
+ use postgres && myconf+=( --with-pgsql-incdir=$(pg_config --includedir)
)
+
./configure ${myconf[@]} || die "configure failed"
}
