[arch-commits] Commit in bluez/trunk (PKGBUILD make-libcheck-optional.patch)
Andrea Scarpino
andrea at archlinux.org
Fri Jan 13 22:26:03 UTC 2012
Date: Friday, January 13, 2012 @ 17:26:02
Author: andrea
Revision: 146599
upgpkg: bluez 4.98-1
Upstream release
Modified:
bluez/trunk/PKGBUILD
Deleted:
bluez/trunk/make-libcheck-optional.patch
------------------------------+
PKGBUILD | 13 ++----
make-libcheck-optional.patch | 79 -----------------------------------------
2 files changed, 4 insertions(+), 88 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-01-13 22:25:53 UTC (rev 146598)
+++ PKGBUILD 2012-01-13 22:26:02 UTC (rev 146599)
@@ -4,7 +4,7 @@
# Contributor: Geoffroy Carrier <geoffroy at archlinux.org>
pkgname=bluez
-pkgver=4.97
+pkgver=4.98
pkgrel=1
pkgdesc="Libraries and tools for the Bluetooth protocol stack"
url="http://www.bluez.org/"
@@ -27,19 +27,14 @@
'etc/conf.d/bluetooth' 'etc/dbus-1/system.d/bluetooth.conf')
source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2"
'bluetooth.conf.d'
- 'rc.bluetooth'
- 'make-libcheck-optional.patch')
-md5sums=('b302cee7f9b9527d29775449d7e1dfe6'
+ 'rc.bluetooth')
+md5sums=('4aca8a0929250212e9a75fb60dd75b05'
'7412982b440f29fa7f76a41a87fef985'
- '8f9498707f809506928b2e480d3b6789'
- 'f112fc5bcaeecc7b6ea994f14786e235')
+ '8f9498707f809506928b2e480d3b6789')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 -i "${srcdir}"/make-libcheck-optional.patch
- autoreconf -i -f
-
./configure --prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
Deleted: make-libcheck-optional.patch
===================================================================
--- make-libcheck-optional.patch 2012-01-13 22:25:53 UTC (rev 146598)
+++ make-libcheck-optional.patch 2012-01-13 22:26:02 UTC (rev 146599)
@@ -1,79 +0,0 @@
-From: Marcel Holtmann <marcel at holtmann.org>
-Date: Wed, 28 Dec 2011 04:09:56 +0000 (-0800)
-Subject: build: Move libcheck under TEST conditional
-X-Git-Url: http://git.kernel.org/?p=bluetooth%2Fbluez.git;a=commitdiff_plain;h=bf5d45f2fbd1b1463512f4eb8d30bffb3478ccc7;hp=ec632165d6707bece074dbba43d704e26346ab0a
-
-build: Move libcheck under TEST conditional
----
-
-diff --git a/Makefile.am b/Makefile.am
-index 9112483..5cf287c 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -449,6 +449,7 @@ endif
-
- unit_objects =
-
-+if TEST
- unit_tests = unit/test-eir
-
- noinst_PROGRAMS += $(unit_tests)
-@@ -456,8 +457,10 @@ noinst_PROGRAMS += $(unit_tests)
- unit_test_eir_SOURCES = unit/test-eir.c src/eir.c src/glib-helper.c
- unit_test_eir_LDADD = lib/libbluetooth-private.la @GLIB_LIBS@ @CHECK_LIBS@
- unit_test_eir_CFLAGS = $(AM_CFLAGS) @CHECK_CFLAGS@
--unit_test_eir_SHORTNAME = unit
- unit_objects += $(unit_test_eir_OBJECTS)
-+else
-+unit_tests =
-+endif
-
- TESTS = $(unit_tests)
-
-diff --git a/acinclude.m4 b/acinclude.m4
-index 2097d77..753b994 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -170,6 +170,12 @@ AC_DEFUN([AC_PATH_READLINE], [
- [])
- ])
-
-+AC_DEFUN([AC_PATH_CHECK], [
-+ PKG_CHECK_MODULES(CHECK, check >= 0.9.4, check_found=yes, check_found=no)
-+ AC_SUBST(CHECK_CFLAGS)
-+ AC_SUBST(CHECK_LIBS)
-+])
-+
- AC_DEFUN([AC_PATH_OUI], [
- AC_ARG_WITH(ouifile,
- AS_HELP_STRING([--with-ouifile=PATH],[Path to the oui.txt file @<:@auto@:>@]),
-@@ -422,7 +428,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [
- AM_CONDITIONAL(PAND, test "${pand_enable}" = "yes")
- AM_CONDITIONAL(DUND, test "${dund_enable}" = "yes")
- AM_CONDITIONAL(CUPS, test "${cups_enable}" = "yes")
-- AM_CONDITIONAL(TEST, test "${test_enable}" = "yes")
-+ AM_CONDITIONAL(TEST, test "${test_enable}" = "yes" && test "${check_found}" = "yes")
- AM_CONDITIONAL(TOOLS, test "${tools_enable}" = "yes")
- AM_CONDITIONAL(BCCMD, test "${bccmd_enable}" = "yes")
- AM_CONDITIONAL(PCMCIA, test "${pcmcia_enable}" = "yes")
-diff --git a/configure.ac b/configure.ac
-index 3a5dfde..a7670da 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -24,8 +24,6 @@ AC_PROG_YACC
- AM_PROG_LEX
- AM_PROG_MKDIR_P
-
--PKG_CHECK_MODULES([CHECK], [check >= 0.9.4])
--
- m4_define([_LT_AC_TAGCONFIG], [])
- m4_ifdef([AC_LIBTOOL_TAGS], [AC_LIBTOOL_TAGS([])])
-
-@@ -50,6 +48,7 @@ AC_PATH_UDEV
- AC_PATH_SNDFILE
- AC_PATH_OUI
- AC_PATH_READLINE
-+AC_PATH_CHECK
-
- AC_ARG_BLUEZ
-
More information about the arch-commits
mailing list