openspeedshop: fixed build on arm. (#11861)
* openspeedshop: fixed build on arm. * remove patch comment.
This commit is contained in:
		
				
					committed by
					
						
						Greg Becker
					
				
			
			
				
	
			
			
			
						parent
						
							8fe5405e1b
						
					
				
				
					commit
					5def1dd39d
				
			@@ -0,0 +1,25 @@
 | 
				
			|||||||
 | 
					diff --git a/plugins/views/iot/iot_view.cxx b/plugins/views/iot/iot_view.cxx
 | 
				
			||||||
 | 
					index f4cdf48..ef1b81f 100644
 | 
				
			||||||
 | 
					--- a/plugins/views/iot/iot_view.cxx
 | 
				
			||||||
 | 
					+++ b/plugins/views/iot/iot_view.cxx
 | 
				
			||||||
 | 
					@@ -45,6 +45,20 @@
 | 
				
			||||||
 | 
					 # endif
 | 
				
			||||||
 | 
					 #endif
 | 
				
			||||||
 | 
					 /* End part 2 of 2 for Hack to get around inconsistent syscall definitions */
 | 
				
			||||||
 | 
					+/* Start Added Hack to get around inconsistent syscall definitions */
 | 
				
			||||||
 | 
					+#ifndef SYS_open
 | 
				
			||||||
 | 
					+#define SYS_open SYS_openat
 | 
				
			||||||
 | 
					+#endif
 | 
				
			||||||
 | 
					+#ifndef SYS_creat
 | 
				
			||||||
 | 
					+#define SYS_creat SYS_openat
 | 
				
			||||||
 | 
					+#endif
 | 
				
			||||||
 | 
					+#ifndef SYS_dup2
 | 
				
			||||||
 | 
					+#define SYS_dup2 SYS_dup3
 | 
				
			||||||
 | 
					+#endif
 | 
				
			||||||
 | 
					+#ifndef SYS_pipe
 | 
				
			||||||
 | 
					+#define SYS_pipe SYS_pipe2
 | 
				
			||||||
 | 
					+#endif
 | 
				
			||||||
 | 
					+/* end Added Hack to get around inconsistent syscall definitions */
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
@@ -142,6 +142,7 @@ class OpenspeedshopUtils(CMakePackage):
 | 
				
			|||||||
    depends_on("mrnet@5.0.1-3:+cti", when='@2.3.1.3:9999+cti', type=('build', 'link', 'run'))
 | 
					    depends_on("mrnet@5.0.1-3:+cti", when='@2.3.1.3:9999+cti', type=('build', 'link', 'run'))
 | 
				
			||||||
    depends_on("mrnet@5.0.1-3:+lwthreads", when='@2.3.1.3:9999', type=('build', 'link', 'run'))
 | 
					    depends_on("mrnet@5.0.1-3:+lwthreads", when='@2.3.1.3:9999', type=('build', 'link', 'run'))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    patch('arm.patch', when='target=aarch64')
 | 
				
			||||||
    parallel = False
 | 
					    parallel = False
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    build_directory = 'build_openspeedshop'
 | 
					    build_directory = 'build_openspeedshop'
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										25
									
								
								var/spack/repos/builtin/packages/openspeedshop/arm.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										25
									
								
								var/spack/repos/builtin/packages/openspeedshop/arm.patch
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,25 @@
 | 
				
			|||||||
 | 
					diff --git a/plugins/views/iot/iot_view.cxx b/plugins/views/iot/iot_view.cxx
 | 
				
			||||||
 | 
					index f4cdf48..ef1b81f 100644
 | 
				
			||||||
 | 
					--- a/plugins/views/iot/iot_view.cxx
 | 
				
			||||||
 | 
					+++ b/plugins/views/iot/iot_view.cxx
 | 
				
			||||||
 | 
					@@ -45,6 +45,20 @@
 | 
				
			||||||
 | 
					 # endif
 | 
				
			||||||
 | 
					 #endif
 | 
				
			||||||
 | 
					 /* End part 2 of 2 for Hack to get around inconsistent syscall definitions */
 | 
				
			||||||
 | 
					+/* Start Added Hack to get around inconsistent syscall definitions */
 | 
				
			||||||
 | 
					+#ifndef SYS_open
 | 
				
			||||||
 | 
					+#define SYS_open SYS_openat
 | 
				
			||||||
 | 
					+#endif
 | 
				
			||||||
 | 
					+#ifndef SYS_creat
 | 
				
			||||||
 | 
					+#define SYS_creat SYS_openat
 | 
				
			||||||
 | 
					+#endif
 | 
				
			||||||
 | 
					+#ifndef SYS_dup2
 | 
				
			||||||
 | 
					+#define SYS_dup2 SYS_dup3
 | 
				
			||||||
 | 
					+#endif
 | 
				
			||||||
 | 
					+#ifndef SYS_pipe
 | 
				
			||||||
 | 
					+#define SYS_pipe SYS_pipe2
 | 
				
			||||||
 | 
					+#endif
 | 
				
			||||||
 | 
					+/* end Added Hack to get around inconsistent syscall definitions */
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
@@ -141,6 +141,7 @@ class Openspeedshop(CMakePackage):
 | 
				
			|||||||
    depends_on("mrnet@5.0.1-3:+cti", when='@2.3.1.3:9999+cti', type=('build', 'link', 'run'))
 | 
					    depends_on("mrnet@5.0.1-3:+cti", when='@2.3.1.3:9999+cti', type=('build', 'link', 'run'))
 | 
				
			||||||
    depends_on("mrnet@5.0.1-3:+lwthreads", when='@2.3.1.3:9999', type=('build', 'link', 'run'))
 | 
					    depends_on("mrnet@5.0.1-3:+lwthreads", when='@2.3.1.3:9999', type=('build', 'link', 'run'))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    patch('arm.patch', when='target=aarch64')
 | 
				
			||||||
    parallel = False
 | 
					    parallel = False
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    build_directory = 'build_openspeedshop'
 | 
					    build_directory = 'build_openspeedshop'
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user