Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=eb3251ea117737b709c452e85d8b79c763ecab6e
commit eb3251ea117737b709c452e85d8b79c763ecab6e Author: Melko <[email protected]> Date: Sun Oct 5 18:29:46 2014 +0200 root-6.02.00-1-x86_64 * version bump diff --git a/source/apps-extra/root/FrugalBuild b/source/apps-extra/root/FrugalBuild index 6914c91..da7e5ee 100644 --- a/source/apps-extra/root/FrugalBuild +++ b/source/apps-extra/root/FrugalBuild @@ -4,7 +4,7 @@ options+=('asneeded') pkgname=root -pkgver=6.00.02 +pkgver=6.02.00 pkgrel=1 pkgdesc="C++ data analysis framework and interpreter from CERN" url="http://root.cern.ch"; @@ -17,13 +17,14 @@ Fpkgversep="_v" _F_archive_grepv="99" up2date="Flastarchive 'ftp://root.cern.ch/root/' '\.source\.tar\.gz'" source=(ftp://root.cern.ch/$pkgname/${pkgname}_v${pkgver}.source.tar.gz \ - $pkgname.desktop $pkgname.sh) -sha1sums=('5836283ab21446460f5221d4d4179e03e121088e' \ + $pkgname.desktop $pkgname.sh fix-build-gnuinstall.patch) +sha1sums=('98449e9a4d91cc487c5ae59c1128d20286f134cc' \ '022e0a9278fb1037177c10b77a312c4555954e80' \ - 'fd9ab57da53418c91e6b7c47dd7f6076e82701a5') + 'fd9ab57da53418c91e6b7c47dd7f6076e82701a5' \ + '8b179d93b2bd169183d47a29d82a009242f18244') build() { - Fcd $pkgname + Fcd $pkgname-$pkgver Fpatchall rm -rf building || Fdie mkdir building || Fdie diff --git a/source/apps-extra/root/fix-build-gnuinstall.patch b/source/apps-extra/root/fix-build-gnuinstall.patch new file mode 100644 index 0000000..44c7969 --- /dev/null +++ b/source/apps-extra/root/fix-build-gnuinstall.patch @@ -0,0 +1,40 @@ +From 058aa8d4949b392da69ff496cfa9ac87fbec47e2 Mon Sep 17 00:00:00 2001 +From: Pere Mato <[email protected]> +Date: Tue, 30 Sep 2014 22:31:09 +0200 +Subject: [PATCH] Fix for ROOT-6764 (Build failure with gnuinstall=ON) + +--- + CMakeLists.txt | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a9d0336..a84834c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -72,6 +72,7 @@ add_custom_target(move_headers COMMAND ${CMAKE_COMMAND} -DPREFIX=${CMAKE_BINARY + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/fonts ${CMAKE_BINARY_DIR}/fonts + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/macros ${CMAKE_BINARY_DIR}/macros + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/tutorials ${CMAKE_BINARY_DIR}/tutorials) ++include_directories(${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}) + + #---Recurse into the given subdirectories. This does not actually cause another cmake executable + # to run. The same process will walk through the project's entire directory structure. +@@ -124,11 +125,13 @@ add_dependencies(onepcm ${__allTargets}) + install(FILES ${CMAKE_BINARY_DIR}/etc/allDict.cxx.pch DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}) + + #---hsimple.root---------(use the executable for clearer dependencies and proper return code)--- +-add_custom_target(hsimple ALL DEPENDS hsimple.root) +-add_dependencies(hsimple onepcm) +-ROOT_EXECUTABLE(hsimple.exe test/hsimple.cxx NOINSTALL LIBRARIES RIO Tree Hist) +-add_custom_command(OUTPUT hsimple.root COMMAND hsimple.exe) +-install(FILES ${CMAKE_BINARY_DIR}/hsimple.root DESTINATION ${CMAKE_INSTALL_TUTDIR} COMPONENT tests) ++if(NOT gnuinstall) # TODO hsimple.root for gnuinstall ++ add_custom_target(hsimple ALL DEPENDS hsimple.root) ++ add_dependencies(hsimple onepcm) ++ ROOT_EXECUTABLE(hsimple.exe test/hsimple.cxx NOINSTALL LIBRARIES RIO Tree Hist) ++ add_custom_command(OUTPUT hsimple.root COMMAND hsimple.exe) ++ install(FILES ${CMAKE_BINARY_DIR}/hsimple.root DESTINATION ${CMAKE_INSTALL_TUTDIR} COMPONENT tests) ++endif() + + #---version-------------------------------------------------------------------------------------- + add_custom_target(version COMMAND ${CMAKE_SOURCE_DIR}/build/unix/makeversion.sh ${CMAKE_BINARY_DIR} _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
