diff options
| author | James Meyer <james.meyer@operamail.com> | 2011-10-19 18:31:38 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2011-10-19 18:31:38 (GMT) |
| commit | d9aad8b00a9f3fb60e456c0e528df90189acb5b3 (patch) | |
| tree | 6b9126d2336c62d1e5533798e7348f6a5723f6ba /abs/core/libxml2 | |
| parent | d9a08ac22f9c6661cf3b478927be321274d10794 (diff) | |
| parent | c65b741914b31ac88086e363edc4415eb6aa1686 (diff) | |
| download | linhes_pkgbuild-d9aad8b00a9f3fb60e456c0e528df90189acb5b3.zip linhes_pkgbuild-d9aad8b00a9f3fb60e456c0e528df90189acb5b3.tar.gz linhes_pkgbuild-d9aad8b00a9f3fb60e456c0e528df90189acb5b3.tar.bz2 | |
Merge remote-tracking branch 'origin/testing' into testing
Conflicts:
abs/core/LinHES-config/PKGBUILD
Diffstat (limited to 'abs/core/libxml2')
| -rw-r--r-- | abs/core/libxml2/PKGBUILD | 20 | ||||
| -rw-r--r-- | abs/core/libxml2/shared_library_versionning.patch | 21 |
2 files changed, 33 insertions, 8 deletions
diff --git a/abs/core/libxml2/PKGBUILD b/abs/core/libxml2/PKGBUILD index 55adfb7..2566d0e 100644 --- a/abs/core/libxml2/PKGBUILD +++ b/abs/core/libxml2/PKGBUILD @@ -1,32 +1,36 @@ -# $Id: PKGBUILD 87702 2010-08-18 01:57:53Z allan $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=libxml2 pkgver=2.7.8 -pkgrel=3 +pkgrel=4 pkgdesc="XML parsing library, version 2" -arch=('i686' 'x86_64') +arch=(i686 x86_64) license=('custom') depends=('zlib>=1.2.4' 'readline>=6.1' 'ncurses>=5.7') makedepends=('python2') options=('!libtool') url="http://www.xmlsoft.org/" source=(ftp://ftp.xmlsoft.org/${pkgname}/${pkgname}-${pkgver}.tar.gz - largefile64.patch) + largefile64.patch shared_library_versionning.patch) +md5sums=('8127a65e8c3b08856093099b52599c86' + '5ad4915665608ebfa5b89f7908467a72' + '84aeb7c6db023eae044e95d9211dba53') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -Np1 -i "${srcdir}/largefile64.patch" + patch -Np1 -i "${srcdir}/shared_library_versionning.patch" + autoreconf -fi ./configure --prefix=/usr --with-threads --with-history \ --with-python=/usr/bin/python2.7 - make || return 1 + make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + make DESTDIR="${pkgdir}" install install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } -md5sums=('8127a65e8c3b08856093099b52599c86' - '5ad4915665608ebfa5b89f7908467a72') + diff --git a/abs/core/libxml2/shared_library_versionning.patch b/abs/core/libxml2/shared_library_versionning.patch new file mode 100644 index 0000000..a0b62bc --- /dev/null +++ b/abs/core/libxml2/shared_library_versionning.patch @@ -0,0 +1,21 @@ +From 00819877651b87842ed878898ba17dba489820f0 Mon Sep 17 00:00:00 2001 +From: Daniel Veillard <veillard@redhat.com> +Date: Thu, 04 Nov 2010 20:53:14 +0000 +Subject: Reactivate the shared library versionning script + +--- +diff --git a/configure.in b/configure.in +index 59d0629..a1d2c89 100644 +--- a/configure.in ++++ b/configure.in +@@ -84,7 +84,7 @@ else + esac + fi + AC_SUBST(VERSION_SCRIPT_FLAGS) +-AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -z "$VERSION_SCRIPT_FLAGS"]) ++AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -n "$VERSION_SCRIPT_FLAGS"]) + + dnl + dnl We process the AC_ARG_WITH first so that later we can modify +-- +cgit v0.8.3.1 |