diff options
| author | root <root@rshg054.dnsready.net> | 2011-12-21 23:14:55 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2011-12-21 23:14:55 +0000 |
| commit | 69d24275e4d5296a5f02e4c4d0fc438a80d159b8 (patch) | |
| tree | 06395fd573908625990d57aa57cdacba4d92faae /extra/xdelta3 | |
| parent | ea1f4bece8870857691a7123bdc899562760b3fe (diff) | |
Wed Dec 21 23:14:54 UTC 2011
Diffstat (limited to 'extra/xdelta3')
| -rw-r--r-- | extra/xdelta3/PKGBUILD | 16 | ||||
| -rw-r--r-- | extra/xdelta3/xdelta3-makefile.patch | 39 |
2 files changed, 46 insertions, 9 deletions
diff --git a/extra/xdelta3/PKGBUILD b/extra/xdelta3/PKGBUILD index a8149d55c..05cabed7d 100644 --- a/extra/xdelta3/PKGBUILD +++ b/extra/xdelta3/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: $ +# $Id: PKGBUILD 145279 2011-12-21 02:07:07Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Eduard "bekks" Warkentin <eduard.warkentin@gmail.com> # Contributor: Henning Garus <henning.garus@gmail.com> pkgname=xdelta3 pkgver=3.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="A diff utility which works with binary files" arch=('i686' 'x86_64') url="http://xdelta.org/" @@ -15,15 +15,25 @@ optdepends=('python2: for python modules') source=(http://xdelta.googlecode.com/files/xdelta$pkgver.tar.gz xdelta3-makefile.patch) md5sums=('5fe038be3a266d2a7913e10d1cec6d88' - '378e9a735d92fb2fc695ed9ce2fad2d5') + 'fa5973870faf7523043c4858ab7c3bdb') build() { cd $srcdir/xdelta$pkgver + patch -Np1 -i $srcdir/xdelta3-makefile.patch sed -i "/PYVER = /s/2.6/2.7/" Makefile make xdelta3 make xdelta3module.so + + # for testsuite + make xdelta3-debug +} + +check() { + cd $srcdir/xdelta$pkgver + + make test } package() { diff --git a/extra/xdelta3/xdelta3-makefile.patch b/extra/xdelta3/xdelta3-makefile.patch index 3085d3c29..d5fa12e70 100644 --- a/extra/xdelta3/xdelta3-makefile.patch +++ b/extra/xdelta3/xdelta3-makefile.patch @@ -1,7 +1,34 @@ -diff -Naur xdelta3.0v-old/Makefile xdelta3.0v/Makefile ---- xdelta3.0v-old/Makefile 2009-03-12 01:44:51.000000000 +0000 -+++ xdelta3.0v/Makefile 2009-03-14 17:02:33.000000000 +0000 -@@ -200,6 +200,9 @@ +diff -Naur xdelta3.0.0-orig/Makefile xdelta3.0.0/Makefile +--- xdelta3.0.0-orig/Makefile 2011-01-09 18:29:06.000000000 +1000 ++++ xdelta3.0.0/Makefile 2011-12-21 11:53:13.530028738 +1000 +@@ -54,7 +54,7 @@ + WIXDIR = "/cygdrive/c/Program Files/wix2.0.4820" + + # -arch x86_64 +-CFLAGS= -Wall -Wshadow -fno-builtin ++CFLAGS+= -Wall -Wshadow -fno-builtin + WFLAGS= -Wextra -Wsign-compare -Wconversion -Wextra -Wno-unused-parameter + + # $Format: "REL=$Xdelta3Version$" $ +@@ -126,7 +126,7 @@ + $(WIXDIR)/light.exe xdelta3.wixobj -out xdelta3.msi + + xdelta3: $(SOURCES) +- $(CC) $(CFLAGS) -O3 xdelta3.c -lm -o xdelta3 \ ++ $(CC) $(CFLAGS) -O3 xdelta3.c -lm $(LDFLAGS) -o xdelta3 \ + -DGENERIC_ENCODE_TABLES=0 \ + -DREGRESSION_TEST=1 \ + -DSECONDARY_DJW=1 \ +@@ -137,7 +137,7 @@ + -DXD3_USE_LARGEFILE64=1 + + xdelta3-debug: $(SOURCES) +- $(CC) -g $(CFLAGS) xdelta3.c -lm -o xdelta3-debug \ ++ $(CC) -g $(CFLAGS) xdelta3.c -lm $(LDFLAGS) -o xdelta3-debug \ + -DGENERIC_ENCODE_TABLES=1 \ + -DREGRESSION_TEST=1 \ + -DSECONDARY_DJW=1 \ +@@ -202,6 +202,9 @@ xdelta3.o: $(SOURCES) $(CC) -O3 $(CFLAGS) -c xdelta3.c $(SWIG_FLAGS) -o xdelta3.o @@ -11,14 +38,14 @@ diff -Naur xdelta3.0v-old/Makefile xdelta3.0v/Makefile xdelta3_wrap.o: xdelta3_wrap.c $(CC) -O3 $(CFLAGS) $(SWIG_FLAGS) \ -DHAVE_CONFIG_H \ -@@ -218,8 +221,8 @@ +@@ -221,8 +224,8 @@ cp $(SWIGTGT) /usr/lib/python$(PYVER)/site-packages ifeq ("$(DARWIN)", "") -xdelta3module.so: xdelta3_wrap.o xdelta3.o - ld -shared xdelta3.o xdelta3_wrap.o \ +xdelta3module.so: xdelta3_wrap.o xdelta3_PIC.o -+ cc -shared xdelta3_PIC.o xdelta3_wrap.o \ ++ cc $(CFLAGS) $(LDFLAGS) -shared xdelta3_PIC.o xdelta3_wrap.o \ -o xdelta3module.so \ /usr/lib/libpython$(PYVER).so \ -lc |