~olbohlen/oi-userland.git

Andreas Wacknitz

2024-03-25 46e90f2ec3893ee70dfcd2bb4dde52268312d7fb

commit \| author \| age
e12e8f	1	--- cmake-3.11.3/Modules/FindMPI.cmake.orig 2018-06-04 19:13:02.572174189 +0000
AL	2	+++ cmake-3.11.3/Modules/FindMPI.cmake 2018-06-04 19:36:02.929469382 +0000
	3	@@ -1247,6 +1247,9 @@
	4	# FreeBSD ships mpich under the normal system paths - but available openmpi implementations
	5	# will be found in /usr/local/mpi/<name>
	6	MPI_search_mpi_prefix_folder("/usr/local/mpi")
	7	+elseif("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "SunOS")
	8	+ # OpenIndiana ships MPI in subdirectories
	9	+ MPI_search_mpi_prefix_folder("/usr/lib/64/mpich/gcc")
	10	endif()
	11
	12	# Most MPI distributions have some form of mpiexec or mpirun which gives us something we can look for.
	13	--- cmake-3.11.3/Modules/CMakeDetermineJavaCompiler.cmake.orig 2018-06-04 19:13:02.561764067 +0000
	14	+++ cmake-3.11.3/Modules/CMakeDetermineJavaCompiler.cmake 2018-06-04 19:16:19.645223465 +0000
	15	@@ -43,18 +43,9 @@
	16	"[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/bin"
	17	$ENV{JAVA_HOME}/bin
	18	/usr/bin
	19	- /usr/lib/java/bin
	20	- /usr/share/java/bin
	21	- /usr/local/bin
	22	- /usr/local/java/bin
	23	- /usr/local/java/share/bin
	24	- /usr/java/j2sdk1.4.2_04
	25	- /usr/lib/j2sdk1.4-sun/bin
	26	- /usr/java/j2sdk1.4.2_09/bin
	27	- /usr/lib/j2sdk1.5-sun/bin
	28	- /opt/sun-jdk-1.5.0.04/bin
	29	- /usr/local/jdk-1.7.0/bin
	30	- /usr/local/jdk-1.6.0/bin
	31	+ /usr/jdk/latest/bin
	32	+ /usr/jdk/openjdk1.8.0/bin
	33	+ /usr/jdk/openjdk1.7.0/bin
	34	)
	35	# if no compiler has been specified yet, then look for one
	36	if(CMAKE_Java_COMPILER_INIT)
	37	--- cmake-3.11.3/Modules/FindJava.cmake.orig 2018-06-04 19:13:02.566853874 +0000
	38	+++ cmake-3.11.3/Modules/FindJava.cmake 2018-06-04 19:23:26.243740666 +0000
	39	@@ -128,17 +128,10 @@
	40	# Hard-coded guesses should still go in PATHS. This ensures that the user
	41	# environment can always override hard guesses.
	42	set(_JAVA_PATHS
	43	- /usr/lib/java/bin
	44	- /usr/share/java/bin
	45	- /usr/local/java/bin
	46	- /usr/local/java/share/bin
	47	- /usr/java/j2sdk1.4.2_04
	48	- /usr/lib/j2sdk1.4-sun/bin
	49	- /usr/java/j2sdk1.4.2_09/bin
	50	- /usr/lib/j2sdk1.5-sun/bin
	51	- /opt/sun-jdk-1.5.0.04/bin
	52	- /usr/local/jdk-1.7.0/bin
	53	- /usr/local/jdk-1.6.0/bin
	54	+ /usr/bin
	55	+ /usr/jdk/latest/bin
	56	+ /usr/jdk/openjdk1.8.0/bin
	57	+ /usr/jdk/openjdk1.7.0/bin
567766	58	)
e12e8f	59	find_program(Java_JAVA_EXECUTABLE
AL	60	NAMES java
	61	--- cmake-3.11.3/Modules/FindIce.cmake.orig 2018-06-04 19:13:02.587162341 +0000
	62	+++ cmake-3.11.3/Modules/FindIce.cmake 2018-06-04 19:19:29.168461709 +0000
	63	@@ -408,7 +408,7 @@
	64	# In common use on Linux, MacOS X (homebrew) and FreeBSD; prefer
	65	# version-specific dir
	66	list(APPEND ice_slice_paths
	67	- /usr/local/share /usr/share)
	68	+ /usr/share)
	69	list(APPEND ice_slice_suffixes
	70	"Ice-${Ice_VERSION_SLICE2CPP_FULL}/slice"
	71	"Ice-${Ice_VERSION_SLICE2CPP_SHORT}/slice"
	72	--- cmake-3.11.3/Modules/FindQt.cmake.orig 2018-06-04 19:13:02.531675148 +0000
	73	+++ cmake-3.11.3/Modules/FindQt.cmake 2018-06-04 19:38:29.010903484 +0000
	74	@@ -105,10 +105,8 @@
567766	75	"[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/include/Qt"
AW	76	${qt_headers}/Qt
	77	$ENV{QTDIR}/include/Qt
e12e8f	78	+ /usr/lib/qt/4.8/include/Qt
567766	79	/usr/lib/qt/include/Qt
e12e8f	80	- /usr/share/qt4/include/Qt
567766	81	- /usr/local/include/X11/qt4/Qt
e12e8f	82	- C:/Progra~1/qt/include/Qt
AL	83	PATH_SUFFIXES qt/include/Qt include/Qt)
567766	84
AW	85	if(QT4_QGLOBAL_H_FILE)
e12e8f	86	--- cmake-3.11.3/Modules/UseJava.cmake.orig 2018-06-04 19:13:02.577337570 +0000
AL	87	+++ cmake-3.11.3/Modules/UseJava.cmake 2018-06-04 19:39:02.131449893 +0000
	88	@@ -896,7 +896,6 @@
567766	89	set(_jar_versions)
AW	90	set(_jar_paths
	91	/usr/share/java/
	92	- /usr/local/share/java/
	93	${Java_JAR_PATHS})
	94	set(_jar_doc "NOTSET")
	95
082e69	96	--- cmake-3.25.0/Modules/FindGTK2.cmake.orig 2022-11-16 15:42:03.000000000 +0000
AW	97	+++ cmake-3.25.0/Modules/FindGTK2.cmake 2022-11-17 11:10:21.464644803 +0000
	98	@@ -301,21 +301,7 @@
63ce3e	99	find_path(GTK2_${_var}_INCLUDE_DIR ${_hdr}
AL	100	PATHS
	101	${_gtk2_arch_dir}
	102	- /usr/local/libx32
	103	- /usr/local/lib64
	104	- /usr/local/lib
	105	- /usr/libx32
	106	- /usr/lib64
	107	/usr/lib
	108	- /opt/gnome/include
	109	- /opt/gnome/lib
	110	- /opt/openwin/include
	111	- /usr/openwin/lib
	112	- /sw/lib
	113	- /opt/local/lib
082e69	114	- /opt/homebrew/lib
63ce3e	115	- /usr/pkg/lib
AL	116	- /usr/pkg/include/glib
	117	$ENV{GTKMM_BASEPATH}/include
	118	$ENV{GTKMM_BASEPATH}/lib
	119	[HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/include
fa1788	120	--- cmake-3.26.0/Modules/CMakeDetermineSystem.cmake.orig 2023-03-14 15:04:14.000000000 +0100
AW	121	+++ cmake-3.26.0/Modules/CMakeDetermineSystem.cmake 2023-03-19 19:28:16.553347338 +0100
	122	@@ -33,7 +33,7 @@
	123
	124	# find out on which system cmake runs
	125	if(CMAKE_HOST_UNIX)
	126	- find_program(CMAKE_UNAME NAMES uname PATHS /bin /usr/bin /usr/local/bin)
	127	+ find_program(CMAKE_UNAME NAMES uname PATHS /bin /usr/bin)
	128	if(CMAKE_UNAME)
	129	if(CMAKE_HOST_SYSTEM_NAME STREQUAL "AIX")
	130	execute_process(COMMAND ${CMAKE_UNAME} -v
46e90f	131	--- cmake-3.29.0/Modules/CMakeGenericSystem.cmake.orig 2024-03-21 14:32:22.000000000 +0100
AW	132	+++ cmake-3.29.0/Modules/CMakeGenericSystem.cmake 2024-03-25 10:57:38.641790129 +0100
	133	@@ -189,7 +189,7 @@
	134	# If CMAKE_INSTALL_PREFIX env variable is not set,
	135	# choose a default install prefix for this platform.
	136	if(CMAKE_HOST_UNIX)
	137	- set(CMAKE_INSTALL_PREFIX "/usr/local"
	138	+ set(CMAKE_INSTALL_PREFIX "/usr"
	139	CACHE PATH "Install path prefix, prepended onto install directories.")
	140	else()
	141	GetDefaultWindowsPrefixBase(CMAKE_GENERIC_PROGRAM_FILES)