Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (5303d216ca6eb26d5d5f7f72912186690086dd52)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (5303d216ca6eb26d5d5f7f72912186690086dd52)
  • Date: Mon, 23 Oct 2006 08:35:09 -0500

GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

utils/hal/DEPENDS | 14 ++++++++++++--
utils/hal/HISTORY | 4 ++++
utils/hal/PRE_BUILD | 3 ++-
3 files changed, 18 insertions(+), 3 deletions(-)

New commits:
commit a562e1be6d918ffe269d1531df5234f9bf571169
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

hal: fix configure and add an optional dep to make it work without
pciutils

diff --git a/utils/hal/DEPENDS b/utils/hal/DEPENDS
index 26cba2e..21bc06f 100755
--- a/utils/hal/DEPENDS
+++ b/utils/hal/DEPENDS
@@ -7,7 +7,6 @@ depends libtool &&
depends python &&
depends udev &&
depends xml-parser-expat &&
-depends dmidecode &&
depends pkgconfig &&
#
# expat should have --with-expat or --without-expat but there is an bug in
configure.
@@ -45,4 +44,15 @@ optional_depends libusb \
optional_depends hwdata \
"--with-hwdata=/usr/share/hwdata" \
"--without-hwdata" \
- "for PCI/USB hardware data"
+ "for PCI/USB hardware data" &&
+
+optional_depends pciutils \
+ "--with-macbookpro" \
+ "--without-macbookpro" \
+ "for MacBook Pro utils" &&
+
+optional_depends dmidecode \
+ "" \
+ "" \
+ "for dmidecode support"
+
diff --git a/utils/hal/HISTORY b/utils/hal/HISTORY
index 1b06cc3..dee7119 100644
--- a/utils/hal/HISTORY
+++ b/utils/hal/HISTORY
@@ -1,3 +1,7 @@
+2006-10-23 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DEPENDS: added optional pciutils; made dmidecode optional
+ * PRE_BUILD: fix configure for macbookpro (remove in next release)
+
2006-10-04 Flavien Bridault <vlaaad AT sourcemage.org>
* PRE_BUILD, libparted_check.patch: fixed a bug in libparted check
where the LDFLAGS variable is erased, preventing hal to be compiled
diff --git a/utils/hal/PRE_BUILD b/utils/hal/PRE_BUILD
index 5df9ed5..b19f768 100755
--- a/utils/hal/PRE_BUILD
+++ b/utils/hal/PRE_BUILD
@@ -1,3 +1,4 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-patch -p0 < ${SCRIPT_DIRECTORY}/libparted_check.patch
+patch -p0 < ${SCRIPT_DIRECTORY}/libparted_check.patch &&
+sed -i 's/use_macbookpro/with_macbookpro/' configure



  • [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (5303d216ca6eb26d5d5f7f72912186690086dd52), Jaka Kranjc, 10/23/2006

Archive powered by MHonArc 2.6.24.

Top of Page