Browse Source

build: Move `distro/patches' to `distro/packages/patches'.

* distro/patches: Move directory to...
* distro/packages/patches: ... here.
* Makefile.am (dist_patch_DATA): Adjust accordingly.
* pre-inst-env.in (DISTRO_PATCH_DIRECTORY): Likewise.
gn-latest-20200428
Ludovic Courtès 9 years ago
parent
commit
bfb3c3d03a
  1. 30
      Makefile.am
  2. 0
      distro/packages/patches/binutils-ld-new-dtags.patch
  3. 0
      distro/packages/patches/diffutils-gets-undeclared.patch
  4. 0
      distro/packages/patches/findutils-absolute-paths.patch
  5. 0
      distro/packages/patches/guile-1.8-cpp-4.5.patch
  6. 0
      distro/packages/patches/guile-default-utf8.patch
  7. 0
      distro/packages/patches/guile-relocatable.patch
  8. 0
      distro/packages/patches/libtool-skip-tests.patch
  9. 0
      distro/packages/patches/m4-gets-undeclared.patch
  10. 0
      distro/packages/patches/m4-readlink-EINVAL.patch
  11. 0
      distro/packages/patches/m4-s_isdir.patch
  12. 0
      distro/packages/patches/make-impure-dirs.patch
  13. 0
      distro/packages/patches/perl-no-sys-dirs.patch
  14. 0
      distro/packages/patches/readline-link-ncurses.patch
  15. 0
      distro/packages/patches/tar-gets-undeclared.patch
  16. 2
      pre-inst-env.in

30
Makefile.am

@ -48,21 +48,21 @@ GOBJECTS = $(MODULES:%.scm=%.go)
nobase_dist_guilemodule_DATA = $(MODULES)
patchdir = $(pkgdatadir)/patches
dist_patch_DATA = \
distro/patches/binutils-ld-new-dtags.patch \
distro/patches/diffutils-gets-undeclared.patch \
distro/patches/guile-1.8-cpp-4.5.patch \
distro/patches/guile-default-utf8.patch \
distro/patches/guile-relocatable.patch \
distro/patches/libtool-skip-tests.patch \
distro/patches/m4-gets-undeclared.patch \
distro/patches/m4-readlink-EINVAL.patch \
distro/patches/m4-s_isdir.patch \
distro/patches/make-impure-dirs.patch \
distro/patches/findutils-absolute-paths.patch \
distro/patches/perl-no-sys-dirs.patch \
distro/patches/readline-link-ncurses.patch \
distro/patches/tar-gets-undeclared.patch
dist_patch_DATA = \
distro/packages/patches/binutils-ld-new-dtags.patch \
distro/packages/patches/diffutils-gets-undeclared.patch \
distro/packages/patches/guile-1.8-cpp-4.5.patch \
distro/packages/patches/guile-default-utf8.patch \
distro/packages/patches/guile-relocatable.patch \
distro/packages/patches/libtool-skip-tests.patch \
distro/packages/patches/m4-gets-undeclared.patch \
distro/packages/patches/m4-readlink-EINVAL.patch \
distro/packages/patches/m4-s_isdir.patch \
distro/packages/patches/make-impure-dirs.patch \
distro/packages/patches/findutils-absolute-paths.patch \
distro/packages/patches/perl-no-sys-dirs.patch \
distro/packages/patches/readline-link-ncurses.patch \
distro/packages/patches/tar-gets-undeclared.patch
bootstrapdir = $(pkgdatadir)/bootstrap
bootstrap_x86_64_linuxdir = $(bootstrapdir)/x86_64-linux

0
distro/patches/binutils-ld-new-dtags.patch → distro/packages/patches/binutils-ld-new-dtags.patch

0
distro/patches/diffutils-gets-undeclared.patch → distro/packages/patches/diffutils-gets-undeclared.patch

0
distro/patches/findutils-absolute-paths.patch → distro/packages/patches/findutils-absolute-paths.patch

0
distro/patches/guile-1.8-cpp-4.5.patch → distro/packages/patches/guile-1.8-cpp-4.5.patch

0
distro/patches/guile-default-utf8.patch → distro/packages/patches/guile-default-utf8.patch

0
distro/patches/guile-relocatable.patch → distro/packages/patches/guile-relocatable.patch

0
distro/patches/libtool-skip-tests.patch → distro/packages/patches/libtool-skip-tests.patch

0
distro/patches/m4-gets-undeclared.patch → distro/packages/patches/m4-gets-undeclared.patch

0
distro/patches/m4-readlink-EINVAL.patch → distro/packages/patches/m4-readlink-EINVAL.patch

0
distro/patches/m4-s_isdir.patch → distro/packages/patches/m4-s_isdir.patch

0
distro/patches/make-impure-dirs.patch → distro/packages/patches/make-impure-dirs.patch

0
distro/patches/perl-no-sys-dirs.patch → distro/packages/patches/perl-no-sys-dirs.patch

0
distro/patches/readline-link-ncurses.patch → distro/packages/patches/readline-link-ncurses.patch

0
distro/patches/tar-gets-undeclared.patch → distro/packages/patches/tar-gets-undeclared.patch

2
pre-inst-env.in

@ -23,7 +23,7 @@
# Run COMMAND in a pre-installation environment. Typical use is
# "./pre-inst-env guix-build hello".
DISTRO_PATCH_DIRECTORY="@abs_top_srcdir@/distro/patches"
DISTRO_PATCH_DIRECTORY="@abs_top_srcdir@/distro/packages/patches"
DISTRO_BOOTSTRAP_DIRECTORY="@abs_top_srcdir@/distro/packages/bootstrap"
GUILE_LOAD_COMPILED_PATH="@abs_top_builddir@${GUILE_LOAD_COMPILED_PATH:+:}$GUILE_LOAD_COMPILED_PATH"
GUILE_LOAD_PATH="@abs_top_srcdir@${GUILE_LOAD_PATH:+:}:$GUILE_LOAD_PATH"

Loading…
Cancel
Save