Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (c695505fb03286fa0f9c8b982ad8b3312383c941)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Remko van der Vossen <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (c695505fb03286fa0f9c8b982ad8b3312383c941)
  • Date: Mon, 25 May 2015 06:29:06 -0500

GIT changes to master grimoire by Remko van der Vossen <wich AT sourcemage.org>:

utils/kbd/DEPENDS | 7 +++++--
utils/kbd/HISTORY | 4 ++++
utils/kbd/PRE_BUILD | 5 +++++
utils/kbd/kbd-2.0.0-tests.patch | 31 +++++++++++++++++++++++++++++++
4 files changed, 45 insertions(+), 2 deletions(-)

New commits:
commit c695505fb03286fa0f9c8b982ad8b3312383c941
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

kbd: make check dependency optional

diff --git a/utils/kbd/DEPENDS b/utils/kbd/DEPENDS
index 3861054..df928af 100755
--- a/utils/kbd/DEPENDS
+++ b/utils/kbd/DEPENDS
@@ -2,10 +2,13 @@ depends gnupg &&
depends smgl-fhs &&
depends autoconf &&
depends automake &&
-depends check &&

optional_depends linux-pam "" "--disable-vlock" "build vlock" &&
optional_depends gettext \
"--enable-nls" \
"--disable-nls" \
- "for Native Language Support"
+ "for Native Language Support" &&
+optional_depends check \
+ "--enable-tests" \
+ "--disable-tests" \
+ "to build unit tests"
diff --git a/utils/kbd/HISTORY b/utils/kbd/HISTORY
index 1b32178..068489b 100644
--- a/utils/kbd/HISTORY
+++ b/utils/kbd/HISTORY
@@ -1,3 +1,7 @@
+2015-04-25 Remko van der Vossen <wich AT sourcemage.org>
+ * PRE_BUILD, DEPENDS, kbd-2.0.0-tests.patch:
+ make check dependency optional, patch from Gentoo
+
2014-09-03 Treeve Jelbert <treeve AT sourcemage.org
* DETAILS: version 2.0.2
download from KERNEL_URL
diff --git a/utils/kbd/PRE_BUILD b/utils/kbd/PRE_BUILD
new file mode 100755
index 0000000..d3aa27d
--- /dev/null
+++ b/utils/kbd/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch < "$SPELL_DIRECTORY"/kbd-2.0.0-tests.patch &&
+autoreconf -fi
diff --git a/utils/kbd/kbd-2.0.0-tests.patch b/utils/kbd/kbd-2.0.0-tests.patch
new file mode 100644
index 0000000..7a4e186
--- /dev/null
+++ b/utils/kbd/kbd-2.0.0-tests.patch
@@ -0,0 +1,31 @@
+--- configure.ac
++++ configure.ac
+@@ -11,7 +11,13 @@
+ AC_CONFIG_SRCDIR([src/loadkeys.c])
+ AC_CONFIG_HEADERS(config.h)
+
+-PKG_CHECK_MODULES([CHECK], [check >= 0.9.4])
++AC_ARG_ENABLE(tests,
++ AS_HELP_STRING(--enable-tests, [build tests]),
++ [BUILD_TESTS=$enableval],[BUILD_TESTS=no])
++AM_CONDITIONAL(BUILD_TESTS, test "$BUILD_TESTS" = "yes")
++if test "$BUILD_TESTS" = "yes"; then
++ PKG_CHECK_MODULES([CHECK], [check >= 0.9.4])
++fi
+
+ m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])])
+ AM_SILENT_RULES([yes])
+--- Makefile.am
++++ Makefile.am
+@@ -8,7 +8,10 @@
+ CREDITS \
+ contrib docs rc
+
+-SUBDIRS = src data po tests docs
++SUBDIRS = src data po docs
++if BUILD_TESTS
++SUBDIRS += tests
++endif
+
+ kbd-$(VERSION).tar.xz:
+ make distcheck



  • [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (c695505fb03286fa0f9c8b982ad8b3312383c941), Remko van der Vossen, 05/25/2015

Archive powered by MHonArc 2.6.24.

Top of Page