← Back to branch summary

~ubuntu-branches/debian/sid/upx-ucl/sid

« back to all changes in this revision

Viewing changes to src/stub/src/c/Makevars.lzma

  • Committer: Bazaar Package Importer
  • Author(s): Robert Luberda
  • Date: 2009-10-16 12:56:47 UTC
  • mfrom: (1.2.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20091016125647-vity1npel2qsmr9c
Tags: 3.04-1
http://bugs.debian.org/548566
* New upstream release:
  + FTBFS with gcc 4.4 fixed by upstream (closes: #548566).
* p_mach.cpp: Fix from upstream vcs: mach/fat needs seek() 
  after set_extent().

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/stub/src/c/Makevars.lzma
11
11
endif
12
12
endif
13
13
 
14
 
ifneq ($(wildcard $(UPX_LZMADIR)/C/CpuArch.h),)
 
14
ifneq ($(wildcard $(UPX_LZMADIR)/C/7zVersion.h),)
 
15
UPX_LZMA_VERSION := $(shell perl -ne 'print "0x$$1$$2" if /^\s*\#\s*define\s+MY_VERSION\s+"(\d)\.(\d\d)[\s\w]*"/;' $(UPX_LZMADIR)/C/7zVersion.h)
 
16
else ifneq ($(wildcard $(UPX_LZMADIR)/CPP/Windows/Time.cpp),)
 
17
UPX_LZMA_VERSION = 0x459
 
18
else ifneq ($(wildcard $(UPX_LZMADIR)/C/7zBuf.h),)
 
19
UPX_LZMA_VERSION = 0x458
 
20
else ifneq ($(wildcard $(UPX_LZMADIR)/C/CpuArch.h),)
15
21
UPX_LZMA_VERSION = 0x457
16
22
else ifneq ($(wildcard $(UPX_LZMADIR)/CPP/7zip/.),)
17
23
UPX_LZMA_VERSION = 0x449
 
24
else ifneq ($(wildcard $(UPX_LZMADIR)/C/7zip/Compress/LZ/Patricia/.),)
 
25
UPX_LZMA_VERSION = 0x442
18
26
else ifneq ($(wildcard $(UPX_LZMADIR)/C/7zip/.),)
19
27
UPX_LZMA_VERSION = 0x443
20
28
endif