me
/
guix
Archived
1
0
Fork 0

gnu: meson-for-build: Remove package.

The meson-for-build package doesn't carry any special patch anymore; it
appears to be obsolete.

* gnu/packages/build-tools.scm (meson-for-build): Remove variable.
* guix/build-system/meson.scm (default-meson): Use meson.
* doc/guix.texi (Build Systems): Update doc.
master
Maxim Cournoyer 2021-01-28 12:46:49 -05:00
parent e04cfc7beb
commit f2b2280108
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
3 changed files with 7 additions and 19 deletions

View File

@ -7969,9 +7969,7 @@ implements the build procedure for packages that use
It adds both Meson and @uref{https://ninja-build.org/, Ninja} to the set
of inputs, and they can be changed with the parameters @code{#:meson}
and @code{#:ninja} if needed. The default Meson is
@code{meson-for-build}, which is special because it doesn't clear the
@code{RUNPATH} of binaries and libraries when they are installed.
and @code{#:ninja} if needed.
This build system is an extension of @code{gnu-build-system}, but with the
following phases changed to some specific for Meson:
@ -8002,11 +8000,11 @@ Apart from that, the build system also adds the following phases:
@item fix-runpath
This phase ensures that all binaries can find the libraries they need.
It searches for required libraries in subdirectories of the package being
built, and adds those to @code{RUNPATH} where needed. It also removes
references to libraries left over from the build phase by
@code{meson-for-build}, such as test dependencies, that aren't actually
required for the program to run.
It searches for required libraries in subdirectories of the package
being built, and adds those to @code{RUNPATH} where needed. It also
removes references to libraries left over from the build phase by
@code{meson}, such as test dependencies, that aren't actually required
for the program to run.
@item glib-or-gtk-wrap
This phase is the phase provided by @code{glib-or-gtk-build-system}, and it

View File

@ -263,16 +263,6 @@ resembles Python.")
(base32
"19cjy24mfaswxyvqmns6rd7hx05ybqb663zlgklspfr8l4jjmvbb"))))))
(define-public meson-for-build
(package
(inherit meson)
(name "meson-for-build")
(source (origin
(inherit (package-source meson))))
;; People should probably install "meson", not "meson-for-build".
(properties `((hidden? . #t)))))
(define-public premake4
(package
(name "premake")

View File

@ -55,7 +55,7 @@
"Return the default meson package."
;; Lazily resolve the binding to avoid a circular dependency.
(let ((module (resolve-interface '(gnu packages build-tools))))
(module-ref module 'meson-for-build)))
(module-ref module 'meson)))
(define* (lower name
#:key source inputs native-inputs outputs system target