public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Add a setup hook ‘autoreconfHook’ to simplify packages that need to

Browse Source 
run autoreconf:

    buildInputs = [ autoreconfHook ];

  is essentially equivalent to

    buildInputs = [ autoconf automake libtool ];
    preConfigure = "autoreconf -i";

svn path=/nixpkgs/branches/x-updates/; revision=34181
This commit is contained in:
Eelco Dolstra 2012-05-19 02:52:36 +00:00
parent 76c0be09f8
commit 41840af689
6 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/build-support/setup-hooks/autoreconf.sh Normal file
View File

@ -0,0 +1,11 @@
preConfigurePhases+=" autoreconfPhase"
for i in @autoconf@ @automake@ @libtool@; do
findInputs $i nativePkgs propagated-build-native-inputs
done
autoreconfPhase() {
runHook preAutoreconf
autoreconf ${autoreconfFlags:---install --force}
runHook postAutoreconf
}

0
pkgs/build-support/make-wrapper/make-wrapper.sh → pkgs/build-support/setup-hooks/make-wrapper.sh
View File

6
pkgs/os-specific/linux/mountall/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, libnih, dbus, udev, autoconf, automake, libtool, gettext }: { stdenv, fetchurl, pkgconfig, libnih, dbus, udev, gettext, autoreconfHook }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "mountall-2.35"; name = "mountall-2.35";
@ -10,9 +10,7 @@ stdenv.mkDerivation {
patches = [ ./no-plymouth.patch ./fix-usr1-race.patch ]; patches = [ ./no-plymouth.patch ./fix-usr1-race.patch ];
preConfigure = "rm -R aclocal.m4; gettextize -f; autoreconf -vfi"; buildInputs = [ pkgconfig libnih dbus.libs udev gettext autoreconfHook ];
buildInputs = [ pkgconfig libnih dbus.libs udev autoconf automake libtool gettext ];
makeFlags = "initramfshookdir=$(out)/share/initramfs-tools/hooks upstart_jobs_initramfs_configdir=$(out)/share/initramfs-tools/event-driven/upstart-jobs"; makeFlags = "initramfshookdir=$(out)/share/initramfs-tools/hooks upstart_jobs_initramfs_configdir=$(out)/share/initramfs-tools/event-driven/upstart-jobs";

4
pkgs/os-specific/linux/usbutils/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, libusb1, zlib, autoconf, automake, libtool }: { stdenv, fetchurl, pkgconfig, libusb1, zlib, autoreconfHook }:
let let
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
sha256 = "05sxkm7b7lj8p8kr8kw68m49h66351s803z42233b8lssmc3wlra"; sha256 = "05sxkm7b7lj8p8kr8kw68m49h66351s803z42233b8lssmc3wlra";
}; };
buildInputs = [ pkgconfig libusb1 autoconf automake libtool zlib ]; buildInputs = [ pkgconfig libusb1 autoreconfHook ];
preConfigure = "autoreconf -i"; preConfigure = "autoreconf -i";

6
pkgs/tools/networking/sitecopy/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, neon, zlib, openssl, autoconf, automake, libtool }: { stdenv, fetchurl, neon, zlib, openssl, autoreconfHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "sitecopy-0.16.6"; name = "sitecopy-0.16.6";
@ -10,9 +10,7 @@ stdenv.mkDerivation rec {
patches = [ ./neon-29.patch ]; patches = [ ./neon-29.patch ];
preConfigure = "autoreconf"; buildInputs = [ openssl neon zlib autoreconfHook ];
buildInputs = [ openssl neon zlib autoconf automake libtool ];
configureFlags= "--with-ssl=openssl"; configureFlags= "--with-ssl=openssl";
} }

10
pkgs/top-level/all-packages.nix
View File

@ -245,6 +245,10 @@ let
theAttrSet = arg; theAttrSet = arg;
}; };
autoreconfHook = makeSetupHook
{ substitutions = { inherit autoconf automake libtool; }; }
../build-support/setup-hooks/autoreconf.sh;
buildEnv = import ../build-support/buildenv { buildEnv = import ../build-support/buildenv {
inherit (pkgs) runCommand perl; inherit (pkgs) runCommand perl;
}; };
@ -327,7 +331,7 @@ let
inherit stdenv perl cpio contents ubootChooser; inherit stdenv perl cpio contents ubootChooser;
}; };
makeWrapper = makeSetupHook {} ../build-support/make-wrapper/make-wrapper.sh; makeWrapper = makeSetupHook { } ../build-support/setup-hooks/make-wrapper.sh;
makeModulesClosure = {kernel, rootModules, allowMissing ? false}: makeModulesClosure = {kernel, rootModules, allowMissing ? false}:
import ../build-support/kernel/modules-closure.nix { import ../build-support/kernel/modules-closure.nix {
@ -5824,9 +5828,7 @@ let
module_init_tools = callPackage ../os-specific/linux/module-init-tools { }; module_init_tools = callPackage ../os-specific/linux/module-init-tools { };
mountall = callPackage ../os-specific/linux/mountall { mountall = callPackage ../os-specific/linux/mountall { };
automake = automake111x;
};
aggregateModules = modules: aggregateModules = modules:
import ../os-specific/linux/module-init-tools/aggregator.nix { import ../os-specific/linux/module-init-tools/aggregator.nix {