diff options
| -rw-r--r-- | Makefile.am | 30 | ||||
| -rw-r--r-- | distro/packages/patches/binutils-ld-new-dtags.patch (renamed from distro/patches/binutils-ld-new-dtags.patch) | 0 | ||||
| -rw-r--r-- | distro/packages/patches/diffutils-gets-undeclared.patch (renamed from distro/patches/diffutils-gets-undeclared.patch) | 0 | ||||
| -rw-r--r-- | distro/packages/patches/findutils-absolute-paths.patch (renamed from distro/patches/findutils-absolute-paths.patch) | 0 | ||||
| -rw-r--r-- | distro/packages/patches/guile-1.8-cpp-4.5.patch (renamed from distro/patches/guile-1.8-cpp-4.5.patch) | 0 | ||||
| -rw-r--r-- | distro/packages/patches/guile-default-utf8.patch (renamed from distro/patches/guile-default-utf8.patch) | 0 | ||||
| -rw-r--r-- | distro/packages/patches/guile-relocatable.patch (renamed from distro/patches/guile-relocatable.patch) | 0 | ||||
| -rw-r--r-- | distro/packages/patches/libtool-skip-tests.patch (renamed from distro/patches/libtool-skip-tests.patch) | 0 | ||||
| -rw-r--r-- | distro/packages/patches/m4-gets-undeclared.patch (renamed from distro/patches/m4-gets-undeclared.patch) | 0 | ||||
| -rw-r--r-- | distro/packages/patches/m4-readlink-EINVAL.patch (renamed from distro/patches/m4-readlink-EINVAL.patch) | 0 | ||||
| -rw-r--r-- | distro/packages/patches/m4-s_isdir.patch (renamed from distro/patches/m4-s_isdir.patch) | 0 | ||||
| -rw-r--r-- | distro/packages/patches/make-impure-dirs.patch (renamed from distro/patches/make-impure-dirs.patch) | 0 | ||||
| -rw-r--r-- | distro/packages/patches/perl-no-sys-dirs.patch (renamed from distro/patches/perl-no-sys-dirs.patch) | 0 | ||||
| -rw-r--r-- | distro/packages/patches/readline-link-ncurses.patch (renamed from distro/patches/readline-link-ncurses.patch) | 0 | ||||
| -rw-r--r-- | distro/packages/patches/tar-gets-undeclared.patch (renamed from distro/patches/tar-gets-undeclared.patch) | 0 | ||||
| -rw-r--r-- | pre-inst-env.in | 2 |
16 files changed, 16 insertions, 16 deletions
diff --git a/Makefile.am b/Makefile.am index 1d3eafb6ac..d1f3547224 100644 --- a/Makefile.am +++ b/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 diff --git a/distro/patches/binutils-ld-new-dtags.patch b/distro/packages/patches/binutils-ld-new-dtags.patch index 5f7a03fc38..5f7a03fc38 100644 --- a/distro/patches/binutils-ld-new-dtags.patch +++ b/distro/packages/patches/binutils-ld-new-dtags.patch diff --git a/distro/patches/diffutils-gets-undeclared.patch b/distro/packages/patches/diffutils-gets-undeclared.patch index b6cdc77caa..b6cdc77caa 100644 --- a/distro/patches/diffutils-gets-undeclared.patch +++ b/distro/packages/patches/diffutils-gets-undeclared.patch diff --git a/distro/patches/findutils-absolute-paths.patch b/distro/packages/patches/findutils-absolute-paths.patch index 96341e281f..96341e281f 100644 --- a/distro/patches/findutils-absolute-paths.patch +++ b/distro/packages/patches/findutils-absolute-paths.patch diff --git a/distro/patches/guile-1.8-cpp-4.5.patch b/distro/packages/patches/guile-1.8-cpp-4.5.patch index 638d071baf..638d071baf 100644 --- a/distro/patches/guile-1.8-cpp-4.5.patch +++ b/distro/packages/patches/guile-1.8-cpp-4.5.patch diff --git a/distro/patches/guile-default-utf8.patch b/distro/packages/patches/guile-default-utf8.patch index 409f435161..409f435161 100644 --- a/distro/patches/guile-default-utf8.patch +++ b/distro/packages/patches/guile-default-utf8.patch diff --git a/distro/patches/guile-relocatable.patch b/distro/packages/patches/guile-relocatable.patch index 077394cdde..077394cdde 100644 --- a/distro/patches/guile-relocatable.patch +++ b/distro/packages/patches/guile-relocatable.patch diff --git a/distro/patches/libtool-skip-tests.patch b/distro/packages/patches/libtool-skip-tests.patch index 6e12615d51..6e12615d51 100644 --- a/distro/patches/libtool-skip-tests.patch +++ b/distro/packages/patches/libtool-skip-tests.patch diff --git a/distro/patches/m4-gets-undeclared.patch b/distro/packages/patches/m4-gets-undeclared.patch index d28f0cdcc4..d28f0cdcc4 100644 --- a/distro/patches/m4-gets-undeclared.patch +++ b/distro/packages/patches/m4-gets-undeclared.patch diff --git a/distro/patches/m4-readlink-EINVAL.patch b/distro/packages/patches/m4-readlink-EINVAL.patch index dd371584a7..dd371584a7 100644 --- a/distro/patches/m4-readlink-EINVAL.patch +++ b/distro/packages/patches/m4-readlink-EINVAL.patch diff --git a/distro/patches/m4-s_isdir.patch b/distro/packages/patches/m4-s_isdir.patch index a009a4ba44..a009a4ba44 100644 --- a/distro/patches/m4-s_isdir.patch +++ b/distro/packages/patches/m4-s_isdir.patch diff --git a/distro/patches/make-impure-dirs.patch b/distro/packages/patches/make-impure-dirs.patch index 83a5fbe3a5..83a5fbe3a5 100644 --- a/distro/patches/make-impure-dirs.patch +++ b/distro/packages/patches/make-impure-dirs.patch diff --git a/distro/patches/perl-no-sys-dirs.patch b/distro/packages/patches/perl-no-sys-dirs.patch index 3aba4d7529..3aba4d7529 100644 --- a/distro/patches/perl-no-sys-dirs.patch +++ b/distro/packages/patches/perl-no-sys-dirs.patch diff --git a/distro/patches/readline-link-ncurses.patch b/distro/packages/patches/readline-link-ncurses.patch index 0fd0598f46..0fd0598f46 100644 --- a/distro/patches/readline-link-ncurses.patch +++ b/distro/packages/patches/readline-link-ncurses.patch diff --git a/distro/patches/tar-gets-undeclared.patch b/distro/packages/patches/tar-gets-undeclared.patch index 301a09dde1..301a09dde1 100644 --- a/distro/patches/tar-gets-undeclared.patch +++ b/distro/packages/patches/tar-gets-undeclared.patch diff --git a/pre-inst-env.in b/pre-inst-env.in index 7dcad5b967..baea6da35a 100644 --- a/pre-inst-env.in +++ b/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" |