Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (ac61e885afe0b745de4463860a1e044a04a6ece6)
  • Date: Thu, 4 Jan 2007 19:56:00 -0600

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

devel/doxygen/PRE_BUILD | 1 -
net/wpa_supplicant/HISTORY | 5 +++++
net/wpa_supplicant/PRE_BUILD | 8 ++++++++
3 files changed, 13 insertions(+), 1 deletion(-)

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

Fix wpa_supplicant's compile with qt-x11 support when qt-x11 was just
installed

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

Fix doxygen's compile with qt-x11 support when qt-x11 was just installed

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

Revert "Fix doxygen's compile with qt-x11 support when qt-x11 was just
installed"

This reverts commit 829318fc22ff11f4a9c1d9daaa8d802e78b4afa2.

Left some debugging code in.

diff --git a/devel/doxygen/PRE_BUILD b/devel/doxygen/PRE_BUILD
index 8b4c273..975837f 100755
--- a/devel/doxygen/PRE_BUILD
+++ b/devel/doxygen/PRE_BUILD
@@ -10,7 +10,6 @@ source "$GRIMOIRE/is_depends_enabled.fu

if is_depends_enabled $SPELL qt-x11; then
if [[ -z $QTDIR ]]; then
- echo QTDIR = $QTDIR > /tmp/doxy.qt
source $TRACK_ROOT/etc/profile.d/qt.sh
fi
fi
diff --git a/net/wpa_supplicant/HISTORY b/net/wpa_supplicant/HISTORY
index 0a8b1f0..7cf81e0 100644
--- a/net/wpa_supplicant/HISTORY
+++ b/net/wpa_supplicant/HISTORY
@@ -1,3 +1,8 @@
+2007-01-04 Eric Sandall <eric AT sandall.us>
+ * PRE_BUILD: For new installs, /etc/profile.d/qt.sh won't be sourced
+ until relogin, so we need to check for QTDIR and source qt.sh if
+ the user wants QT support.
+
2007-01-03 Juuso Alasuutari <iuso AT sourcemage.org>
* INSTALL: Install example config file to /usr/share/wpa_supplicant/
(this is not the same as the default config file).
diff --git a/net/wpa_supplicant/PRE_BUILD b/net/wpa_supplicant/PRE_BUILD
index 8149cb2..a0c6b76 100755
--- a/net/wpa_supplicant/PRE_BUILD
+++ b/net/wpa_supplicant/PRE_BUILD
@@ -7,4 +7,12 @@ sed -i "s|/local||g" Makefile &&
if [[ $WPA_RELEASE != old ]]
then
sed -i "s/wpa_cli dynamic_eap_methods/wpa_cli/" Makefile
+fi &&
+
+source "$GRIMOIRE/is_depends_enabled.function" &&
+
+if is_depends_enabled $SPELL qt-x11; then
+ if [[ -z $QTDIR ]]; then
+ source $TRACK_ROOT/etc/profile.d/qt.sh
+ fi
fi




Archive powered by MHonArc 2.6.24.

Top of Page