Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (5070f0869cdfa4929cd2705576117034436f274e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (5070f0869cdfa4929cd2705576117034436f274e)
  • Date: Mon, 25 Jan 2010 16:33:59 -0600

GIT changes to master grimoire by Arwed von Merkatz <v.merkatz AT gmx.net>:

http/firefox/BUILD | 4 ++++
http/firefox/HISTORY | 5 +++++
http/xulrunner/BUILD | 4 ++++
http/xulrunner/HISTORY | 4 ++++
4 files changed, 17 insertions(+)

New commits:
commit 5070f0869cdfa4929cd2705576117034436f274e
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

firefox: fix build without wireless_tools

commit 1c93f6640fb02788156a351afc2c640f2025797c
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

xulrunner: fixed compile without wireless_tools

diff --git a/http/firefox/BUILD b/http/firefox/BUILD
index 0478488..b34288e 100755
--- a/http/firefox/BUILD
+++ b/http/firefox/BUILD
@@ -26,6 +26,10 @@ if [[ "$FIREFOX_CVS" == "y" ]]; then
autoconf-2.13
fi &&

+# necko-wifi is part of xulrunner if enabled, but firefox
+# compile fails without wireless_tools without this option
+echo ac_add_options --disable-necko-wifi >> .mozconfig &&
+
make_single &&
make -f client.mk build &&
make_normal
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 3f7236b..82373ba 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,8 @@
+2010-01-25 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: add --disable-necko-wifi to .mozconfig, so configure works
+ without wireless_tools installed. necko-wifi is part of xulrunner
+ anyway.
+
2010-01-21 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.6

diff --git a/http/xulrunner/BUILD b/http/xulrunner/BUILD
index f2f8111..a32f279 100755
--- a/http/xulrunner/BUILD
+++ b/http/xulrunner/BUILD
@@ -27,5 +27,9 @@ CXXFLAGS="${CXXFLAGS//-ffast-math/}" &&
--enable-optimize="$CFLAGS" \
$OPTS &&
make_single &&
+# workaround for configure not handling --disable-necko-wifi correctly
+if [[ $OPTS =~ --disable-necko-wifi ]]; then
+ echo ac_add_options --disable-necko-wifi >> .mozconfig
+fi &&
make -f client.mk build &&
make_normal
diff --git a/http/xulrunner/HISTORY b/http/xulrunner/HISTORY
index a3313d0..a162132 100644
--- a/http/xulrunner/HISTORY
+++ b/http/xulrunner/HISTORY
@@ -1,3 +1,7 @@
+2010-01-25 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: added workaround for broken configure so disabling
+ wireless_tools works
+
2010-01-21 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Optionally depends on wireless_tools




  • [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (5070f0869cdfa4929cd2705576117034436f274e), Arwed von Merkatz, 01/25/2010

Archive powered by MHonArc 2.6.24.

Top of Page