[Pkg-gnutls-commits] r463 - in /packages/gnutls26/trunk/debian: changelog control rules

[ametzler at users.alioth.debian.org]

Author: ametzler
Date: Sat Dec 22 17:41:13 2007
New Revision: 463

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=463
Log:
guile-1.8 does not build on ia64. Stop trying to build the gnutls wrapper there

Modified:
    packages/gnutls26/trunk/debian/changelog
    packages/gnutls26/trunk/debian/control
    packages/gnutls26/trunk/debian/rules

Modified: packages/gnutls26/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/trunk/debian/changelog?rev=463&op=diff
==============================================================================
--- packages/gnutls26/trunk/debian/changelog (original)
+++ packages/gnutls26/trunk/debian/changelog Sat Dec 22 17:41:13 2007
@@ -1,6 +1,8 @@
 gnutls26 (2.2.0-2) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * guile-1.8 does not build on ia64. Stop trying to build the gnutls wrapper
+    there.
 
  -- Andreas Metzler <ametzler at debian.org>  Sun, 16 Dec 2007 17:12:21 +0100
 

Modified: packages/gnutls26/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/trunk/debian/control?rev=463&op=diff
==============================================================================
--- packages/gnutls26/trunk/debian/control (original)
+++ packages/gnutls26/trunk/debian/control Sat Dec 22 17:41:13 2007
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian GnuTLS Maintainers <pkg-gnutls-maint at lists.alioth.debian.org>
 Uploaders: Andreas Metzler <ametzler at debian.org>, Eric Dorland <eric at debian.org>, James Westby <jw+debian at jameswestby.net>
-Build-Depends: debhelper (>= 5.0.0), libgcrypt11-dev (>= 1.3.2), zlib1g-dev, libopencdk10-dev (>= 0.6.5), cdbs, gtk-doc-tools, texinfo (>= 4.8), libtasn1-3-dev (>= 0.3.4-1), autotools-dev, guile-1.8-dev
+Build-Depends: debhelper (>= 5.0.0), libgcrypt11-dev (>= 1.3.2), zlib1g-dev, libopencdk10-dev (>= 0.6.5), cdbs, gtk-doc-tools, texinfo (>= 4.8), libtasn1-3-dev (>= 0.3.4-1), autotools-dev, guile-1.8-dev [!ia64]
 Build-Conflicts: libgnutls-dev
 Standards-Version: 3.7.3
 Homepage: http://www.gnutls.org/

Modified: packages/gnutls26/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/trunk/debian/rules?rev=463&op=diff
==============================================================================
--- packages/gnutls26/trunk/debian/rules (original)
+++ packages/gnutls26/trunk/debian/rules Sat Dec 22 17:41:13 2007
@@ -2,19 +2,33 @@
 # Build the gnutls package for Debian.
 
 ifeq ($(DEB_BUILD_ARCH),hppa)
-  CFLAGS += -fno-gcse
+	CFLAGS += -fno-gcse
+endif
+
+include /usr/share/cdbs/1/rules/buildvars.mk
+
+# No guile on ia64; do not build gnutls wrapper there.
+ifeq ($(DEB_BUILD_ARCH),ia64)
+	DEB_ARCH_PACKAGES := $(subst guile-gnutls,,$(DEB_ARCH_PACKAGES))
 endif
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS = --with-mcrypt=no --enable-ld-version-script --disable-cxx --enable-guile --with-guile-site-dir=/usr/share/guile/site --without-lzo
+DEB_CONFIGURE_EXTRA_FLAGS = --with-mcrypt=no --enable-ld-version-script --disable-cxx --without-lzo
 DEB_MAKE_CHECK_TARGET = check
 DEB_DH_STRIP_ARGS = --dbg-package=libgnutls26-dbg
 DEB_DH_MAKESHLIBS_ARGS_libgnutls26 := -V 'libgnutls26 (>=2.2.0-0)'
 DEB_DH_MAKESHLIBS_ARGS_guile-gnutls := -Xusr/lib/libguile-gnutls-
 DEB_COMPRESS_EXCLUDE := gnutls.pdf
+
+# No guile on ia64; do not build gnutls wrapper there.
+ifeq ($(DEB_BUILD_ARCH),ia64)
+	DEB_CONFIGURE_EXTRA_FLAGS += --disable-guile
+else
+	DEB_CONFIGURE_EXTRA_FLAGS += --enable-guile --with-guile-site-dir=/usr/share/guile/site
+endif
 
 #build/libgnutls-doc::
 #	$(DEB_MAKE_INVOKE) -C libextra/openpgp pgp-api.tex