[banshee] [build] provide dummy AM_GCONF_SOURCE_2 m4 macro



commit ecb4616aade3c7a4378298c1996287285434d187
Author: Aaron Bockover <abockover novell com>
Date:   Tue Dec 29 09:07:10 2009 -0500

    [build] provide dummy AM_GCONF_SOURCE_2 m4 macro
    
    Added a gconf-dummy package that just writes out an empty
    AM_GCONF_SOURCE_2 macro that is used in Banshee's configure.ac.

 build/bundle/packages/banshee.py     |    3 ---
 build/bundle/packages/gconf-dummy.py |   10 ++++++++++
 build/bundle/profile.osx.py          |    2 ++
 3 files changed, 12 insertions(+), 3 deletions(-)
---
diff --git a/build/bundle/packages/banshee.py b/build/bundle/packages/banshee.py
index ee349ef..bb02e85 100644
--- a/build/bundle/packages/banshee.py
+++ b/build/bundle/packages/banshee.py
@@ -35,10 +35,7 @@ package = {
 		change_to_gitdir
 	],
 	'build': [
-		'cp configure.ac configure.ac.orig',
-		'grep -v AM_GCONF_SOURCE_2 < configure.ac.orig > configure.ac',
 		'./autogen.sh --prefix=%{_prefix} ' + ' '.join (configure_flags),
-		'mv configure.ac.orig configure.ac',
 		'%{__make}'
 	],
 	'install': [
diff --git a/build/bundle/packages/gconf-dummy.py b/build/bundle/packages/gconf-dummy.py
new file mode 100644
index 0000000..d89a3ba
--- /dev/null
+++ b/build/bundle/packages/gconf-dummy.py
@@ -0,0 +1,10 @@
+package = {
+	'name':    'gconf2-dummy',
+	'version': '2',
+	'sources': [],
+	'prep':    [],
+	'build':   [],
+	'install': [
+		'echo "AC_DEFUN([AM_GCONF_SOURCE_2],[])" > %{_prefix}/share/aclocal/gconf-2.m4'
+	]
+}
diff --git a/build/bundle/profile.osx.py b/build/bundle/profile.osx.py
index a418c44..ce914b8 100644
--- a/build/bundle/profile.osx.py
+++ b/build/bundle/profile.osx.py
@@ -18,6 +18,7 @@ gcc_flags = [
 gcc_flags.extend (gcc_arch_flags)
 
 profile['environ'] = {
+	'BUILD_PREFIX':    '%{prefix}',
 	'PATH':            '%{prefix}/bin:/usr/bin:/bin',
 
 	'CC':              'gcc-4.2',
@@ -54,6 +55,7 @@ profile['packages'] = [
 	'packages/atk.py',
 	'packages/intltool.py',
 	'packages/gtk+.py',
+	'packages/gconf-dummy.py',
 	'packages/libxml2.py',
 	'packages/libglade.py',
 	'packages/libproxy.py',



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]