From 22cf86961b2c62437603fd3a61dfab580bedd837 Mon Sep 17 00:00:00 2001 From: Michael Hanson Date: Thu, 9 Dec 2010 03:51:31 +0000 Subject: gdbm: recompile with some needed patches. Remove python (python3). --- abs/core/gdbm/PKGBUILD | 44 ++++++--- abs/core/gdbm/__changelog | 2 + abs/core/gdbm/gdbm-1.8.3-fhs.patch | 138 ++++++++++++++++++++++++++++ abs/core/gdbm/gdbm.install | 21 +++++ abs/core/python/PKGBUILD | 55 ----------- abs/core/python/python-internal-expat.patch | 33 ------- 6 files changed, 190 insertions(+), 103 deletions(-) create mode 100644 abs/core/gdbm/__changelog create mode 100644 abs/core/gdbm/gdbm-1.8.3-fhs.patch create mode 100644 abs/core/gdbm/gdbm.install delete mode 100644 abs/core/python/PKGBUILD delete mode 100644 abs/core/python/python-internal-expat.patch diff --git a/abs/core/gdbm/PKGBUILD b/abs/core/gdbm/PKGBUILD index 1154818..91744e4 100644 --- a/abs/core/gdbm/PKGBUILD +++ b/abs/core/gdbm/PKGBUILD @@ -1,24 +1,38 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: judd +# $Id: PKGBUILD 73046 2010-03-22 00:42:44Z allan $ +# Maintainer: Allan McRae +# Contributor: judd + pkgname=gdbm pkgver=1.8.3 -pkgrel=14 +pkgrel=15 pkgdesc="GNU database library" url="http://www.gnu.org/software/gdbm/gdbm.html" license=('GPL') -arch=(i686 x86_64) -groups=('base') -depends=('glibc') -source=(ftp://ftp.gnu.org/gnu/gdbm/$pkgname-$pkgver.tar.gz) -md5sums=('1d1b1d5c0245b1c00aff92da751e9aa1') +arch=('i686' 'x86_64') +depends=('glibc' 'sh') +source=(ftp://ftp.gnu.org/gnu/gdbm/$pkgname-$pkgver.tar.gz + gdbm-1.8.3-fhs.patch) +options=('!libtool' '!makeflags') +install=gdbm.install build() { - cd $startdir/src/$pkgname-$pkgver - ./configure --prefix=/usr + cd $srcdir/$pkgname-$pkgver + patch -Np1 -i $srcdir/gdbm-1.8.3-fhs.patch + + libtoolize --force --copy + aclocal + autoconf + + ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info make prefix=/usr || return 1 - make prefix=$startdir/pkg/usr install - make prefix=$startdir/pkg/usr install-compat - chown root.root $startdir/pkg/usr/include/{dbm.h,gdbm.h,ndbm.h} - chown root.root $startdir/pkg/usr/man/man3/gdbm.3 - find $startdir/pkg -name '*.la' -exec rm {} \; + + make prefix=$pkgdir/usr \ + manprefix=$pkgdir/usr/share/man \ + man3dir=$pkgdir/usr/share/man/man3 \ + infodir=$pkgdir/usr/share/info \ + install install-compat + + ln -sf gdbm/gdbm.h $pkgdir/usr/include } +md5sums=('1d1b1d5c0245b1c00aff92da751e9aa1' + 'a5bb00f10f4d8317435c4cf471b6ced4') diff --git a/abs/core/gdbm/__changelog b/abs/core/gdbm/__changelog new file mode 100644 index 0000000..7eaaf1d --- /dev/null +++ b/abs/core/gdbm/__changelog @@ -0,0 +1,2 @@ +Add -lgdbm_compat to line 104 of gdbm-1.8.3-fhs.patch. Python2.6 would not + build "dbm" module without this. diff --git a/abs/core/gdbm/gdbm-1.8.3-fhs.patch b/abs/core/gdbm/gdbm-1.8.3-fhs.patch new file mode 100644 index 0000000..5b405d9 --- /dev/null +++ b/abs/core/gdbm/gdbm-1.8.3-fhs.patch @@ -0,0 +1,138 @@ +diff -up gdbm-1.8.3/Makefile.in.fhs gdbm-1.8.3/Makefile.in +--- gdbm-1.8.3/Makefile.in.fhs 2002-10-08 18:09:12.000000000 +0200 ++++ gdbm-1.8.3/Makefile.in 2010-03-10 15:41:01.516025096 +0100 +@@ -1,7 +1,7 @@ + #### Start of system configuration section. #### + + srcdir = @srcdir@ +-top_builddir = . ++top_builddir = @top_builddir@ + VPATH = @srcdir@ + + CC = @CC@ +@@ -14,17 +14,13 @@ INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_DATA = @INSTALL_DATA@ + +-# File ownership and group +-BINOWN = bin +-BINGRP = bin +- + MAKEINFO = makeinfo + TEXI2DVI = texi2dvi + +-DEFS = ++DEFS = @DEFS@ + + # Where the system [n]dbm routines are... +-LIBS = @LIBS@ -lc ++LIBS = @LIBS@ + + CFLAGS = @CFLAGS@ + LDFLAGS = @LDFLAGS@ +@@ -32,16 +28,17 @@ LDFLAGS = @LDFLAGS@ + # Common prefix for installation directories + prefix = @prefix@ + exec_prefix = @exec_prefix@ +-binprefix = $(exec_prefix) +-manprefix = $(prefix) ++datarootdir = @datarootdir@ + + # Directory in which to put libgdbm.a. + libdir = @libdir@ + # The include directory for gdbm.h and dbm.h. + includedir = @includedir@ ++pkgincludedir = $(includedir)/gdbm + # Info and man directories. + infodir = @infodir@ +-man3dir = @mandir@/man3 ++mandir = @mandir@ ++man3dir = $(mandir)/man3 + manext = 3 + + #### End of system configuration section. #### +@@ -57,7 +54,7 @@ manext = 3 + + SHELL = /bin/sh + +-PROGS = libgdbm.la testgdbm testdbm testndbm tndbm tdbm conv2gdbm ++PROGS = libgdbm.la testgdbm testdbm testndbm conv2gdbm + + DBM_CF = dbminit.c delete.c fetch.c store.c seq.c close.c + +@@ -127,26 +124,17 @@ all: libgdbm.la libgdbm_compat.la + progs: $(PROGS) + + install: libgdbm.la gdbm.h gdbm.info +- $(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \ +- $(INSTALL_ROOT)$(includedir) $(INSTALL_ROOT)$(man3dir) \ +- $(INSTALL_ROOT)$(infodir) +- $(LIBTOOL) $(INSTALL) -c libgdbm.la $(INSTALL_ROOT)$(libdir)/libgdbm.la +- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) gdbm.h \ +- $(INSTALL_ROOT)$(includedir)/gdbm.h +- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.3 \ +- $(INSTALL_ROOT)$(man3dir)/gdbm.3 +- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.info \ +- $(INSTALL_ROOT)$(infodir)/gdbm.info ++ $(srcdir)/mkinstalldirs $(libdir) $(pkgincludedir) $(man3dir) $(infodir) ++ $(LIBTOOL) install install libgdbm.la $(libdir)/libgdbm.la ++ $(INSTALL_DATA) gdbm.h $(pkgincludedir)/gdbm.h ++ $(INSTALL_DATA) $(srcdir)/gdbm.3 $(man3dir)/gdbm.3 ++ $(INSTALL_DATA) $(srcdir)/gdbm.info $(infodir)/gdbm.info + + install-compat: +- $(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \ +- $(INSTALL_ROOT)$(includedir) +- $(LIBTOOL) $(INSTALL) -c libgdbm_compat.la \ +- $(INSTALL_ROOT)$(libdir)/libgdbm_compat.la +- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/dbm.h \ +- $(INSTALL_ROOT)$(includedir)/dbm.h +- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/ndbm.h \ +- $(INSTALL_ROOT)$(includedir)/ndbm.h ++ $(srcdir)/mkinstalldirs $(libdir) $(pkgincludedir) ++ $(LIBTOOL) install install libgdbm_compat.la $(libdir)/libgdbm_compat.la ++ $(INSTALL_DATA) $(srcdir)/dbm.h $(pkgincludedir)/dbm.h ++ $(INSTALL_DATA) $(srcdir)/ndbm.h $(pkgincludedir)/ndbm.h + + #libgdbm.a: $(OBJS) gdbm.h + # rm -f libgdbm.a +@@ -161,7 +149,7 @@ libgdbm.la: $(LOBJS) gdbm.h + libgdbm_compat.la: $(C_LOBJS) gdbm.h + rm -f libgdbm_compat.la + $(LIBTOOL) --mode=link $(CC) -o libgdbm_compat.la -rpath $(libdir) \ +- -version-info $(SHLIB_VER) $(C_LOBJS) ++ -version-info $(SHLIB_VER) $(C_LOBJS) -lgdbm_compat -lgdbm + + gdbm.h: gdbm.proto gdbmerrno.h gdbm.proto2 + rm -f gdbm.h +@@ -172,10 +160,10 @@ gdbm.h: gdbm.proto gdbmerrno.h gdbm.prot + chmod -w gdbm.h + + testgdbm: testgdbm.o libgdbm.la @LIBOBJS@ +- $(LIBTOOL) $(CC) $(LDFLAGS) -o testgdbm testgdbm.o libgdbm.la @LIBOBJS@ ++ $(LIBTOOL) link $(CC) $(LDFLAGS) -o testgdbm testgdbm.o libgdbm.la @LIBOBJS@ + + testdbm: testdbm.o libgdbm.la libgdbm_compat.la +- $(LIBTOOL) $(CC) $(LDFLAGS) -o testdbm testdbm.o libgdbm.la libgdbm_compat.la ++ $(LIBTOOL) link $(CC) $(LDFLAGS) -o testdbm testdbm.o $(LIBS) libgdbm_compat.la + + tdbm: testdbm.o + $(CC) $(LDFLAGS) -o tdbm testdbm.o $(LIBS) +@@ -184,7 +172,7 @@ testndbm.o: testndbm.c + $(CC) -c -I. -I$(srcdir) $(CFLAGS) $(DEFS) -DGNU $(srcdir)/testndbm.c + + testndbm: testndbm.o libgdbm.la libgdbm_compat.la +- $(LIBTOOL) $(CC) $(LDFLAGS) -o testndbm testndbm.o libgdbm.la libgdbm_compat.la ++ $(LIBTOOL) link $(CC) $(LDFLAGS) -o testndbm testndbm.o libgdbm_compat.la + + tndbm.o: testndbm.c + cp $(srcdir)/testndbm.c ./tndbm.c +@@ -195,7 +183,7 @@ tndbm: tndbm.o + $(CC) $(LDFLAGS) -o tndbm tndbm.o $(LIBS) + + conv2gdbm: conv2gdbm.o libgdbm.la @LIBOBJS@ +- $(LIBTOOL) $(CC) $(LDFLAGS) -o conv2gdbm conv2gdbm.o $(LIBS) libgdbm.la @LIBOBJS@ ++ $(LIBTOOL) link $(CC) $(LDFLAGS) -o conv2gdbm conv2gdbm.o $(LIBS) libgdbm_compat.la @LIBOBJS@ + + lintgdbm: + lint $(DEFS) $(LFLAGS) $(DBM_CF) $(NDBM_CF) $(GDBM_CF) testgdbm.c diff --git a/abs/core/gdbm/gdbm.install b/abs/core/gdbm/gdbm.install new file mode 100644 index 0000000..2d1ce2c --- /dev/null +++ b/abs/core/gdbm/gdbm.install @@ -0,0 +1,21 @@ +infodir=/usr/share/info +filelist=(gdbm.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + usr/bin/install-info $infodir/$file $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + usr/bin/install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done +} + diff --git a/abs/core/python/PKGBUILD b/abs/core/python/PKGBUILD deleted file mode 100644 index fcbfc50..0000000 --- a/abs/core/python/PKGBUILD +++ /dev/null @@ -1,55 +0,0 @@ -# $Id: PKGBUILD 94083 2010-10-04 12:47:13Z allan $ -# Maintainer: Allan McRae -# Contributer: Jason Chu - -pkgname=python -pkgver=3.1.2 -pkgrel=3 -_pybasever=3.1 -pkgdesc="Next generation of the python high-level scripting language" -arch=('i686' 'x86_64') -license=('custom') -url="http://www.python.org" -depends=('expat' 'bzip2' 'gdbm' 'openssl' 'zlib') -makedepends=('tk' 'sqlite3') -optdepends=('tk: for tkinter') -provides=('python3') -replaces=('python3') -conflicts=('python2') -options=('!makeflags') -source=(http://www.python.org/ftp/python/${pkgver}/Python-${pkgver}.tar.bz2 - python-internal-expat.patch) -md5sums=('45350b51b58a46b029fb06c61257e350' - '993800dbcc0c4f199c1ceee998a06e71') - -build() { - cd ${srcdir}/Python-${pkgver} - - patch -Np0 -i ${srcdir}/python-internal-expat.patch - - export OPT="${CFLAGS}" - ./configure --prefix=/usr --enable-shared --with-threads --with-computed-gotos \ - --enable-unicode --with-wide-unicode - - make || return 1 -} - -package() { - cd ${srcdir}/Python-${pkgver} - make DESTDIR=${pkgdir} install || return 1 - - # why are these not done by default... - ln -sf python3 ${pkgdir}/usr/bin/python - ln -sf python3-config ${pkgdir}/usr/bin/python-config - ln -sf idle3 ${pkgdir}/usr/bin/idle - ln -sf pydoc3 ${pkgdir}/usr/bin/pydoc - - # clean-up reference to build directory - sed -i "s#$srcdir/Python-${pkgver}:##" $pkgdir/usr/lib/python3.1/config/Makefile - - # Fix conflicts with python2 - python2 version is newer... - rm ${pkgdir}/usr/bin/2to3 - - # license - install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/abs/core/python/python-internal-expat.patch b/abs/core/python/python-internal-expat.patch deleted file mode 100644 index 86252ab..0000000 --- a/abs/core/python/python-internal-expat.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- setup.py 2008-04-22 12:12:24.613554757 +0300 -+++ setup.py 2008-04-22 12:13:09.276544063 +0300 -@@ -1035,18 +1035,15 @@ - # - # More information on Expat can be found at www.libexpat.org. - # -- expatinc = os.path.join(os.getcwd(), srcdir, 'Modules', 'expat') -- define_macros = [ -- ('HAVE_EXPAT_CONFIG_H', '1'), -- ] -+ # Use system expat -+ expatinc = '/usr/include' -+ define_macros = [] - - exts.append(Extension('pyexpat', - define_macros = define_macros, - include_dirs = [expatinc], -+ libraries = ['expat'], - sources = ['pyexpat.c', -- 'expat/xmlparse.c', -- 'expat/xmlrole.c', -- 'expat/xmltok.c', - ], - )) - -@@ -1058,6 +1055,7 @@ - exts.append(Extension('_elementtree', - define_macros = define_macros, - include_dirs = [expatinc], -+ libraries = ['expat'], - sources = ['_elementtree.c'], - )) - -- cgit v0.12