nixpkgs/pkgs/os-specific/linux/syslinux/perl-deps.patch
Eelco Dolstra 492d64e168 * Syslinux updated to 4.02.
svn path=/nixpkgs/trunk/; revision=23017
2010-08-06 22:27:28 +00:00

81 lines
2.9 KiB
Diff

http://git.ipxe.org/ipxe.git/commitdiff/719b498
diff -ru -x '*~' -x '*.orig' -x '*.rej' syslinux-4.02-orig/gpxe/src/arch/i386/Makefile.pcbios syslinux-4.02/gpxe/src/arch/i386/Makefile.pcbios
--- syslinux-4.02-orig/gpxe/src/arch/i386/Makefile.pcbios 2010-07-21 21:33:13.000000000 +0200
+++ syslinux-4.02/gpxe/src/arch/i386/Makefile.pcbios 2010-08-06 23:32:57.000000000 +0200
@@ -24,11 +24,11 @@
# Padding rules
#
-PAD_rom = $(PADIMG) --blksize=512 --byte=0xff $@
+PAD_rom = $(PERL) $(PADIMG) --blksize=512 --byte=0xff $@
PAD_hrom = $(PAD_rom)
PAD_xrom = $(PAD_rom)
-PAD_dsk = $(PADIMG) --blksize=512 $@
-PAD_hd = $(PADIMG) --blksize=32768 $@
+PAD_dsk = $(PERL) $(PADIMG) --blksize=512 $@
+PAD_hd = $(PERL) $(PADIMG) --blksize=32768 $@
# rule to make a non-emulation ISO boot image
NON_AUTO_MEDIA += iso
diff -ru -x '*~' -x '*.orig' -x '*.rej' syslinux-4.02-orig/gpxe/src/Makefile syslinux-4.02/gpxe/src/Makefile
--- syslinux-4.02-orig/gpxe/src/Makefile 2010-07-21 21:33:13.000000000 +0200
+++ syslinux-4.02/gpxe/src/Makefile 2010-08-06 23:31:15.000000000 +0200
@@ -31,12 +31,12 @@
OBJCOPY := $(CROSS_COMPILE)objcopy
NM := $(CROSS_COMPILE)nm
OBJDUMP := $(CROSS_COMPILE)objdump
-PARSEROM := $(PERL) ./util/parserom.pl
-MAKEROM := $(PERL) ./util/makerom.pl
-SYMCHECK := $(PERL) ./util/symcheck.pl
-SORTOBJDUMP := $(PERL) ./util/sortobjdump.pl
-PADIMG := $(PERL) ./util/padimg.pl
-LICENCE := $(PERL) ./util/licence.pl
+PARSEROM := ./util/parserom.pl
+MAKEROM := ./util/makerom.pl
+SYMCHECK := ./util/symcheck.pl
+SORTOBJDUMP := ./util/sortobjdump.pl
+PADIMG := ./util/padimg.pl
+LICENCE := ./util/licence.pl
NRV2B := ./util/nrv2b
ZBIN := ./util/zbin
ELF2EFI32 := ./util/elf2efi32
diff -ru -x '*~' -x '*.orig' -x '*.rej' syslinux-4.02-orig/gpxe/src/Makefile.housekeeping syslinux-4.02/gpxe/src/Makefile.housekeeping
--- syslinux-4.02-orig/gpxe/src/Makefile.housekeeping 2010-07-21 21:33:13.000000000 +0200
+++ syslinux-4.02/gpxe/src/Makefile.housekeeping 2010-08-06 23:31:49.000000000 +0200
@@ -456,7 +456,7 @@
'\n$(2) : $$($(4)_DEPS)\n' \
'\nTAGS : $$($(4)_DEPS)\n' \
>> $(2)
- @$(PARSEROM) $(1) >> $(2)
+ @$(PERL) $(PARSEROM) $(1) >> $(2)
endef
@@ -657,7 +657,7 @@
$(QM)$(ECHO) " [LD] $@"
$(Q)$(LD) $(LDFLAGS) -T $(LDSCRIPT) $(TGT_LD_FLAGS) $(BLIB) -o $@ \
-Map $(BIN)/$*.tmp.map
- $(Q)$(OBJDUMP) -ht $@ | $(SORTOBJDUMP) >> $(BIN)/$*.tmp.map
+ $(Q)$(OBJDUMP) -ht $@ | $(PERL) $(SORTOBJDUMP) >> $(BIN)/$*.tmp.map
# Keep intermediate object file (useful for debugging)
.PRECIOUS : $(BIN)/%.tmp
@@ -714,7 +714,7 @@
echo "files are missing a licence declaration:" ;\
echo $(call unlicensed_deps_list,$<);\
exit 1,\
- $(LICENCE) $(call licence_list,$<))
+ $(PERL) $(LICENCE) $(call licence_list,$<))
# Extract compression information from intermediate object file
#
@@ -941,7 +941,7 @@
CLEANUP += $(BIN)/symtab
symcheck : $(SYMTAB)
- $(SYMCHECK) $<
+ $(PERL) $(SYMCHECK) $<
endif # defined(BIN)