Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (ec4bb838b06eb50865c6bcafd7238457f1f9ea5d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (ec4bb838b06eb50865c6bcafd7238457f1f9ea5d)
  • Date: Sat, 31 Jan 2015 18:36:13 -0600

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

audio-drivers/alsa-utils/BUILD | 11 -----------
audio-drivers/alsa-utils/DEPENDS | 3 ++-
audio-drivers/alsa-utils/HISTORY | 6 ++++++
audio-drivers/alsa-utils/PRE_BUILD | 14 ++++++++++++++
libs/gettext/HISTORY | 3 +++
libs/gettext/PRE_BUILD | 3 ++-
6 files changed, 27 insertions(+), 13 deletions(-)

New commits:
commit ec4bb838b06eb50865c6bcafd7238457f1f9ea5d
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

audio-drivers/alsa-utils: moved BUILD scm code to PRE_BUILD,
added gettext for scm branch as well

commit c380b830a552977e7cecc21574fc994aa28a6800
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

libs/gettext: made gettextize non-interactive

diff --git a/audio-drivers/alsa-utils/BUILD b/audio-drivers/alsa-utils/BUILD
deleted file mode 100755
index 9711236..0000000
--- a/audio-drivers/alsa-utils/BUILD
+++ /dev/null
@@ -1,11 +0,0 @@
-if [[ $ALSA_UTILS_BRANCH == scm ]]; then
- OPTS="--prefix=${INSTALL_ROOT}/usr \
- --sysconfdir=${INSTALL_ROOT}/etc \
- --localstatedir=${INSTALL_ROOT}/var \
- --mandir=${INSTALL_ROOT}/usr/share/man \
- --infodir=${INSTALL_ROOT}/usr/share/info \
- $OPTS" &&
- ./gitcompile $OPTS
-else
- default_build
-fi
diff --git a/audio-drivers/alsa-utils/DEPENDS
b/audio-drivers/alsa-utils/DEPENDS
index 3b47779..b5c4196 100755
--- a/audio-drivers/alsa-utils/DEPENDS
+++ b/audio-drivers/alsa-utils/DEPENDS
@@ -11,7 +11,8 @@ if [[ $ALSA_UTILS_BRANCH == scm ]]; then
depends git &&
depends libtool &&
depends automake &&
- depends autoconf
+ depends autoconf &&
+ depends gettext
fi &&

runtime_depends which
diff --git a/audio-drivers/alsa-utils/HISTORY
b/audio-drivers/alsa-utils/HISTORY
index a71b392..f5849db 100644
--- a/audio-drivers/alsa-utils/HISTORY
+++ b/audio-drivers/alsa-utils/HISTORY
@@ -1,3 +1,9 @@
+2015-01-31 Pavel Vinogradov <public AT sourcemage.org>
+ * BUILD: deleted
+ * DEPENDS: added gettext for scm branch
+ * PRE_BUILD: added, contains most of gitcompile code from scm branch.
+ now fully non-interactive
+
2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Use get_scm_version

diff --git a/audio-drivers/alsa-utils/PRE_BUILD
b/audio-drivers/alsa-utils/PRE_BUILD
new file mode 100755
index 0000000..13b65ae
--- /dev/null
+++ b/audio-drivers/alsa-utils/PRE_BUILD
@@ -0,0 +1,14 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+if [[ $ALSA_UTILS_BRANCH == scm ]]; then
+ aclocal -I m4 &&
+ cp Makefile.am Makefile.am.ok &&
+ cp configure.ac configure.ac.ok &&
+ gettextize -f --no-changelog &&
+ echo "EXTRA_DIST = gettext.m4" > m4/Makefile.am &&
+ cp Makefile.am.ok Makefile.am &&
+ cp configure.ac.ok configure.ac &&
+ autoheader &&
+ automake --foreign --copy --add-missing &&
+ autoconf
+fi
diff --git a/libs/gettext/HISTORY b/libs/gettext/HISTORY
index a7300ff..ebf5fb6 100644
--- a/libs/gettext/HISTORY
+++ b/libs/gettext/HISTORY
@@ -1,3 +1,6 @@
+2015-01-31 Pavel Vinogradov <public AT sourcemage.org>
+ * PRE_BUILD: made gettextize non-interactive
+
2015-01-14 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.19.4

diff --git a/libs/gettext/PRE_BUILD b/libs/gettext/PRE_BUILD
index 32353b6..70c0c7c 100755
--- a/libs/gettext/PRE_BUILD
+++ b/libs/gettext/PRE_BUILD
@@ -1,4 +1,5 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-sed -i -e '/gets is a/d' gettext-*/*/stdio.in.h
+sed -i -e '/gets is a/d' gettext-*/*/stdio.in.h &&
+sed -i "s;read dummy;#&;" gettext-tools/misc/gettextize.in



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (ec4bb838b06eb50865c6bcafd7238457f1f9ea5d), Pavel Vinogradov, 01/31/2015

Archive powered by MHonArc 2.6.24.

Top of Page