From bfb3c3d03a168002d77631a653457556a96d9bdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 27 Oct 2012 15:30:08 +0200 Subject: [PATCH] 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. --- Makefile.am | 30 +++++++++---------- .../patches/binutils-ld-new-dtags.patch | 0 .../patches/diffutils-gets-undeclared.patch | 0 .../patches/findutils-absolute-paths.patch | 0 .../patches/guile-1.8-cpp-4.5.patch | 0 .../patches/guile-default-utf8.patch | 0 .../patches/guile-relocatable.patch | 0 .../patches/libtool-skip-tests.patch | 0 .../patches/m4-gets-undeclared.patch | 0 .../patches/m4-readlink-EINVAL.patch | 0 .../{ => packages}/patches/m4-s_isdir.patch | 0 .../patches/make-impure-dirs.patch | 0 .../patches/perl-no-sys-dirs.patch | 0 .../patches/readline-link-ncurses.patch | 0 .../patches/tar-gets-undeclared.patch | 0 pre-inst-env.in | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) rename distro/{ => packages}/patches/binutils-ld-new-dtags.patch (100%) rename distro/{ => packages}/patches/diffutils-gets-undeclared.patch (100%) rename distro/{ => packages}/patches/findutils-absolute-paths.patch (100%) rename distro/{ => packages}/patches/guile-1.8-cpp-4.5.patch (100%) rename distro/{ => packages}/patches/guile-default-utf8.patch (100%) rename distro/{ => packages}/patches/guile-relocatable.patch (100%) rename distro/{ => packages}/patches/libtool-skip-tests.patch (100%) rename distro/{ => packages}/patches/m4-gets-undeclared.patch (100%) rename distro/{ => packages}/patches/m4-readlink-EINVAL.patch (100%) rename distro/{ => packages}/patches/m4-s_isdir.patch (100%) rename distro/{ => packages}/patches/make-impure-dirs.patch (100%) rename distro/{ => packages}/patches/perl-no-sys-dirs.patch (100%) rename distro/{ => packages}/patches/readline-link-ncurses.patch (100%) rename distro/{ => packages}/patches/tar-gets-undeclared.patch (100%) 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 similarity index 100% rename from distro/patches/binutils-ld-new-dtags.patch rename to 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 similarity index 100% rename from distro/patches/diffutils-gets-undeclared.patch rename to distro/packages/patches/diffutils-gets-undeclared.patch diff --git a/distro/patches/findutils-absolute-paths.patch b/distro/packages/patches/findutils-absolute-paths.patch similarity index 100% rename from distro/patches/findutils-absolute-paths.patch rename to 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 similarity index 100% rename from distro/patches/guile-1.8-cpp-4.5.patch rename to 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 similarity index 100% rename from distro/patches/guile-default-utf8.patch rename to distro/packages/patches/guile-default-utf8.patch diff --git a/distro/patches/guile-relocatable.patch b/distro/packages/patches/guile-relocatable.patch similarity index 100% rename from distro/patches/guile-relocatable.patch rename to distro/packages/patches/guile-relocatable.patch diff --git a/distro/patches/libtool-skip-tests.patch b/distro/packages/patches/libtool-skip-tests.patch similarity index 100% rename from distro/patches/libtool-skip-tests.patch rename to distro/packages/patches/libtool-skip-tests.patch diff --git a/distro/patches/m4-gets-undeclared.patch b/distro/packages/patches/m4-gets-undeclared.patch similarity index 100% rename from distro/patches/m4-gets-undeclared.patch rename to distro/packages/patches/m4-gets-undeclared.patch diff --git a/distro/patches/m4-readlink-EINVAL.patch b/distro/packages/patches/m4-readlink-EINVAL.patch similarity index 100% rename from distro/patches/m4-readlink-EINVAL.patch rename to distro/packages/patches/m4-readlink-EINVAL.patch diff --git a/distro/patches/m4-s_isdir.patch b/distro/packages/patches/m4-s_isdir.patch similarity index 100% rename from distro/patches/m4-s_isdir.patch rename to distro/packages/patches/m4-s_isdir.patch diff --git a/distro/patches/make-impure-dirs.patch b/distro/packages/patches/make-impure-dirs.patch similarity index 100% rename from distro/patches/make-impure-dirs.patch rename to 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 similarity index 100% rename from distro/patches/perl-no-sys-dirs.patch rename to 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 similarity index 100% rename from distro/patches/readline-link-ncurses.patch rename to distro/packages/patches/readline-link-ncurses.patch diff --git a/distro/patches/tar-gets-undeclared.patch b/distro/packages/patches/tar-gets-undeclared.patch similarity index 100% rename from distro/patches/tar-gets-undeclared.patch rename to 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"