gnu: icedtea-7: Support non-Intel systems.
This is a followup to 1b6f99ea53.
* gnu/packages/java.scm (icedtea-7)[arguments]: In 'install-libjvm'
phase, match armhf and aarch64.
[supported-systems]: New field.
			
			
This commit is contained in:
		
							parent
							
								
									4261a9d162
								
							
						
					
					
						commit
						d3e22bcc11
					
				
					 1 changed files with 11 additions and 1 deletions
				
			
		|  | @ -1377,11 +1377,17 @@ bootstrapping purposes.") | |||
|              (lambda* (#:key inputs outputs #:allow-other-keys) | ||||
|                (let* ((lib-path (string-append (assoc-ref outputs "out") | ||||
|                                                "/lib/" | ||||
|                                                ;; See 'INSTALL_ARCH_DIR' in | ||||
|                                                ;; 'configure'. | ||||
|                                                ,(match (%current-system) | ||||
|                                                   ("i686-linux" | ||||
|                                                    "i386") | ||||
|                                                   ("x86_64-linux" | ||||
|                                                    "amd64"))))) | ||||
|                                                    "amd64") | ||||
|                                                   ("armhf-linux" | ||||
|                                                    "arm") | ||||
|                                                   ("aarch64-linux" | ||||
|                                                    "aarch64"))))) | ||||
|                  (symlink (string-append lib-path "/server/libjvm.so") | ||||
|                           (string-append lib-path "/libjvm.so"))) | ||||
|                #t)) | ||||
|  | @ -1529,6 +1535,10 @@ bootstrapping purposes.") | |||
|       (description | ||||
|        "This package provides the Java development kit OpenJDK built with the | ||||
| IcedTea build harness.") | ||||
| 
 | ||||
|       ;; 'configure' lists "mips" and "mipsel", but not "mips64el'. | ||||
|       (supported-systems (delete "mips64el-linux" %supported-systems)) | ||||
| 
 | ||||
|       ;; IcedTea is released under the GPL2 + Classpath exception, which is the | ||||
|       ;; same license as both GNU Classpath and OpenJDK. | ||||
|       (license license:gpl2+)))) | ||||
|  |  | |||
		Reference in a new issue