[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
130/131: gnu: meson-for-build: Remove package.
From: |
guix-commits |
Subject: |
130/131: gnu: meson-for-build: Remove package. |
Date: |
Mon, 1 Feb 2021 11:57:08 -0500 (EST) |
apteryx pushed a commit to branch core-updates
in repository guix.
commit f2b228010873a7b1be429293e0422560b6a805d5
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Thu Jan 28 12:46:49 2021 -0500
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.
---
doc/guix.texi | 14 ++++++--------
gnu/packages/build-tools.scm | 10 ----------
guix/build-system/meson.scm | 2 +-
3 files changed, 7 insertions(+), 19 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 2347a77..9221906 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -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
diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index f752665..dc24118 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -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")
diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm
index b68bcb8..e042233 100644
--- a/guix/build-system/meson.scm
+++ b/guix/build-system/meson.scm
@@ -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
- 85/131: gnu: python-tblib: Do not set PYTHONPATH., (continued)
- 85/131: gnu: python-tblib: Do not set PYTHONPATH., guix-commits, 2021/02/01
- 90/131: gnu: python-natsort: Do not set PYTHONPATH., guix-commits, 2021/02/01
- 95/131: gnu: python-rfc3986: Do not set PYTHONPATH., guix-commits, 2021/02/01
- 97/131: gnu: python-flasgger: Do not set PYTHONPATH., guix-commits, 2021/02/01
- 109/131: doc: Update references to PYTHONPATH and some examples., guix-commits, 2021/02/01
- 115/131: gnu: assword: Do not alter PYTHONPATH., guix-commits, 2021/02/01
- 103/131: gnu: python-jsonpickle: Do not set PYTHONPATH., guix-commits, 2021/02/01
- 119/131: gnu: python-cloudpickle: Do not alter PYTHONPATH., guix-commits, 2021/02/01
- 116/131: gnu: pypy3: Do not alter PYTHONPATH., guix-commits, 2021/02/01
- 126/131: gnu: kaldi-gstreamer-server: Wrap with GUIX_PYTHONPATH., guix-commits, 2021/02/01
- 130/131: gnu: meson-for-build: Remove package.,
guix-commits <=
- 78/131: gnu: python-pygithub: Do not set PYTHONPATH., guix-commits, 2021/02/01
- 79/131: gnu: python-matplotlib-documentation: Do not read PYTHONPATH., guix-commits, 2021/02/01
- 104/131: gnu: python-databricks-cli: Do not set PYTHONPATH., guix-commits, 2021/02/01
- 105/131: gnu: python-flask: Do not set PYTHONPATH., guix-commits, 2021/02/01
- 108/131: gnu: python-gunicorn: Do not set PYTHONPATH., guix-commits, 2021/02/01
- 96/131: gnu: python-apispec: Do not set PYTHONPATH., guix-commits, 2021/02/01
- 121/131: gnu: freecad: Wrap with GUIX_PYTHONPATH., guix-commits, 2021/02/01
- 114/131: gnu: gpodder: Do not alter PYTHONPATH., guix-commits, 2021/02/01
- 86/131: gnu: python-gevent: Do not set PYTHONPATH., guix-commits, 2021/02/01
- 94/131: gnu: python-pbkdf2: Do not set PYTHONPATH., guix-commits, 2021/02/01