[arch-commits] Commit in xdelta3/repos (8 files)
Allan McRae
allan at archlinux.org
Wed Dec 21 02:07:08 UTC 2011
Date: Tuesday, December 20, 2011 @ 21:07:07
Author: allan
Revision: 145279
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
xdelta3/repos/extra-i686/PKGBUILD
(from rev 145278, xdelta3/trunk/PKGBUILD)
xdelta3/repos/extra-i686/xdelta3-makefile.patch
(from rev 145278, xdelta3/trunk/xdelta3-makefile.patch)
xdelta3/repos/extra-x86_64/PKGBUILD
(from rev 145278, xdelta3/trunk/PKGBUILD)
xdelta3/repos/extra-x86_64/xdelta3-makefile.patch
(from rev 145278, xdelta3/trunk/xdelta3-makefile.patch)
Deleted:
xdelta3/repos/extra-i686/PKGBUILD
xdelta3/repos/extra-i686/xdelta3-makefile.patch
xdelta3/repos/extra-x86_64/PKGBUILD
xdelta3/repos/extra-x86_64/xdelta3-makefile.patch
-------------------------------------+
extra-i686/PKGBUILD | 82 +++++++++++++++++++---------------
extra-i686/xdelta3-makefile.patch | 75 +++++++++++++++++++++----------
extra-x86_64/PKGBUILD | 82 +++++++++++++++++++---------------
extra-x86_64/xdelta3-makefile.patch | 75 +++++++++++++++++++++----------
4 files changed, 194 insertions(+), 120 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2011-12-21 02:05:53 UTC (rev 145278)
+++ extra-i686/PKGBUILD 2011-12-21 02:07:07 UTC (rev 145279)
@@ -1,36 +0,0 @@
-# $Id: $
-# Maintainer: Allan McRae <allan at archlinux.org>
-# Contributor: Eduard "bekks" Warkentin <eduard.warkentin at gmail.com>
-# Contributor: Henning Garus <henning.garus at gmail.com>
-
-pkgname=xdelta3
-pkgver=3.0.0
-pkgrel=1
-pkgdesc="A diff utility which works with binary files"
-arch=('i686' 'x86_64')
-url="http://xdelta.org/"
-license=('GPL')
-makedepends=('python2')
-optdepends=('python2: for python modules')
-source=(http://xdelta.googlecode.com/files/xdelta$pkgver.tar.gz
- xdelta3-makefile.patch)
-md5sums=('5fe038be3a266d2a7913e10d1cec6d88'
- '378e9a735d92fb2fc695ed9ce2fad2d5')
-
-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
-}
-
-package() {
- cd $srcdir/xdelta$pkgver
-
- install -D xdelta3 $pkgdir/usr/bin/xdelta3
- python2 ./setup.py install --root ${pkgdir}
- install -m644 {xdelta3.py,xdelta3module.so} ${pkgdir}/usr/lib/python2.7/site-packages
-}
-
Copied: xdelta3/repos/extra-i686/PKGBUILD (from rev 145278, xdelta3/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-12-21 02:07:07 UTC (rev 145279)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Allan McRae <allan at archlinux.org>
+# Contributor: Eduard "bekks" Warkentin <eduard.warkentin at gmail.com>
+# Contributor: Henning Garus <henning.garus at gmail.com>
+
+pkgname=xdelta3
+pkgver=3.0.0
+pkgrel=2
+pkgdesc="A diff utility which works with binary files"
+arch=('i686' 'x86_64')
+url="http://xdelta.org/"
+license=('GPL')
+makedepends=('python2')
+optdepends=('python2: for python modules')
+source=(http://xdelta.googlecode.com/files/xdelta$pkgver.tar.gz
+ xdelta3-makefile.patch)
+md5sums=('5fe038be3a266d2a7913e10d1cec6d88'
+ '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() {
+ cd $srcdir/xdelta$pkgver
+
+ install -D xdelta3 $pkgdir/usr/bin/xdelta3
+ python2 ./setup.py install --root ${pkgdir}
+ install -m644 {xdelta3.py,xdelta3module.so} ${pkgdir}/usr/lib/python2.7/site-packages
+}
+
Deleted: extra-i686/xdelta3-makefile.patch
===================================================================
--- extra-i686/xdelta3-makefile.patch 2011-12-21 02:05:53 UTC (rev 145278)
+++ extra-i686/xdelta3-makefile.patch 2011-12-21 02:07:07 UTC (rev 145279)
@@ -1,24 +0,0 @@
-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 @@
- xdelta3.o: $(SOURCES)
- $(CC) -O3 $(CFLAGS) -c xdelta3.c $(SWIG_FLAGS) -o xdelta3.o
-
-+xdelta3_PIC.o: $(SOURCES)
-+ $(CC) -O3 $(CFLAGS) -fPIC -c xdelta3.c $(SWIG_FLAGS) -o xdelta3_PIC.o
-+
- xdelta3_wrap.o: xdelta3_wrap.c
- $(CC) -O3 $(CFLAGS) $(SWIG_FLAGS) \
- -DHAVE_CONFIG_H \
-@@ -218,8 +221,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 \
- -o xdelta3module.so \
- /usr/lib/libpython$(PYVER).so \
- -lc
Copied: xdelta3/repos/extra-i686/xdelta3-makefile.patch (from rev 145278, xdelta3/trunk/xdelta3-makefile.patch)
===================================================================
--- extra-i686/xdelta3-makefile.patch (rev 0)
+++ extra-i686/xdelta3-makefile.patch 2011-12-21 02:07:07 UTC (rev 145279)
@@ -0,0 +1,51 @@
+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
+
++xdelta3_PIC.o: $(SOURCES)
++ $(CC) -O3 $(CFLAGS) -fPIC -c xdelta3.c $(SWIG_FLAGS) -o xdelta3_PIC.o
++
+ xdelta3_wrap.o: xdelta3_wrap.c
+ $(CC) -O3 $(CFLAGS) $(SWIG_FLAGS) \
+ -DHAVE_CONFIG_H \
+@@ -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 $(CFLAGS) $(LDFLAGS) -shared xdelta3_PIC.o xdelta3_wrap.o \
+ -o xdelta3module.so \
+ /usr/lib/libpython$(PYVER).so \
+ -lc
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2011-12-21 02:05:53 UTC (rev 145278)
+++ extra-x86_64/PKGBUILD 2011-12-21 02:07:07 UTC (rev 145279)
@@ -1,36 +0,0 @@
-# $Id: $
-# Maintainer: Allan McRae <allan at archlinux.org>
-# Contributor: Eduard "bekks" Warkentin <eduard.warkentin at gmail.com>
-# Contributor: Henning Garus <henning.garus at gmail.com>
-
-pkgname=xdelta3
-pkgver=3.0.0
-pkgrel=1
-pkgdesc="A diff utility which works with binary files"
-arch=('i686' 'x86_64')
-url="http://xdelta.org/"
-license=('GPL')
-makedepends=('python2')
-optdepends=('python2: for python modules')
-source=(http://xdelta.googlecode.com/files/xdelta$pkgver.tar.gz
- xdelta3-makefile.patch)
-md5sums=('5fe038be3a266d2a7913e10d1cec6d88'
- '378e9a735d92fb2fc695ed9ce2fad2d5')
-
-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
-}
-
-package() {
- cd $srcdir/xdelta$pkgver
-
- install -D xdelta3 $pkgdir/usr/bin/xdelta3
- python2 ./setup.py install --root ${pkgdir}
- install -m644 {xdelta3.py,xdelta3module.so} ${pkgdir}/usr/lib/python2.7/site-packages
-}
-
Copied: xdelta3/repos/extra-x86_64/PKGBUILD (from rev 145278, xdelta3/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2011-12-21 02:07:07 UTC (rev 145279)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Allan McRae <allan at archlinux.org>
+# Contributor: Eduard "bekks" Warkentin <eduard.warkentin at gmail.com>
+# Contributor: Henning Garus <henning.garus at gmail.com>
+
+pkgname=xdelta3
+pkgver=3.0.0
+pkgrel=2
+pkgdesc="A diff utility which works with binary files"
+arch=('i686' 'x86_64')
+url="http://xdelta.org/"
+license=('GPL')
+makedepends=('python2')
+optdepends=('python2: for python modules')
+source=(http://xdelta.googlecode.com/files/xdelta$pkgver.tar.gz
+ xdelta3-makefile.patch)
+md5sums=('5fe038be3a266d2a7913e10d1cec6d88'
+ '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() {
+ cd $srcdir/xdelta$pkgver
+
+ install -D xdelta3 $pkgdir/usr/bin/xdelta3
+ python2 ./setup.py install --root ${pkgdir}
+ install -m644 {xdelta3.py,xdelta3module.so} ${pkgdir}/usr/lib/python2.7/site-packages
+}
+
Deleted: extra-x86_64/xdelta3-makefile.patch
===================================================================
--- extra-x86_64/xdelta3-makefile.patch 2011-12-21 02:05:53 UTC (rev 145278)
+++ extra-x86_64/xdelta3-makefile.patch 2011-12-21 02:07:07 UTC (rev 145279)
@@ -1,24 +0,0 @@
-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 @@
- xdelta3.o: $(SOURCES)
- $(CC) -O3 $(CFLAGS) -c xdelta3.c $(SWIG_FLAGS) -o xdelta3.o
-
-+xdelta3_PIC.o: $(SOURCES)
-+ $(CC) -O3 $(CFLAGS) -fPIC -c xdelta3.c $(SWIG_FLAGS) -o xdelta3_PIC.o
-+
- xdelta3_wrap.o: xdelta3_wrap.c
- $(CC) -O3 $(CFLAGS) $(SWIG_FLAGS) \
- -DHAVE_CONFIG_H \
-@@ -218,8 +221,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 \
- -o xdelta3module.so \
- /usr/lib/libpython$(PYVER).so \
- -lc
Copied: xdelta3/repos/extra-x86_64/xdelta3-makefile.patch (from rev 145278, xdelta3/trunk/xdelta3-makefile.patch)
===================================================================
--- extra-x86_64/xdelta3-makefile.patch (rev 0)
+++ extra-x86_64/xdelta3-makefile.patch 2011-12-21 02:07:07 UTC (rev 145279)
@@ -0,0 +1,51 @@
+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
+
++xdelta3_PIC.o: $(SOURCES)
++ $(CC) -O3 $(CFLAGS) -fPIC -c xdelta3.c $(SWIG_FLAGS) -o xdelta3_PIC.o
++
+ xdelta3_wrap.o: xdelta3_wrap.c
+ $(CC) -O3 $(CFLAGS) $(SWIG_FLAGS) \
+ -DHAVE_CONFIG_H \
+@@ -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 $(CFLAGS) $(LDFLAGS) -shared xdelta3_PIC.o xdelta3_wrap.o \
+ -o xdelta3module.so \
+ /usr/lib/libpython$(PYVER).so \
+ -lc
More information about the arch-commits
mailing list