Gentoo Archives: gentoo-commits

From: "Sebastien Fabbro (bicatali)" <bicatali@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-physics/fastjet/files: fastjet-3.0.3-system-siscone.patch
Date: Tue, 04 Jun 2013 17:35:16
Message-Id: 20130604173513.9F83C2171D@flycatcher.gentoo.org
1 bicatali 13/06/04 17:35:13
2
3 Modified: fastjet-3.0.3-system-siscone.patch
4 Log:
5 Fixed for newer automake (bug #472018), switch to EAPI5
6
7 (Portage version: 2.2.01.21938-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)
8
9 Revision Changes Path
10 1.2 sci-physics/fastjet/files/fastjet-3.0.3-system-siscone.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/fastjet/files/fastjet-3.0.3-system-siscone.patch?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/fastjet/files/fastjet-3.0.3-system-siscone.patch?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/fastjet/files/fastjet-3.0.3-system-siscone.patch?r1=1.1&r2=1.2
15
16 Index: fastjet-3.0.3-system-siscone.patch
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sci-physics/fastjet/files/fastjet-3.0.3-system-siscone.patch,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- fastjet-3.0.3-system-siscone.patch 24 Jul 2012 17:47:27 -0000 1.1
23 +++ fastjet-3.0.3-system-siscone.patch 4 Jun 2013 17:35:13 -0000 1.2
24 @@ -1,7 +1,16 @@
25 diff -Nur fastjet-3.0.3.orig/configure.ac fastjet-3.0.3/configure.ac
26 --- fastjet-3.0.3.orig/configure.ac 2012-06-25 15:15:32.000000000 +0100
27 +++ fastjet-3.0.3/configure.ac 2012-07-24 18:39:11.000000000 +0100
28 -@@ -252,6 +252,11 @@
29 +@@ -14,7 +14,7 @@
30 + dnl - the first macro needs to place the files in the correct
31 + dnl dir in order to have the correct -I options for the remote build
32 + dnl - see Makefile.am for distcleaning AX_PREFIX_CONFIG_H leftovers
33 +-AM_CONFIG_HEADER(include/fastjet/config_raw.h:config.h.in)
34 ++AC_CONFIG_HEADERS(include/fastjet/config_raw.h:config.h.in)
35 + AX_PREFIX_CONFIG_H(include/fastjet/config_auto.h,FASTJET,include/fastjet/config_raw.h)
36 +
37 + dnl check autoconf version
38 +@@ -252,6 +252,12 @@
39 fi
40
41 dnl SISCone
42 @@ -10,6 +19,7 @@
43 + [bundle_siscone=$withval],
44 + [bundle_siscone=no])
45 +AM_CONDITIONAL(BUNDLE_SISCONE, test x$bundle_siscone != xno)
46 ++
47 ACX_CHECK_PLUGIN(SISCone, siscone, SISCONE, yes,
48 [CONFIG_LIBS_PLUGINS=${CONFIG_LIBS_PLUGINS}" -lsiscone_spherical -lsiscone"
49 CONFIG_LIBS_PLUGINS_STATIC=${CONFIG_LIBS_PLUGINS_STATIC}" \${installationdir}/lib/libsiscone.a \${installationdir}/lib/libsiscone_spherical.a"])