* [bug#66733] [PATCH] gnu: abseil-cpp: Add to 20230802.1.
@ 2023-10-24 19:23 Greg Hogan
2023-10-24 19:37 ` [bug#66733] [PATCH v2] gnu: abseil-cpp: Update " Greg Hogan
2023-11-27 19:19 ` [bug#66733] [PATCH v3] " Greg Hogan
0 siblings, 2 replies; 5+ messages in thread
From: Greg Hogan @ 2023-10-24 19:23 UTC (permalink / raw)
To: 66733; +Cc: Greg Hogan
* gnu/packages/cpp.scm (abseil-cpp): Update to 20230802.1.
[arguments]<#:phases>: Add phase to set timezone environment variable.
* gnu/packages/cpp.scm (abseil-cpp-20220623.1): Keep old version.
* gnu/packages/cpp.scm (abseil-cpp-for-c++-standard): Accept package to
inherit from.
* gnu/packages/cpp.scm (abseil-cpp-cxxstd11, abseil-cpp-cxxstd17):
Inherit from latest supported version.
---
gnu/packages/cpp.scm | 50 ++++++++++++++++++++++++++++++++------------
1 file changed, 37 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index cfeb1c009a..815442314f 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -1223,7 +1223,7 @@ (define-public abseil-cpp-20211102.0
((#:configure-flags flags)
#~(cons* "-DCMAKE_CXX_STANDARD=11" #$flags)))))))
-(define-public abseil-cpp
+(define-public abseil-cpp-20220623.1
(let ((base abseil-cpp-20200923.3))
(package
(inherit base)
@@ -1244,22 +1244,46 @@ (define-public abseil-cpp
`(cons* "-DABSL_BUILD_TESTING=ON"
(delete "-DABSL_RUN_TESTS=ON" ,flags))))))))
-(define (abseil-cpp-for-c++-standard version)
- (let ((base abseil-cpp))
- (hidden-package
- (package/inherit base
- (arguments
- (substitute-keyword-arguments (package-arguments base)
- ((#:configure-flags flags)
- #~(cons* #$(string-append "-DCMAKE_CXX_STANDARD="
- (number->string version))
- #$flags))))))))
+(define-public abseil-cpp
+ (let ((base abseil-cpp-20220623.1))
+ (package
+ (inherit base)
+ (name "abseil-cpp")
+ (version "20230802.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/abseil/abseil-cpp")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1ydkkbanrpkp5i814arzsk973kyzhhjhagnp392rq6rrv16apldq"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments base)
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ (add-before 'check 'set-env-vars
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; absl_time_test requires this environment variable.
+ (setenv "TZDIR" (string-append (assoc-ref %build-inputs "source")
+ "/absl/time/internal/cctz/testdata/zoneinfo")))))))))))
+
+(define (abseil-cpp-for-c++-standard base version)
+ (hidden-package
+ (package/inherit base
+ (arguments
+ (substitute-keyword-arguments (package-arguments base)
+ ((#:configure-flags flags)
+ #~(cons* #$(string-append "-DCMAKE_CXX_STANDARD="
+ (number->string version))
+ #$flags)))))))
(define-public abseil-cpp-cxxstd17
- (abseil-cpp-for-c++-standard 17)) ;XXX: the default with GCC 11?
+ (abseil-cpp-for-c++-standard abseil-cpp 17)) ;XXX: the default with GCC 11?
(define-public abseil-cpp-cxxstd11
- (abseil-cpp-for-c++-standard 11))
+ (abseil-cpp-for-c++-standard abseil-cpp-20220623.1 11)) ;last version on C++11
(define-public pegtl
(package
--
2.41.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#66733] [PATCH v2] gnu: abseil-cpp: Update to 20230802.1.
2023-10-24 19:23 [bug#66733] [PATCH] gnu: abseil-cpp: Add to 20230802.1 Greg Hogan
@ 2023-10-24 19:37 ` Greg Hogan
2023-11-22 14:41 ` Ludovic Courtès
2023-11-27 19:19 ` [bug#66733] [PATCH v3] " Greg Hogan
1 sibling, 1 reply; 5+ messages in thread
From: Greg Hogan @ 2023-10-24 19:37 UTC (permalink / raw)
To: 66733; +Cc: Greg Hogan
v2: fix for wording in commit header.
* gnu/packages/cpp.scm (abseil-cpp): Update to 20230802.1.
[arguments]<#:phases>: Add phase to set timezone environment variable.
* gnu/packages/cpp.scm (abseil-cpp-20220623.1): Keep old version.
* gnu/packages/cpp.scm (abseil-cpp-for-c++-standard): Accept package to
inherit from.
* gnu/packages/cpp.scm (abseil-cpp-cxxstd11, abseil-cpp-cxxstd17):
Inherit from latest supported version.
---
gnu/packages/cpp.scm | 50 ++++++++++++++++++++++++++++++++------------
1 file changed, 37 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index cfeb1c009a..815442314f 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -1223,7 +1223,7 @@ (define-public abseil-cpp-20211102.0
((#:configure-flags flags)
#~(cons* "-DCMAKE_CXX_STANDARD=11" #$flags)))))))
-(define-public abseil-cpp
+(define-public abseil-cpp-20220623.1
(let ((base abseil-cpp-20200923.3))
(package
(inherit base)
@@ -1244,22 +1244,46 @@ (define-public abseil-cpp
`(cons* "-DABSL_BUILD_TESTING=ON"
(delete "-DABSL_RUN_TESTS=ON" ,flags))))))))
-(define (abseil-cpp-for-c++-standard version)
- (let ((base abseil-cpp))
- (hidden-package
- (package/inherit base
- (arguments
- (substitute-keyword-arguments (package-arguments base)
- ((#:configure-flags flags)
- #~(cons* #$(string-append "-DCMAKE_CXX_STANDARD="
- (number->string version))
- #$flags))))))))
+(define-public abseil-cpp
+ (let ((base abseil-cpp-20220623.1))
+ (package
+ (inherit base)
+ (name "abseil-cpp")
+ (version "20230802.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/abseil/abseil-cpp")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1ydkkbanrpkp5i814arzsk973kyzhhjhagnp392rq6rrv16apldq"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments base)
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ (add-before 'check 'set-env-vars
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; absl_time_test requires this environment variable.
+ (setenv "TZDIR" (string-append (assoc-ref %build-inputs "source")
+ "/absl/time/internal/cctz/testdata/zoneinfo")))))))))))
+
+(define (abseil-cpp-for-c++-standard base version)
+ (hidden-package
+ (package/inherit base
+ (arguments
+ (substitute-keyword-arguments (package-arguments base)
+ ((#:configure-flags flags)
+ #~(cons* #$(string-append "-DCMAKE_CXX_STANDARD="
+ (number->string version))
+ #$flags)))))))
(define-public abseil-cpp-cxxstd17
- (abseil-cpp-for-c++-standard 17)) ;XXX: the default with GCC 11?
+ (abseil-cpp-for-c++-standard abseil-cpp 17)) ;XXX: the default with GCC 11?
(define-public abseil-cpp-cxxstd11
- (abseil-cpp-for-c++-standard 11))
+ (abseil-cpp-for-c++-standard abseil-cpp-20220623.1 11)) ;last version on C++11
(define-public pegtl
(package
--
2.41.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#66733] [PATCH v2] gnu: abseil-cpp: Update to 20230802.1.
2023-10-24 19:37 ` [bug#66733] [PATCH v2] gnu: abseil-cpp: Update " Greg Hogan
@ 2023-11-22 14:41 ` Ludovic Courtès
0 siblings, 0 replies; 5+ messages in thread
From: Ludovic Courtès @ 2023-11-22 14:41 UTC (permalink / raw)
To: Greg Hogan; +Cc: 66733
Hi,
Greg Hogan <code@greghogan.com> skribis:
> v2: fix for wording in commit header.
>
> * gnu/packages/cpp.scm (abseil-cpp): Update to 20230802.1.
> [arguments]<#:phases>: Add phase to set timezone environment variable.
> * gnu/packages/cpp.scm (abseil-cpp-20220623.1): Keep old version.
> * gnu/packages/cpp.scm (abseil-cpp-for-c++-standard): Accept package to
> inherit from.
> * gnu/packages/cpp.scm (abseil-cpp-cxxstd11, abseil-cpp-cxxstd17):
> Inherit from latest supported version.
[...]
> + #~(modify-phases #$phases
> + (add-before 'check 'set-env-vars
> + (lambda* (#:key inputs #:allow-other-keys)
> + ;; absl_time_test requires this environment variable.
> + (setenv "TZDIR" (string-append (assoc-ref %build-inputs "source")
This could be written like so:
(setenv "TZDIR" (string-append #$(package-source this-package) …))
or referring to ‘inputs’ rather than ‘%build-inputs’.
Apart from that, it LGTM… but time has passed and it no longer
applies. :-/
Could you rebase it and resend?
Thanks and apologies for the delay!
Ludo’.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [bug#66733] [PATCH v3] gnu: abseil-cpp: Update to 20230802.1.
2023-10-24 19:23 [bug#66733] [PATCH] gnu: abseil-cpp: Add to 20230802.1 Greg Hogan
2023-10-24 19:37 ` [bug#66733] [PATCH v2] gnu: abseil-cpp: Update " Greg Hogan
@ 2023-11-27 19:19 ` Greg Hogan
2023-12-04 20:55 ` bug#66733: " Ludovic Courtès
1 sibling, 1 reply; 5+ messages in thread
From: Greg Hogan @ 2023-11-27 19:19 UTC (permalink / raw)
To: 66733; +Cc: Greg Hogan
v3: rebase and fix for gexp per Ludo'.
* gnu/packages/cpp.scm (abseil-cpp): Update to 20230802.1.
[arguments]<#:phases>: Add phase to set timezone environment variable.
* gnu/packages/cpp.scm (abseil-cpp-20220623.1): Keep old version.
* gnu/packages/cpp.scm (abseil-cpp-for-c++-standard): Accept package to
inherit from.
* gnu/packages/cpp.scm (abseil-cpp-cxxstd11, abseil-cpp-cxxstd17):
Inherit from latest supported version.
---
gnu/packages/cpp.scm | 50 ++++++++++++++++++++++++++++++++------------
1 file changed, 37 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 5e35a03254..2cfb89eb2c 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -1263,7 +1263,7 @@ (define-public abseil-cpp-20211102.0
((#:configure-flags flags)
#~(cons* "-DCMAKE_CXX_STANDARD=11" #$flags)))))))
-(define-public abseil-cpp
+(define-public abseil-cpp-20220623.1
(let ((base abseil-cpp-20200923.3))
(package
(inherit base)
@@ -1284,16 +1284,40 @@ (define-public abseil-cpp
`(cons* "-DABSL_BUILD_TESTING=ON"
(delete "-DABSL_RUN_TESTS=ON" ,flags))))))))
-(define (abseil-cpp-for-c++-standard version)
- (let ((base abseil-cpp))
- (hidden-package
- (package/inherit base
- (arguments
- (substitute-keyword-arguments (package-arguments base)
- ((#:configure-flags flags)
- #~(cons* #$(string-append "-DCMAKE_CXX_STANDARD="
- (number->string version))
- #$flags))))))))
+(define-public abseil-cpp
+ (let ((base abseil-cpp-20220623.1))
+ (package
+ (inherit base)
+ (name "abseil-cpp")
+ (version "20230802.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/abseil/abseil-cpp")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1ydkkbanrpkp5i814arzsk973kyzhhjhagnp392rq6rrv16apldq"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments base)
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ (add-before 'check 'set-env-vars
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; absl_time_test requires this environment variable.
+ (setenv "TZDIR" (string-append #$(package-source base)
+ "/absl/time/internal/cctz/testdata/zoneinfo")))))))))))
+
+(define (abseil-cpp-for-c++-standard base version)
+ (hidden-package
+ (package/inherit base
+ (arguments
+ (substitute-keyword-arguments (package-arguments base)
+ ((#:configure-flags flags)
+ #~(cons* #$(string-append "-DCMAKE_CXX_STANDARD="
+ (number->string version))
+ #$flags)))))))
(define (make-static-abseil-cpp version)
(let ((base abseil-cpp))
@@ -1306,10 +1330,10 @@ (define (make-static-abseil-cpp version)
(delete "-DBUILD_SHARED_LIBS=ON" #$flags)))))))))
(define-public abseil-cpp-cxxstd17
- (abseil-cpp-for-c++-standard 17)) ;XXX: the default with GCC 11?
+ (abseil-cpp-for-c++-standard abseil-cpp 17)) ;XXX: the default with GCC 11?
(define-public abseil-cpp-cxxstd11
- (abseil-cpp-for-c++-standard 11))
+ (abseil-cpp-for-c++-standard abseil-cpp-20220623.1 11)) ;last version on C++11
(define-public static-abseil-cpp
(make-static-abseil-cpp abseil-cpp))
--
2.40.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* bug#66733: [PATCH v3] gnu: abseil-cpp: Update to 20230802.1.
2023-11-27 19:19 ` [bug#66733] [PATCH v3] " Greg Hogan
@ 2023-12-04 20:55 ` Ludovic Courtès
0 siblings, 0 replies; 5+ messages in thread
From: Ludovic Courtès @ 2023-12-04 20:55 UTC (permalink / raw)
To: Greg Hogan; +Cc: 66733-done
Hi,
Greg Hogan <code@greghogan.com> skribis:
> v3: rebase and fix for gexp per Ludo'.
>
> * gnu/packages/cpp.scm (abseil-cpp): Update to 20230802.1.
> [arguments]<#:phases>: Add phase to set timezone environment variable.
> * gnu/packages/cpp.scm (abseil-cpp-20220623.1): Keep old version.
> * gnu/packages/cpp.scm (abseil-cpp-for-c++-standard): Accept package to
> inherit from.
> * gnu/packages/cpp.scm (abseil-cpp-cxxstd11, abseil-cpp-cxxstd17):
> Inherit from latest supported version.
Applied, thanks!
Ludo’.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-12-04 20:56 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-24 19:23 [bug#66733] [PATCH] gnu: abseil-cpp: Add to 20230802.1 Greg Hogan
2023-10-24 19:37 ` [bug#66733] [PATCH v2] gnu: abseil-cpp: Update " Greg Hogan
2023-11-22 14:41 ` Ludovic Courtès
2023-11-27 19:19 ` [bug#66733] [PATCH v3] " Greg Hogan
2023-12-04 20:55 ` bug#66733: " Ludovic Courtès
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).