| 1 |
bicatali 14/05/06 17:40:58 |
| 2 |
|
| 3 |
Added: fastjet-3.0.6-system-siscone.patch |
| 4 |
Log: |
| 5 |
UDe-bundle siscone again |
| 6 |
|
| 7 |
(Portage version: 2.2.8-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sci-physics/fastjet/files/fastjet-3.0.6-system-siscone.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/fastjet/files/fastjet-3.0.6-system-siscone.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/fastjet/files/fastjet-3.0.6-system-siscone.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: fastjet-3.0.6-system-siscone.patch |
| 16 |
=================================================================== |
| 17 |
diff -Nur fastjet-3.0.6.orig/configure.ac fastjet-3.0.6/configure.ac |
| 18 |
--- fastjet-3.0.6.orig/configure.ac 2014-05-06 10:29:55.240632504 -0700 |
| 19 |
+++ fastjet-3.0.6/configure.ac 2014-05-06 10:36:20.156246416 -0700 |
| 20 |
@@ -261,6 +261,12 @@ |
| 21 |
fi |
| 22 |
|
| 23 |
dnl SISCone |
| 24 |
+AC_ARG_WITH(bundle-siscone, |
| 25 |
+ [ --with-bundle-siscone Build the bundled SISCone library [default=no]], |
| 26 |
+ [bundle_siscone=$withval], |
| 27 |
+ [bundle_siscone=no]) |
| 28 |
+AM_CONDITIONAL(BUNDLE_SISCONE, test x$bundle_siscone != xno) |
| 29 |
+ |
| 30 |
ACX_CHECK_PLUGIN(SISCone, siscone, SISCONE, yes, |
| 31 |
[CONFIG_LIBS_PLUGINS=${CONFIG_LIBS_PLUGINS}" -lsiscone_spherical -lsiscone" |
| 32 |
CONFIG_LIBS_PLUGINS_STATIC=${CONFIG_LIBS_PLUGINS_STATIC}" \${installationdir}/lib/libsiscone.a \${installationdir}/lib/libsiscone_spherical.a"]) |
| 33 |
diff -Nur fastjet-3.0.6.orig/example/Makefile.am fastjet-3.0.6/example/Makefile.am |
| 34 |
--- fastjet-3.0.6.orig/example/Makefile.am 2014-05-06 10:29:55.239632499 -0700 |
| 35 |
+++ fastjet-3.0.6/example/Makefile.am 2014-05-06 10:36:20.156246416 -0700 |
| 36 |
@@ -43,7 +43,7 @@ |
| 37 |
03_plugin_CXXFLAGS = $(AM_CXXFLAGS) $(CGAL_CPPFLAGS) -I$(srcdir)/../include |
| 38 |
03_plugin_LDADD = ../src/libfastjet.la $(CGAL_LIBS) |
| 39 |
03_plugin_CXXFLAGS += -I$(srcdir)/../plugins/SISCone -I$(srcdir)/../plugins/SISCone/siscone |
| 40 |
-03_plugin_LDADD += ../plugins/SISCone/libSISConePlugin.la ../plugins/SISCone/siscone/siscone/libsiscone.la ../plugins/SISCone/siscone/siscone/spherical/libsiscone_spherical.la |
| 41 |
+03_plugin_LDADD += ../plugins/SISCone/libSISConePlugin.la |
| 42 |
else |
| 43 |
EXTRA_DIST += 03-plugin.cc |
| 44 |
endif |
| 45 |
@@ -125,7 +125,7 @@ |
| 46 |
fastjet_areas_LDADD = ../src/libfastjet.la $(CGAL_LIBS) |
| 47 |
if BUILD_PLUGIN_SISCONE |
| 48 |
fastjet_areas_CXXFLAGS += -I$(srcdir)/../plugins/SISCone -I$(srcdir)/../plugins/SISCone/siscone |
| 49 |
-fastjet_areas_LDADD += ../plugins/SISCone/libSISConePlugin.la ../plugins/SISCone/siscone/siscone/libsiscone.la ../plugins/SISCone/siscone/siscone/spherical/libsiscone_spherical.la |
| 50 |
+fastjet_areas_LDADD += ../plugins/SISCone/libSISConePlugin.la |
| 51 |
endif |
| 52 |
|
| 53 |
fastjet_timing_plugins_SOURCES = fastjet_timing_plugins.cc CmdLine.cc |
| 54 |
@@ -135,7 +135,7 @@ |
| 55 |
fastjet_timing_plugins_LDADD += ../tools/libfastjettools.la |
| 56 |
if BUILD_PLUGIN_SISCONE |
| 57 |
fastjet_timing_plugins_CXXFLAGS += -I$(srcdir)/../plugins/SISCone -I$(srcdir)/../plugins/SISCone/siscone |
| 58 |
-fastjet_timing_plugins_LDADD += ../plugins/SISCone/libSISConePlugin.la ../plugins/SISCone/siscone/siscone/libsiscone.la ../plugins/SISCone/siscone/siscone/spherical/libsiscone_spherical.la |
| 59 |
+fastjet_timing_plugins_LDADD += ../plugins/SISCone/libSISConePlugin.la |
| 60 |
endif |
| 61 |
if BUILD_PLUGIN_CDFCONES |
| 62 |
fastjet_timing_plugins_CXXFLAGS += -I$(srcdir)/../plugins/CDFCones |
| 63 |
diff -Nur fastjet-3.0.6.orig/plugins/SISCone/Makefile.am fastjet-3.0.6/plugins/SISCone/Makefile.am |
| 64 |
--- fastjet-3.0.6.orig/plugins/SISCone/Makefile.am 2014-05-06 10:29:55.250632584 -0700 |
| 65 |
+++ fastjet-3.0.6/plugins/SISCone/Makefile.am 2014-05-06 10:36:20.156246416 -0700 |
| 66 |
@@ -1,11 +1,22 @@ |
| 67 |
-SUBDIRS = siscone fastjet . |
| 68 |
+SUBDIRS = fastjet . |
| 69 |
|
| 70 |
if MONOLITHIC_PLUGINS |
| 71 |
noinst_LTLIBRARIES = libSISConePlugin.la |
| 72 |
else |
| 73 |
lib_LTLIBRARIES = libSISConePlugin.la |
| 74 |
endif |
| 75 |
-libSISConePlugin_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(srcdir) -I$(srcdir)/siscone -I$(srcdir)/../../include |
| 76 |
+libSISConePlugin_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(srcdir) -I$(srcdir)/../../include |
| 77 |
+ |
| 78 |
+if BUNDLE_SISCONE |
| 79 |
+SUBDIRS += siscone |
| 80 |
+libSISConePlugin_la_CXXFLAGS += -I$(srcdir)/siscone |
| 81 |
+libSISConePlugin_la_LIBADD = \ |
| 82 |
+ $(top_builddir)/plugins/SISCone/siscone/siscone/libsiscone.la \ |
| 83 |
+ $(top_builddir)/plugins/SISCone/siscone/siscone/spherical/libsiscone_spherical.la |
| 84 |
+else |
| 85 |
+libSISConePlugin_la_LIBADD = -lsiscone -lsiscone_spherical |
| 86 |
+endif |
| 87 |
+ |
| 88 |
libSISConePlugin_la_SOURCES = SISConePlugin.cc SISConeSphericalPlugin.cc |
| 89 |
|
| 90 |
EXTRA_DIST = makefile.static |
Archives