lix-project/lix
20
58
Fork 31
Code Issues 359 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Install bsdiff and bspatch in $(libexecdir)/nix

Browse source
This commit is contained in:
Eelco Dolstra 2013-12-02 20:21:31 +00:00
parent 0202ce6b94
commit f3cf0436b5
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
perl/lib/Nix/GeneratePatches.pm
View file

@ -225,7 +225,7 @@ sub generatePatches {
} }
my $time1 = time(); my $time1 = time();
my $res = system("ulimit -t $timeLimit; $Nix::Config::libexecDir/bsdiff $tmpDir/A $tmpDir/B $tmpDir/DIFF"); my $res = system("ulimit -t $timeLimit; $Nix::Config::libexecDir/nix/bsdiff $tmpDir/A $tmpDir/B $tmpDir/DIFF");
my $time2 = time(); my $time2 = time();
if ($res) { if ($res) {
warn "binary diff computation aborted after ", $time2 - $time1, " seconds\n"; warn "binary diff computation aborted after ", $time2 - $time1, " seconds\n";

2
scripts/download-using-manifests.pl.in
View file

@ -317,7 +317,7 @@ while (scalar @path > 0) {
# Apply the patch to the NAR archive produced in step 1 (for # Apply the patch to the NAR archive produced in step 1 (for
# the already present path) or a later step (for patch sequences). # the already present path) or a later step (for patch sequences).
print STDERR " applying patch...\n"; print STDERR " applying patch...\n";
system("$Nix::Config::libexecDir/bspatch $tmpNar $tmpNar2 $patchPath") == 0 system("$Nix::Config::libexecDir/nix/bspatch $tmpNar $tmpNar2 $patchPath") == 0
or die "cannot apply patch `$patchPath' to $tmpNar\n"; or die "cannot apply patch `$patchPath' to $tmpNar\n";
if ($curStep < $maxStep) { if ($curStep < $maxStep) {

4
src/bsdiff-4.3/Makefile
View file

@ -3,11 +3,11 @@ PROGRAMS += bsdiff bspatch
bsdiff_DIR := $(d) bsdiff_DIR := $(d)
bsdiff_SOURCES = bsdiff.c bsdiff_SOURCES = bsdiff.c
bsdiff_LDFLAGS = -lbz2 $(bsddiff_compat_include) bsdiff_LDFLAGS = -lbz2 $(bsddiff_compat_include)
bsdiff_INSTALL_DIR = $(libexecdir) bsdiff_INSTALL_DIR = $(libexecdir)/nix
bspatch_DIR := $(d) bspatch_DIR := $(d)
bspatch_SOURCES = bspatch.c bspatch_SOURCES = bspatch.c
bspatch_LDFLAGS = -lbz2 $(bsddiff_compat_include) bspatch_LDFLAGS = -lbz2 $(bsddiff_compat_include)
bspatch_INSTALL_DIR = $(libexecdir) bspatch_INSTALL_DIR = $(libexecdir)/nix
dist_files += $(d)/compat-include/* dist_files += $(d)/compat-include/*