* Changing the prefix for this libpg_query package
@ 2024-02-20 19:46 Marc Coquand
2024-02-25 14:04 ` Tomas Volf
2024-02-25 17:51 ` Felix Lechner via
0 siblings, 2 replies; 4+ messages in thread
From: Marc Coquand @ 2024-02-20 19:46 UTC (permalink / raw)
To: help-guix; +Cc: Marc Coquand
Hey everyone!
I am new to Guix, guile, make and trying to create a package.
I have a functioning patch, attached, but it is not writing to the correct
location.
Currently, it is writing to out/usr/local/, which makes sense, because I can
see in the makefile for libpg_query the following on line 311 of its makefile:
prefix = /usr/local
libdir = $(prefix)/lib
includedir = $(prefix)/include
I know I need to change the prefix to be the guix out directory, but I
am not sure how I can substitute these lines. As you can see in the patch
I attached, I tried to set it as a build flag. However, this did not work.
Any helpers on how to resolve this? :)
Sincerely,
Marc
---
gnu/packages/libpg_query.scm | 63 ++++++++++++++++++++++++++++++++++++
1 file changed, 63 insertions(+)
create mode 100644 gnu/packages/libpg_query.scm
diff --git a/gnu/packages/libpg_query.scm b/gnu/packages/libpg_query.scm
new file mode 100644
index 0000000000..353762554b
--- /dev/null
+++ b/gnu/packages/libpg_query.scm
@@ -0,0 +1,63 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2024 Marc Coquand <marc@mccd.space>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages libpg_query)
+ #:use-module (gnu packages)
+ #:use-module (gnu packages base)
+ #:use-module (gnu packages commencement)
+ #:use-module (guix packages)
+ #:use-module (guix utils)
+ #:use-module (guix download)
+ #:use-module (guix build-system gnu)
+ #:use-module ((guix licenses) #:prefix license:)
+ )
+
+(define-public libpg-query
+ (package
+ (name "libpg-query")
+ (version "16-5.1.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://github.com/pganalyze/libpg_query/archive/refs/tags/"
+ version ".tar.gz"))
+ (sha256
+ (base32 "1xvdcnqxrvb90kcndxmspnm07p8clnq160rbfsy6djd17mbmpwii"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:make-flags (list "build" (string-append "prefix=" (assoc-ref %outputs "out")))
+
+ #:phases (modify-phases %standard-phases
+ (delete 'configure)
+ (delete 'check)
+ (add-before 'build 'set-additional-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (setenv "CC" "gcc")))
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (setenv "DESTDIR"
+ (string-append (assoc-ref %outputs "out") "/"))
+ (invoke "make" "install"))))))
+ (inputs (list tar which gcc-toolchain))
+ (home-page "https://github.com/pganalyze/libpg_query")
+ (synopsis
+ "C library for accessing the PostgreSQL parser outside of the server environment")
+ (description
+ "C library for accessing the PostgreSQL parser outside of the server. This library uses the actual PostgreSQL server source to parse SQL queries and return the internal PostgreSQL parse tree.")
+ (license license:bsd-3)))
base-commit: fdbf4192f5eaa7fdb5e6e2e98ada0726c8104824
--
2.43.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: Changing the prefix for this libpg_query package
2024-02-20 19:46 Changing the prefix for this libpg_query package Marc Coquand
@ 2024-02-25 14:04 ` Tomas Volf
2024-02-25 17:51 ` Felix Lechner via
1 sibling, 0 replies; 4+ messages in thread
From: Tomas Volf @ 2024-02-25 14:04 UTC (permalink / raw)
To: Marc Coquand; +Cc: help-guix
[-- Attachment #1: Type: text/plain, Size: 4685 bytes --]
On 2024-02-20 13:46:24 -0600, Marc Coquand wrote:
> Hey everyone!
>
> I am new to Guix, guile, make and trying to create a package.
>
> I have a functioning patch, attached, but it is not writing to the correct
> location.
>
> Currently, it is writing to out/usr/local/, which makes sense, because I can
> see in the makefile for libpg_query the following on line 311 of its makefile:
>
> prefix = /usr/local
> libdir = $(prefix)/lib
> includedir = $(prefix)/include
>
> I know I need to change the prefix to be the guix out directory, but I
> am not sure how I can substitute these lines. As you can see in the patch
> I attached, I tried to set it as a build flag. However, this did not work.
>
> Any helpers on how to resolve this? :)
>
> Sincerely,
> Marc
>
> ---
> gnu/packages/libpg_query.scm | 63 ++++++++++++++++++++++++++++++++++++
> 1 file changed, 63 insertions(+)
> create mode 100644 gnu/packages/libpg_query.scm
>
> diff --git a/gnu/packages/libpg_query.scm b/gnu/packages/libpg_query.scm
> new file mode 100644
> index 0000000000..353762554b
> --- /dev/null
> +++ b/gnu/packages/libpg_query.scm
> @@ -0,0 +1,63 @@
> +;;; GNU Guix --- Functional package management for GNU
> +;;; Copyright © 2024 Marc Coquand <marc@mccd.space>
> +;;;
> +;;; This file is part of GNU Guix.
> +;;;
> +;;; GNU Guix is free software; you can redistribute it and/or modify it
> +;;; under the terms of the GNU General Public License as published by
> +;;; the Free Software Foundation; either version 3 of the License, or (at
> +;;; your option) any later version.
> +;;;
> +;;; GNU Guix is distributed in the hope that it will be useful, but
> +;;; WITHOUT ANY WARRANTY; without even the implied warranty of
> +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> +;;; GNU General Public License for more details.
> +;;;
> +;;; You should have received a copy of the GNU General Public License
> +;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
> +
> +(define-module (gnu packages libpg_query)
> + #:use-module (gnu packages)
> + #:use-module (gnu packages base)
> + #:use-module (gnu packages commencement)
> + #:use-module (guix packages)
> + #:use-module (guix utils)
> + #:use-module (guix download)
> + #:use-module (guix build-system gnu)
> + #:use-module ((guix licenses) #:prefix license:)
> + )
> +
> +(define-public libpg-query
> + (package
> + (name "libpg-query")
> + (version "16-5.1.0")
> + (source
> + (origin
> + (method url-fetch)
> + (uri (string-append
> + "https://github.com/pganalyze/libpg_query/archive/refs/tags/"
> + version ".tar.gz"))
> + (sha256
> + (base32 "1xvdcnqxrvb90kcndxmspnm07p8clnq160rbfsy6djd17mbmpwii"))))
> + (build-system gnu-build-system)
> + (arguments
> + `(#:make-flags (list "build" (string-append "prefix=" (assoc-ref %outputs "out")))
> +
> + #:phases (modify-phases %standard-phases
> + (delete 'configure)
> + (delete 'check)
> + (add-before 'build 'set-additional-paths
> + (lambda* (#:key inputs #:allow-other-keys)
> + (setenv "CC" "gcc")))
> + (replace 'install
> + (lambda* (#:key outputs #:allow-other-keys)
> + (setenv "DESTDIR"
> + (string-append (assoc-ref %outputs "out") "/"))
> + (invoke "make" "install"))))))
So, I am just guessing here, but maybe you need to use the prefix=... also in
here? Since you are directly invoking make install, I would expect the
#:make-flags to not be in effect here. The 'install phase in gnu-build-system
you are replacing looks like this:
(define* (install #:key (make-flags '()) #:allow-other-keys)
(apply invoke "make" "install" make-flags))
> + (inputs (list tar which gcc-toolchain))
> + (home-page "https://github.com/pganalyze/libpg_query")
> + (synopsis
> + "C library for accessing the PostgreSQL parser outside of the server environment")
> + (description
> + "C library for accessing the PostgreSQL parser outside of the server. This library uses the actual PostgreSQL server source to parse SQL queries and return the internal PostgreSQL parse tree.")
> + (license license:bsd-3)))
>
> base-commit: fdbf4192f5eaa7fdb5e6e2e98ada0726c8104824
> --
> 2.43.2
>
>
Have a nice day,
Tomas Volf
--
There are only two hard things in Computer Science:
cache invalidation, naming things and off-by-one errors.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: Changing the prefix for this libpg_query package
2024-02-20 19:46 Changing the prefix for this libpg_query package Marc Coquand
2024-02-25 14:04 ` Tomas Volf
@ 2024-02-25 17:51 ` Felix Lechner via
2024-02-25 20:03 ` Marc Coquand
1 sibling, 1 reply; 4+ messages in thread
From: Felix Lechner via @ 2024-02-25 17:51 UTC (permalink / raw)
To: Marc Coquand, help-guix
Hi Marc,
On Tue, Feb 20 2024, Marc Coquand wrote:
> I need to change the prefix to be the guix out directory
To override the variable assigned in the Makefile [1] you are right to
offer it as an argument to 'make'. [2] I'm not sure why that's not
working. I would just replace it in situ:
#:phases (modify-phases %standard-phases
(add-after 'unpack 'fix-prefix
(lambda _
(substitute* "Makefile"
(("/usr/local") $output)))))
Kind regards
Felix
[1] https://github.com/pganalyze/libpg_query/blob/1ec38940e5c6f09a4c1d17a46d839a881c4f2db7/Makefile#L311
[2] https://www.gnu.org/software/make/manual/make.html#Overriding
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-02-25 20:04 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-02-20 19:46 Changing the prefix for this libpg_query package Marc Coquand
2024-02-25 14:04 ` Tomas Volf
2024-02-25 17:51 ` Felix Lechner via
2024-02-25 20:03 ` Marc Coquand
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).