* [gentoo-commits] gentoo-x86 commit in sci-physics/geant/files: geant-4.9.4-no-examples.patch geant-4.9.4-libdir.patch geant-4.9.3-zlib.patch geant-4.9.4-datadir.patch geant-4.9.4-no-benchmarks.patch geant-4.9.4-zlib.patch
@ 2011-01-22 2:28 Sebastien Fabbro (bicatali)
0 siblings, 0 replies; only message in thread
From: Sebastien Fabbro (bicatali) @ 2011-01-22 2:28 UTC (permalink / raw
To: gentoo-commits
bicatali 11/01/22 02:28:42
Modified: geant-4.9.3-zlib.patch
Added: geant-4.9.4-no-examples.patch
geant-4.9.4-libdir.patch geant-4.9.4-datadir.patch
geant-4.9.4-no-benchmarks.patch
geant-4.9.4-zlib.patch
Log:
Version bump, switched to cmake. Fixed Qt drivers bug #263450, bug #347279. Removed G4WORKDIR bug #345855.
(Portage version: 2.1.9.34/cvs/Linux x86_64)
Revision Changes Path
1.2 sci-physics/geant/files/geant-4.9.3-zlib.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/geant/files/geant-4.9.3-zlib.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/geant/files/geant-4.9.3-zlib.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/geant/files/geant-4.9.3-zlib.patch?r1=1.1&r2=1.2
Index: geant-4.9.3-zlib.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-physics/geant/files/geant-4.9.3-zlib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- geant-4.9.3-zlib.patch 9 Jan 2010 18:27:43 -0000 1.1
+++ geant-4.9.3-zlib.patch 22 Jan 2011 02:28:42 -0000 1.2
@@ -1,7 +1,5 @@
-diff --git a/config/binmake.gmk b/config/binmake.gmk
-index 75bbaf2..c31ed3d 100644
---- a/config/binmake.gmk
-+++ b/config/binmake.gmk
+--- config/binmake.gmk.orig
++++ config/binmake.gmk
@@ -234,7 +234,7 @@ ifdef GLOBALLIBS
-lG4intercoms \
-lG4global
@@ -12,3 +10,18 @@
endif
+--- config/architecture.gmk.orig 2011-01-16 00:22:05.976079082 +0000
++++ config/architecture.gmk 2011-01-16 00:23:18.346082379 +0000
+@@ -214,8 +214,10 @@
+ else
+ LDFLAGS += -L$(CLHEP_LIB_DIR)
+ LOADLIBS := -l$(CLHEP_LIB) -lm
+- ifndef G4LIB_USE_ZLIB
+- LOADLIBS += -lz
++ ifdef G4LIB_USE_ZLIB
++ ifndef G4LIB_BUILD_ZLIB
++ LOADLIBS += -lz
++ endif
+ endif
+ endif
+
1.1 sci-physics/geant/files/geant-4.9.4-no-examples.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/geant/files/geant-4.9.4-no-examples.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/geant/files/geant-4.9.4-no-examples.patch?rev=1.1&content-type=text/plain
Index: geant-4.9.4-no-examples.patch
===================================================================
--- CMakeLists.txt.orig 2011-01-22 01:47:07.000000000 +0000
+++ CMakeLists.txt 2011-01-22 02:00:58.676084146 +0000
@@ -209,9 +209,9 @@
# Install any extra files needed such as documentation and legacy Makefiles
#
# User example code
-install(DIRECTORY examples
- DESTINATION ${GEANT4_DATAROOTDIR}/geant4-${geant4_VERSION}
- PATTERN "CVS" EXCLUDE)
+#install(DIRECTORY examples
+# DESTINATION ${GEANT4_DATAROOTDIR}/geant4-${geant4_VERSION}
+# PATTERN "CVS" EXCLUDE)
#
1.1 sci-physics/geant/files/geant-4.9.4-libdir.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/geant/files/geant-4.9.4-libdir.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/geant/files/geant-4.9.4-libdir.patch?rev=1.1&content-type=text/plain
Index: geant-4.9.4-libdir.patch
===================================================================
--- CMakeLists.txt.orig 2011-01-17 06:25:14.536078940 +0000
+++ CMakeLists.txt 2011-01-21 23:50:53.406082074 +0000
@@ -195,7 +195,7 @@
set(GEANT4_PREFIX ${CMAKE_INSTALL_PREFIX})
set(GEANT4_EXEC_PREFIX ${GEANT4_PREFIX})
set(GEANT4_BINDIR ${GEANT4_EXEC_PREFIX}/bin)
-set(GEANT4_LIBDIR ${GEANT4_PREFIX}/lib)
+set(GEANT4_LIBDIR ${GEANT4_PREFIX}/lib${LIB_SUFFIX})
set(GEANT4_DATAROOTDIR ${GEANT4_PREFIX}/share)
set(GEANT4_DATADIR ${GEANT4_DATAROOTDIR})
set(GEANT4_INCLUDEDIR ${GEANT4_PREFIX}/include)
--- cmake/Modules/Geant4MacroLibraryTargets.cmake.orig 2011-01-21 23:36:09.356079013 +0000
+++ cmake/Modules/Geant4MacroLibraryTargets.cmake 2011-01-21 23:49:49.826082339 +0000
@@ -35,8 +35,8 @@
# NEEDS WORK TO REMOVE HARDCODED LIB/BIN DIR
install(TARGETS ${G4LIBTARGET_NAME}
RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib)
+ LIBRARY DESTINATION lib${LIB_SUFFIX}
+ ARCHIVE DESTINATION lib${LIB_SUFFIX})
endif()
#
@@ -59,8 +59,8 @@
install(TARGETS ${G4LIBTARGET_NAME}-static
RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib)
+ LIBRARY DESTINATION lib${LIB_SUFFIX}
+ ARCHIVE DESTINATION lib${LIB_SUFFIX})
endif()
ENDMACRO()
1.1 sci-physics/geant/files/geant-4.9.4-datadir.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/geant/files/geant-4.9.4-datadir.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/geant/files/geant-4.9.4-datadir.patch?rev=1.1&content-type=text/plain
Index: geant-4.9.4-datadir.patch
===================================================================
--- cmake/Modules/Geant4ToolchainBackwardCompatibility.cmake.orig 2011-01-22 00:49:11.096082056 +0000
+++ cmake/Modules/Geant4ToolchainBackwardCompatibility.cmake 2011-01-22 00:53:04.746078920 +0000
@@ -74,9 +74,9 @@
# Construct backward compatible variables
#
set(G4SYSTEM "${GEANT4_SYSTEM}-${GEANT4_COMPILER}")
-set(G4INSTALL ${GEANT4_DATADIR}/geant4-${geant4_VERSION})
+set(G4INSTALL ${GEANT4_DATADIR}/geant4)
set(G4INCLUDE ${GEANT4_INCLUDEDIR}/geant4)
-set(G4LIB ${GEANT4_LIBDIR}/geant4-${geant4_VERSION})
+set(G4LIB ${GEANT4_LIBDIR}/geant4)
message(STATUS "Geant4 backwards compatible variable G4SYSTEM : ${G4SYSTEM}")
message(STATUS "Geant4 backwards compatible variable G4INSTALL: ${G4INSTALL}")
@@ -125,7 +125,7 @@
# Install targets
# toolchain
install(DIRECTORY config
- DESTINATION ${GEANT4_DATAROOTDIR}/geant4-${geant4_VERSION}
+ DESTINATION ${GEANT4_DATAROOTDIR}/geant4
FILES_MATCHING PATTERN "*.gmk"
PATTERN "CVS" EXCLUDE
PATTERN "scripts/" EXCLUDE)
@@ -134,16 +134,16 @@
install(FILES
${CMAKE_BINARY_DIR}/outputs/runtime/geant4-${geant4_VERSION}.sh
${CMAKE_BINARY_DIR}/outputs/runtime/geant4-${geant4_VERSION}.csh
- DESTINATION ${GEANT4_DATAROOTDIR}/geant4-${geant4_VERSION}/config
+ DESTINATION ${GEANT4_DATAROOTDIR}/geant4/config
PERMISSIONS
OWNER_READ OWNER_WRITE OWNER_EXECUTE
GROUP_READ GROUP_EXECUTE
WORLD_READ WORLD_EXECUTE)
# compatibility softlink to library directory
- install(CODE "execute_process(COMMAND \${CMAKE_COMMAND} -E make_directory \$ENV{DESTDIR}${GEANT4_LIBDIR}/geant4-${geant4_VERSION})")
+ install(CODE "execute_process(COMMAND \${CMAKE_COMMAND} -E make_directory \$ENV{DESTDIR}${GEANT4_LIBDIR}/geant4)")
- install(CODE "execute_process(COMMAND \${CMAKE_COMMAND} -E create_symlink .. ${GEANT4_SYSTEM}-${GEANT4_COMPILER} WORKING_DIRECTORY \$ENV{DESTDIR}${GEANT4_LIBDIR}/geant4-${geant4_VERSION})")
+ install(CODE "execute_process(COMMAND \${CMAKE_COMMAND} -E create_symlink .. ${GEANT4_SYSTEM}-${GEANT4_COMPILER} WORKING_DIRECTORY \$ENV{DESTDIR}${GEANT4_LIBDIR}/geant4)")
endif()
1.1 sci-physics/geant/files/geant-4.9.4-no-benchmarks.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/geant/files/geant-4.9.4-no-benchmarks.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/geant/files/geant-4.9.4-no-benchmarks.patch?rev=1.1&content-type=text/plain
Index: geant-4.9.4-no-benchmarks.patch
===================================================================
--- source/geometry/CMakeLists.txt.orig 2011-01-17 05:09:38.046080303 +0000
+++ source/geometry/CMakeLists.txt 2011-01-17 05:09:59.636215548 +0000
@@ -12,7 +12,6 @@
#
#------------------------------------------------------------------------------
-add_subdirectory(benchmarks)
add_subdirectory(biasing)
add_subdirectory(divisions)
add_subdirectory(magneticfield)
1.1 sci-physics/geant/files/geant-4.9.4-zlib.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/geant/files/geant-4.9.4-zlib.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/geant/files/geant-4.9.4-zlib.patch?rev=1.1&content-type=text/plain
Index: geant-4.9.4-zlib.patch
===================================================================
--- CMakeLists.txt.orig 2011-01-17 06:25:14.536078940 +0000
+++ CMakeLists.txt 2011-01-17 06:25:26.166078780 +0000
@@ -154,7 +154,7 @@
#------------------------------------------------------------------------------
# Optional use of system zlib library
#
-#option(GEANT4_USE_SYSTEM_ZLIB "Use the system's zlib library" OFF)
+option(GEANT4_USE_SYSTEM_ZLIB "Use the system's zlib library" OFF)
if(GEANT4_USE_SYSTEM_ZLIB)
# This needs more work - use ITK's way of doing it as an example.
find_package(ZLIB)
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-01-22 2:28 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-22 2:28 [gentoo-commits] gentoo-x86 commit in sci-physics/geant/files: geant-4.9.4-no-examples.patch geant-4.9.4-libdir.patch geant-4.9.3-zlib.patch geant-4.9.4-datadir.patch geant-4.9.4-no-benchmarks.patch geant-4.9.4-zlib.patch Sebastien Fabbro (bicatali)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox