[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: gnu: Add gcc-{objc,objc++}-{9,10}.
|
From: |
guix-commits |
|
Subject: |
branch master updated: gnu: Add gcc-{objc,objc++}-{9,10}. |
|
Date: |
Tue, 30 Jun 2020 07:18:33 -0400 |
This is an automated email from the git hooks/post-receive script.
niedzejkob pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new 14cce84 gnu: Add gcc-{objc,objc++}-{9,10}.
14cce84 is described below
commit 14cce84ca77f11b182ee2d5c3ed99271b2a74b53
Author: Jakub Kądziołka <kuba@kadziolka.net>
AuthorDate: Tue Jun 30 13:06:09 2020 +0200
gnu: Add gcc-{objc,objc++}-{9,10}.
* gnu/packages/gcc.scm (%objc-search-paths, %objc++-search-paths): New
variables.
(gcc-objc-4.8, gcc-objc-4.9, gcc-objc-5, gcc-objc-6, gcc-objc-7,
gcc-objc-8, gcc-objc++-4.8, gcc-objc++-4.9, gcc-objc++-5, gcc-objc++-6,
gcc-objc++-7, gcc-objc++-8): Don't duplicate the search path list.
(gcc-objc-9, gcc-objc-10, gcc-objc++-9, gcc-objc++-10): New variables.
---
gnu/packages/gcc.scm | 116 +++++++++++++++++++--------------------------------
1 file changed, 44 insertions(+), 72 deletions(-)
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index 31d88f2..9e88109 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -728,115 +728,87 @@ as the 'native-search-paths' field."
;; a cyclic dependency. <http://debbugs.gnu.org/18101>
#:separate-lib-output? #f))
+(define %objc-search-paths
+ (list (search-path-specification
+ (variable "OBJC_INCLUDE_PATH")
+ (files '("include")))
+ (search-path-specification
+ (variable "LIBRARY_PATH")
+ (files '("lib" "lib64")))))
+
(define-public gcc-objc-4.8
(custom-gcc gcc-4.8 "gcc-objc" '("objc")
- (list (search-path-specification
- (variable "OBJC_INCLUDE_PATH")
- (files '("include")))
- (search-path-specification
- (variable "LIBRARY_PATH")
- (files '("lib" "lib64"))))))
+ %objc-search-paths))
(define-public gcc-objc-4.9
(custom-gcc gcc-4.9 "gcc-objc" '("objc")
- (list (search-path-specification
- (variable "OBJC_INCLUDE_PATH")
- (files '("include")))
- (search-path-specification
- (variable "LIBRARY_PATH")
- (files '("lib" "lib64"))))))
+ %objc-search-paths))
(define-public gcc-objc-5
(custom-gcc gcc-5 "gcc-objc" '("objc")
- (list (search-path-specification
- (variable "OBJC_INCLUDE_PATH")
- (files '("include")))
- (search-path-specification
- (variable "LIBRARY_PATH")
- (files '("lib" "lib64"))))))
+ %objc-search-paths))
(define-public gcc-objc-6
(custom-gcc gcc-6 "gcc-objc" '("objc")
- (list (search-path-specification
- (variable "OBJC_INCLUDE_PATH")
- (files '("include")))
- (search-path-specification
- (variable "LIBRARY_PATH")
- (files '("lib" "lib64"))))))
+ %objc-search-paths))
(define-public gcc-objc-7
(custom-gcc gcc-7 "gcc-objc" '("objc")
- (list (search-path-specification
- (variable "OBJC_INCLUDE_PATH")
- (files '("include")))
- (search-path-specification
- (variable "LIBRARY_PATH")
- (files '("lib" "lib64"))))))
+ %objc-search-paths))
(define-public gcc-objc-8
(custom-gcc gcc-8 "gcc-objc" '("objc")
- (list (search-path-specification
- (variable "OBJC_INCLUDE_PATH")
- (files '("include")))
- (search-path-specification
- (variable "LIBRARY_PATH")
- (files '("lib" "lib64"))))))
+ %objc-search-paths))
+
+(define-public gcc-objc-9
+ (custom-gcc gcc-9 "gcc-objc" '("objc")
+ %objc-search-paths))
+
+(define-public gcc-objc-10
+ (custom-gcc gcc-10 "gcc-objc" '("objc")
+ %objc-search-paths))
(define-public gcc-objc gcc-objc-7)
+(define %objc++-search-paths
+ (list (search-path-specification
+ (variable "OBJCPLUS_INCLUDE_PATH")
+ (files '("include")))
+ (search-path-specification
+ (variable "LIBRARY_PATH")
+ (files '("lib" "lib64")))))
+
(define-public gcc-objc++-4.8
(custom-gcc gcc-4.8 "gcc-objc++" '("obj-c++")
- (list (search-path-specification
- (variable "OBJCPLUS_INCLUDE_PATH")
- (files '("include")))
- (search-path-specification
- (variable "LIBRARY_PATH")
- (files '("lib" "lib64"))))))
+ %objc++-search-paths))
(define-public gcc-objc++-4.9
(custom-gcc gcc-4.9 "gcc-objc++" '("obj-c++")
- (list (search-path-specification
- (variable "OBJCPLUS_INCLUDE_PATH")
- (files '("include")))
- (search-path-specification
- (variable "LIBRARY_PATH")
- (files '("lib" "lib64"))))))
+ %objc++-search-paths))
(define-public gcc-objc++-5
(custom-gcc gcc-5 "gcc-objc++" '("obj-c++")
- (list (search-path-specification
- (variable "OBJCPLUS_INCLUDE_PATH")
- (files '("include")))
- (search-path-specification
- (variable "LIBRARY_PATH")
- (files '("lib" "lib64"))))))
+ %objc++-search-paths))
(define-public gcc-objc++-6
(custom-gcc gcc-6 "gcc-objc++" '("obj-c++")
- (list (search-path-specification
- (variable "OBJCPLUS_INCLUDE_PATH")
- (files '("include")))
- (search-path-specification
- (variable "LIBRARY_PATH")
- (files '("lib" "lib64"))))))
+ %objc++-search-paths))
(define-public gcc-objc++-7
(custom-gcc gcc-7 "gcc-objc++" '("obj-c++")
- (list (search-path-specification
- (variable "OBJCPLUS_INCLUDE_PATH")
- (files '("include")))
- (search-path-specification
- (variable "LIBRARY_PATH")
- (files '("lib" "lib64"))))))
+ %objc++-search-paths))
(define-public gcc-objc++-8
(custom-gcc gcc-8 "gcc-objc++" '("obj-c++")
- (list (search-path-specification
- (variable "OBJCPLUS_INCLUDE_PATH")
- (files '("include")))
- (search-path-specification
- (variable "LIBRARY_PATH")
- (files '("lib" "lib64"))))))
+ %objc++-search-paths))
+
+(define-public gcc-objc++-9
+ (custom-gcc gcc-9 "gcc-objc++" '("obj-c++")
+ %objc++-search-paths))
+
+(define-public gcc-objc++-10
+ (custom-gcc gcc-10 "gcc-objc++" '("obj-c++")
+ %objc++-search-paths))
(define-public gcc-objc++ gcc-objc++-7)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: gnu: Add gcc-{objc,objc++}-{9,10}.,
guix-commits <=