[arch-commits] Commit in xdelta3/trunk (PKGBUILD xdelta3-makefile.patch)
Allan McRae
allan at archlinux.org
Sat Mar 14 07:19:16 UTC 2009
Date: Saturday, March 14, 2009 @ 03:19:16
Author: allan
Revision: 29953
Add fix for x86_64 build issues and move other makefile fixes to patch
Added:
xdelta3/trunk/xdelta3-makefile.patch
Modified:
xdelta3/trunk/PKGBUILD
------------------------+
PKGBUILD | 13 ++++++-------
xdelta3-makefile.patch | 33 +++++++++++++++++++++++++++++++++
2 files changed, 39 insertions(+), 7 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2009-03-14 05:55:18 UTC (rev 29952)
+++ PKGBUILD 2009-03-14 07:19:16 UTC (rev 29953)
@@ -12,15 +12,15 @@
license=('GPL')
makedepends=('python')
optdepends=('python: for python modules')
-source=("http://xdelta.googlecode.com/files/xdelta$pkgver.tar.gz")
-md5sums=('6b5faeb88028a1211cb047e49b687a3a')
+source=(http://xdelta.googlecode.com/files/xdelta$pkgver.tar.gz
+ xdelta3-makefile.patch)
+md5sums=('6b5faeb88028a1211cb047e49b687a3a'
+ '35aa0d20a27791addeb929591a78bd3f')
build() {
cd $srcdir/xdelta$pkgver
+ patch -Np1 -i $srcdir/xdelta3-makefile.patch
- # use python2.6
- sed -i "s#2.5#2.6#" Makefile
-
# xdelta3 binary
make xdelta3 || return 1
install -D xdelta3 $pkgdir/usr/bin/xdelta3
@@ -29,8 +29,7 @@
python ./setup.py install --root ${pkgdir}
# xdelta3 python module
- sed -i "s#ld -#cc -#" Makefile
- make xdelta3module.so
+ make xdelta3module.so || return 1
install -m644 {xdelta3.py,xdelta3module.so} ${pkgdir}/usr/lib/python2.6/site-packages
}
Added: xdelta3-makefile.patch
===================================================================
--- xdelta3-makefile.patch (rev 0)
+++ xdelta3-makefile.patch 2009-03-14 07:19:16 UTC (rev 29953)
@@ -0,0 +1,33 @@
+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
+@@ -4,7 +4,7 @@
+ UNAME = $(shell uname)
+ CYGWIN = $(findstring CYGWIN, $(UNAME))
+ DARWIN = $(findstring Darwin, $(UNAME))
+-PYVER = 2.5
++PYVER = 2.6
+
+ ifeq ("$(CYGWIN)", "")
+ SWIGTGT = xdelta3module.so
+@@ -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
More information about the arch-commits
mailing list