Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (3a42bbdf82118832c019a60a0bc01900d2ef2c89)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (3a42bbdf82118832c019a60a0bc01900d2ef2c89)
  • Date: Wed, 6 Oct 2010 20:14:23 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

graphics-libs/sane-backends/BUILD | 8 +++++---
graphics-libs/sane-backends/DEPENDS | 7 +------
graphics-libs/sane-backends/HISTORY | 6 ++++++
3 files changed, 12 insertions(+), 9 deletions(-)

New commits:
commit 3a42bbdf82118832c019a60a0bc01900d2ef2c89
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

sane-backends: ./configure does not know --enable-fork-process, renamed
to --disable-pthread

configure: WARNING: unrecognized options: --enable-fork-process

Options are now backwards (--enable is now --disable).
--enable-pthread use pthread instead of fork (default=yes for
MacOS X/MINGW, no for
everything else)

commit c8c6d10af2b6eed0791d788e0168580790e43be3
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

sane-backends: Allow user to override OPTS (parameter listed last)

commit 75ed1e736ff93e25ff029d56f9d13ee21f0e6924
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

sane-backends: texlive 20091107 breaks documentation creation

fmtutil: /root/.texlive2009/texmf-var/web2c/pdftex/latex.fmt installed.
make[1]: *** [sane.dvi] Error 1
make[1]: Leaving directory `/usr/src/sane-backends-1.0.21/doc'

diff --git a/graphics-libs/sane-backends/BUILD
b/graphics-libs/sane-backends/BUILD
index 89dc25e..c6c4817 100755
--- a/graphics-libs/sane-backends/BUILD
+++ b/graphics-libs/sane-backends/BUILD
@@ -3,9 +3,9 @@ create_group scanner &&
LDFLAGS="-pthread $LDFLAGS"

if [[ $USEFORK == y ]]; then
- OPTS="$OPTS --enable-fork-process"
+ OPTS="$OPTS --disable-pthread"
else
- OPTS="$OPTS --disable-fork-process"
+ OPTS="$OPTS --enable-pthread"
fi &&

if [[ $IPV6 == y ]]; then
@@ -24,6 +24,8 @@ if [[ "$SANE_BUILD_LOCAL" == n ]]; then
OPTS="$OPTS --disable-local-backends"
fi &&

-OPTS="$OPTS --with-docdir=$INSTALL_ROOT/usr/share/doc/sane-backends" &&
+OPTS="--disable-latex \
+ --with-docdir=$INSTALL_ROOT/usr/share/doc/sane-backends \
+ $OPTS" &&

default_build
diff --git a/graphics-libs/sane-backends/DEPENDS
b/graphics-libs/sane-backends/DEPENDS
index f17fd66..c240d72 100755
--- a/graphics-libs/sane-backends/DEPENDS
+++ b/graphics-libs/sane-backends/DEPENDS
@@ -7,9 +7,4 @@ optional_depends libusb \
optional_depends libgphoto2 \
"--with-gphoto2" \
"--without-gphoto2" \
- "Enable libgphoto2 backend" &&
-
-optional_depends texlive \
- "--enable-latex" \
- "--disable-latex" \
- "Build documentation"
+ "Enable libgphoto2 backend"
diff --git a/graphics-libs/sane-backends/HISTORY
b/graphics-libs/sane-backends/HISTORY
index ce798a5..1b7b5fd 100644
--- a/graphics-libs/sane-backends/HISTORY
+++ b/graphics-libs/sane-backends/HISTORY
@@ -1,3 +1,9 @@
+2010-10-06 Eric Sandall <sandalle AT sourcemage.org>
+ * BUILD: Disable texlive document creation
+ Allow user to override OPTS (parameter listed last)
+ ./configure does not know --enable-fork-process, renamed to
--disable-pthread
+ * DEPENDS: texlive 20091107 breaks documentation creation
+
2010-08-24 Finn Haedicke <finn AT sourcemage.org>
* DEPENDS: optiona_depends for texlive uses
flag --enable/--disable-latex



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (3a42bbdf82118832c019a60a0bc01900d2ef2c89), Eric Sandall, 10/06/2010

Archive powered by MHonArc 2.6.24.

Top of Page