[PATCH] gnu: signon-plugin-oauth2: Fix installing in a doubled prefix.

  • Done
  • quality assurance status badge
Details
2 participants
  • Christopher Baines
  • Sughosha
Owner
unassigned
Submitted by
Sughosha
Severity
normal

Debbugs page

S
S
Sughosha wrote on 7 Apr 04:37 -0700
(address . guix-patches@gnu.org)(name . Sughosha)(address . sughosha@disroot.org)
c8ef5a9e6e6a641b2400c02b1dcef49d9f393ec0.1712489842.git.sughosha@disroot.org
This commit fixes creating one more /gnu/store/ directory inside its
own prefix, creating again the same prefix inside it and then
installing in it.

* gnu/packages/qt.scm (signon-plugin-oauth2)[arguments]:
<#:make-flags>: Remove argument.
<#:phases>: In configure phase, add SIGNON_PLUGINS_DIR variable.

Change-Id: I10e973980228354c9943741dd480544bffca65b8
---
gnu/packages/qt.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

Toggle diff (27 lines)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 1440c6981c..19185c3f6a 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -5327,7 +5327,6 @@ (define-public signon-plugin-oauth2
(inputs (list signond))
(arguments
(list #:tests? #f ;no tests
- #:make-flags #~(list (string-append "INSTALL_ROOT=" #$output))
#:phases
#~(modify-phases %standard-phases
(replace 'configure
@@ -5337,7 +5336,9 @@ (define-public signon-plugin-oauth2
""))
(invoke "qmake"
(string-append "PREFIX=" #$output)
- (string-append "LIBDIR=" #$output "/lib")))))))
+ (string-append "LIBDIR=" #$output "/lib")
+ (string-append "SIGNON_PLUGINS_DIR=" #$output
+ "/lib")))))))
(synopsis "OAuth 2 plugin for signon")
(description
"This plugin for the Accounts-SSO SignOn daemon handles the OAuth

base-commit: 188d18fc47f0d38edfe06e3e5834fa8587bd300b
--
2.41.0
S
S
Sughosha wrote on 7 Apr 05:00 -0700
[PATCH v2] gnu: signon-plugin-oauth2: Fix installing in a doubled prefix.
(address . 70256@debbugs.gnu.org)(name . Sughosha)(address . sughosha@disroot.org)
8547d453e8502c23a6cdcf2f42330f3032c26904.1712491078.git.sughosha@disroot.org
This commit fixes creating one more /gnu/store/ directory inside its
own prefix, creating again the same prefix inside it and then
installing in it.

* gnu/packages/qt.scm (signon-plugin-oauth2)[arguments]:
<#:make-flags>: Remove argument.
<#:phases>: In configure phase, add SIGNON_PLUGINS_DIR variable.

Change-Id: Id67cdca7d9edc543a9bcfee4a8ae860acd87d125
---
gnu/packages/qt.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

Toggle diff (27 lines)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 1440c6981c..19185c3f6a 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -5327,7 +5327,6 @@ (define-public signon-plugin-oauth2
(inputs (list signond))
(arguments
(list #:tests? #f ;no tests
- #:make-flags #~(list (string-append "INSTALL_ROOT=" #$output))
#:phases
#~(modify-phases %standard-phases
(replace 'configure
@@ -5337,7 +5336,9 @@ (define-public signon-plugin-oauth2
""))
(invoke "qmake"
(string-append "PREFIX=" #$output)
- (string-append "LIBDIR=" #$output "/lib")))))))
+ (string-append "LIBDIR=" #$output "/lib")
+ (string-append "SIGNON_PLUGINS_DIR=" #$output
+ "/lib")))))))
(synopsis "OAuth 2 plugin for signon")
(description
"This plugin for the Accounts-SSO SignOn daemon handles the OAuth

base-commit: 188d18fc47f0d38edfe06e3e5834fa8587bd300b
--
2.41.0
S
S
Sughosha wrote on 7 Apr 06:13 -0700
[PATCH v3] gnu: signon-plugin-oauth2: Fix installing in a doubled prefix.
(address . 70256@debbugs.gnu.org)(name . Sughosha)(address . sughosha@disroot.org)
39f79b5440b54301d610ec1240a8ad5e3bef3e71.1712495595.git.sughosha@disroot.org
This commit fixes creating one more /gnu/store/ directory inside its
own prefix, creating again the same prefix inside it and then
installing in it.

* gnu/packages/qt.scm (signon-plugin-oauth2)[arguments]:
<#:make-flags>: Remove argument.
<#:phases>: In configure phase, add SIGNON_PLUGINS_DIR variable.

Change-Id: Ie7694690c320a95fd9bcc02cb39cd64007f0e979
---
gnu/packages/qt.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

Toggle diff (27 lines)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 1440c6981c..4a4f6b285d 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -5327,7 +5327,6 @@ (define-public signon-plugin-oauth2
(inputs (list signond))
(arguments
(list #:tests? #f ;no tests
- #:make-flags #~(list (string-append "INSTALL_ROOT=" #$output))
#:phases
#~(modify-phases %standard-phases
(replace 'configure
@@ -5337,7 +5336,9 @@ (define-public signon-plugin-oauth2
""))
(invoke "qmake"
(string-append "PREFIX=" #$output)
- (string-append "LIBDIR=" #$output "/lib")))))))
+ (string-append "LIBDIR=" #$output "/lib")
+ (string-append "SIGNON_PLUGINS_DIR=" #$output
+ "/lib/signon")))))))
(synopsis "OAuth 2 plugin for signon")
(description
"This plugin for the Accounts-SSO SignOn daemon handles the OAuth

base-commit: 188d18fc47f0d38edfe06e3e5834fa8587bd300b
--
2.41.0
C
C
Christopher Baines wrote on 15 Apr 02:34 -0700
(name . Sughosha via Guix-patches via)(address . guix-patches@gnu.org)
87mspvynnm.fsf@cbaines.net
Sughosha via Guix-patches via <guix-patches@gnu.org> writes:

Toggle quote (13 lines)
> This commit fixes creating one more /gnu/store/ directory inside its
> own prefix, creating again the same prefix inside it and then
> installing in it.
>
> * gnu/packages/qt.scm (signon-plugin-oauth2)[arguments]:
> <#:make-flags>: Remove argument.
> <#:phases>: In configure phase, add SIGNON_PLUGINS_DIR variable.
>
> Change-Id: Ie7694690c320a95fd9bcc02cb39cd64007f0e979
> ---
> gnu/packages/qt.scm | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)

Looks good to me, I've pushed this to master as
8a257582e3366b37ab7651198fc4c8912c520b37.

Chris
-----BEGIN PGP SIGNATURE-----

iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmYc9L1fFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh
aW5lcy5uZXQACgkQXiijOwuE9XcnNBAArYlwkyUuMJ/jZCMwhqVI86FuR4a87bBO
H2qjKEwRQ96jyGZXs0M/cnar+arX0ndc11Us94i5gUSfS9r46Bodu1lRh3COL1m1
RG6FVOIInYFL7VYUGWVl/jGE8CIuEuyRjiQwAo7TEl0nuv5hasCCWpgfyeSF2dNC
9OXW7da4gxkHKXwNoGb5hEDGJmmu1flu//u2mPINY6KGJ21LPizysuzaQlN1sgYp
8Brj18ATqmx8sQ+qURRWLbg2OVGyajPci7TuQqQ7fYff6Ql6iQPTKGEqAhAYsZ9V
t9I0C4Dj5AS8KmmGcBy8DqFS4n8Icnc97lHJydBDilvSBLT8HyMl2uqNUXG0eaf/
Qbhq/o7nr8LhJasxLx0wzHs4nKRAFkUvJaExdPMQW+4zxfLJVFzOkbghPQoPihim
JgzS5muh7OWs6F1U+hYic1hPZKUZVvcrYrMOAvwL1y71Ctd25/Z5oVWwLASlfoQ5
i9DN9BKSgSPJKgGjH3pvm+Tpkt45XHArxMpwYv75kiRnWF9YvR0O/Gt4YX4u4kkr
Op9vI72dE3cwCKZx9aGgpR6sZcqpIt1u/BuVEdNNOZo1+UxlYFGvfqNdMXt6Athl
+jngYBR7Gsj3QExAr2AbS+rTPk1U1EjnyoG+Qq1faaX9jLmK2/CfL4l14J4jJBuu
FeTjjSzvHak=
=2HJ2
-----END PGP SIGNATURE-----

S
S
Sughosha wrote on 16 Apr 01:10 -0700
Re: [bug#70256] [PATCH v3] gnu: signon-plugi n-oauth2: Fix installing in a doubled prefix.
(address . 70256@debbugs.gnu.org)
DAF179C5-1AE3-41E3-BCB9-F71BBD5F3257@disroot.org
-------- Original Message --------
From: Sughosha <sughosha@disroot.org>
Sent: 16 April 2024 1:31:05 pm IST
To: Christopher Baines <mail@cbaines.net>
Subject: Re: [bug#70256] [PATCH v3] gnu: signon-plugin-oauth2: Fix installing in a doubled prefix.

On 15 April 2024 3:04:53 pm IST, Christopher Baines <mail@cbaines.net> wrote:
Toggle quote (20 lines)
>Sughosha via Guix-patches via <guix-patches@gnu.org> writes:
>
>> This commit fixes creating one more /gnu/store/ directory inside its
>> own prefix, creating again the same prefix inside it and then
>> installing in it.
>>
>> * gnu/packages/qt.scm (signon-plugin-oauth2)[arguments]:
>> <#:make-flags>: Remove argument.
>> <#:phases>: In configure phase, add SIGNON_PLUGINS_DIR variable.
>>
>> Change-Id: Ie7694690c320a95fd9bcc02cb39cd64007f0e979
>> ---
>> gnu/packages/qt.scm | 5 +++--
>> 1 file changed, 3 insertions(+), 2 deletions(-)
>
>Looks good to me, I've pushed this to master as
>8a257582e3366b37ab7651198fc4c8912c520b37.
>
>Chris

Thanks for pushing, but it seems that you did not push the v3 patch, which should install the signon library in /lib/signon instead of installing in /lib.
?
Your comment

This issue is archived.

To comment on this conversation send an email to 70256@patchwise.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 70256
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch