| 1 |
commit: b9d3bbace219538f5b0c8d6e65743d05f3012b54 |
| 2 |
Author: Andrew Savchenko <bircoph <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Mon Mar 2 07:12:48 2015 +0000 |
| 4 |
Commit: Andrew Savchenko <bircoph <AT> gmail <DOT> com> |
| 5 |
CommitDate: Mon Mar 2 07:12:48 2015 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b9d3bbac |
| 7 |
|
| 8 |
sci-physics/root: upstream-like ldflags patch |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.17 |
| 11 |
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org> |
| 12 |
|
| 13 |
--- |
| 14 |
sci-physics/root/ChangeLog | 5 +++++ |
| 15 |
sci-physics/root/files/root-5.32.00-chklib64.patch | 1 + |
| 16 |
sci-physics/root/files/root-5.34.26-prop-flags.patch | 19 ------------------- |
| 17 |
sci-physics/root/root-5.34.26.ebuild | 18 +++++++----------- |
| 18 |
4 files changed, 13 insertions(+), 30 deletions(-) |
| 19 |
|
| 20 |
diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog |
| 21 |
index b8503a4..6f4801a 100644 |
| 22 |
--- a/sci-physics/root/ChangeLog |
| 23 |
+++ b/sci-physics/root/ChangeLog |
| 24 |
@@ -2,6 +2,11 @@ |
| 25 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $ |
| 27 |
|
| 28 |
+ 02 Mar 2015; Andrew Savchenko <bircoph@g.o> root-5.34.26.ebuild, |
| 29 |
+ files/root-5.32.00-chklib64.patch, -files/root-5.34.26-prop-flags.patch: |
| 30 |
+ Add configurable LDFLAGS the same way as upstream did for |
| 31 |
+ configurable CFLAGS/CXXFLAGS. Optimize configure variables. |
| 32 |
+ |
| 33 |
24 Feb 2015; Andrew Savchenko <bircoph@g.o> root-5.34.26.ebuild: |
| 34 |
Remove full path from local images, otherwise html header |
| 35 |
background is missing. |
| 36 |
|
| 37 |
diff --git a/sci-physics/root/files/root-5.32.00-chklib64.patch b/sci-physics/root/files/root-5.32.00-chklib64.patch |
| 38 |
index a5c052c..979220f 100644 |
| 39 |
--- a/sci-physics/root/files/root-5.32.00-chklib64.patch |
| 40 |
+++ b/sci-physics/root/files/root-5.32.00-chklib64.patch |
| 41 |
@@ -1,3 +1,4 @@ |
| 42 |
+bug fix for #406817 |
| 43 |
--- configure.orig 2012-02-29 19:46:41.000000000 +0400 |
| 44 |
+++ configure 2012-03-22 03:28:43.458968696 +0400 |
| 45 |
@@ -441,14 +441,13 @@ |
| 46 |
|
| 47 |
diff --git a/sci-physics/root/files/root-5.34.26-prop-flags.patch b/sci-physics/root/files/root-5.34.26-prop-flags.patch |
| 48 |
deleted file mode 100644 |
| 49 |
index b81dbb5..0000000 |
| 50 |
--- a/sci-physics/root/files/root-5.34.26-prop-flags.patch |
| 51 |
+++ /dev/null |
| 52 |
@@ -1,19 +0,0 @@ |
| 53 |
-commit 3c8bc686abf57e7e2037c4c191cb63a1a5172b5b |
| 54 |
-Author: Andrew Savchenko <bircoph@×××××.com> |
| 55 |
-Date: Sun Feb 22 03:45:21 2015 +0300 |
| 56 |
- |
| 57 |
- root-5.32.00-prop-flags.patch -> root-5.34.26-prop-flags.patch |
| 58 |
- |
| 59 |
-diff --git a/config/Makefile.in b/config/Makefile.in |
| 60 |
-index 89674e7..91d25b9 100644 |
| 61 |
---- a/config/Makefile.in |
| 62 |
-+++ b/config/Makefile.in |
| 63 |
-@@ -29,7 +29,7 @@ EXTRA_CFLAGS := -Iinclude @cflags@ |
| 64 |
- USERCONF_CFLAGS:= @usercflags@ |
| 65 |
- EXTRA_CXXFLAGS := -Iinclude @cflags@ |
| 66 |
- USERCONF_CXXFLAGS:= @usercxxflags@ |
| 67 |
--EXTRA_LDFLAGS := @ldflags@ |
| 68 |
-+EXTRA_LDFLAGS := @ldflags@ $(LDFLAGS) |
| 69 |
- WERROR := @werror@ |
| 70 |
- WINRTDEBUG := @winrtdebug@ |
| 71 |
- |
| 72 |
|
| 73 |
diff --git a/sci-physics/root/root-5.34.26.ebuild b/sci-physics/root/root-5.34.26.ebuild |
| 74 |
index fdd6943..15ec664 100644 |
| 75 |
--- a/sci-physics/root/root-5.34.26.ebuild |
| 76 |
+++ b/sci-physics/root/root-5.34.26.ebuild |
| 77 |
@@ -7,12 +7,11 @@ EAPI=5 |
| 78 |
if [[ ${PV} == "9999" ]] ; then |
| 79 |
inherit git-r3 |
| 80 |
EGIT_REPO_URI="http://root.cern.ch/git/root.git" |
| 81 |
- SRC_URI="" |
| 82 |
- KEYWORDS="" |
| 83 |
else |
| 84 |
SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz" |
| 85 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
| 86 |
fi |
| 87 |
+SRC_URI+=" http://dev.gentoo.org/~bircoph/patches/${PN}-5.34.26-ldflags.patch.xz" |
| 88 |
|
| 89 |
PYTHON_COMPAT=( python2_7 ) |
| 90 |
|
| 91 |
@@ -196,7 +195,7 @@ src_prepare() { |
| 92 |
"${FILESDIR}"/${PN}-5.34.05-nobyte-compile.patch \ |
| 93 |
"${FILESDIR}"/${PN}-5.34.13-unuran.patch \ |
| 94 |
"${FILESDIR}"/${PN}-5.34.13-desktop.patch \ |
| 95 |
- "${FILESDIR}"/${PN}-5.34.26-prop-flags.patch |
| 96 |
+ "${WORKDIR}"/${PN}-5.34.26-ldflags.patch |
| 97 |
|
| 98 |
# make sure we use system libs and headers |
| 99 |
rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die |
| 100 |
@@ -264,7 +263,7 @@ src_configure() { |
| 101 |
esac |
| 102 |
|
| 103 |
# the configure script is not the standard autotools |
| 104 |
- local myconf+=( |
| 105 |
+ myconf+=( |
| 106 |
--prefix="${EPREFIX}/usr" |
| 107 |
--etcdir="${EPREFIX}/etc/root" |
| 108 |
--libdir="${EPREFIX}/usr/$(get_libdir)/${PN}" |
| 109 |
@@ -273,14 +272,13 @@ src_configure() { |
| 110 |
--testdir="${EPREFIX}${DOC_DIR}/examples/tests" |
| 111 |
--disable-werror |
| 112 |
--nohowto |
| 113 |
+ --cflags='${CFLAGS}' |
| 114 |
+ --cxxflags='${CXXFLAGS}' |
| 115 |
+ --ldflags='${LDFLAGS}' |
| 116 |
) |
| 117 |
|
| 118 |
if use minimal; then |
| 119 |
- myconf+=( |
| 120 |
- $(usex X --gminimal --minimal) |
| 121 |
- --cflags='${CFLAGS}' |
| 122 |
- --cxxflags='${CXXFLAGS}' |
| 123 |
- ) |
| 124 |
+ myconf+=( $(usex X --gminimal --minimal) ) |
| 125 |
else |
| 126 |
myconf+=( |
| 127 |
--with-afs-shared=yes |
| 128 |
@@ -302,8 +300,6 @@ src_configure() { |
| 129 |
--enable-soversion |
| 130 |
--enable-table |
| 131 |
--fail-on-missing |
| 132 |
- --cflags='${CFLAGS}' |
| 133 |
- --cxxflags='${CXXFLAGS}' |
| 134 |
$(use_enable X x11) |
| 135 |
$(use_enable X asimage) |
| 136 |
$(use_enable X xft) |
Archives