[banshee] [build] export C_INCLUDE_PATH, DYLD_LIBRARY_PATH



commit 3de41ead86a7440b8f9884050ed2c906a86d769d
Author: Aaron Bockover <abockover novell com>
Date:   Sun Dec 20 17:59:30 2009 -0500

    [build] export C_INCLUDE_PATH, DYLD_LIBRARY_PATH

 build/bundle/packages/gst-plugins-good.py |    4 ++--
 build/bundle/profile.linux.py             |    7 +++++++
 build/bundle/profile.osx.py               |    7 +++++--
 3 files changed, 14 insertions(+), 4 deletions(-)
---
diff --git a/build/bundle/packages/gst-plugins-good.py b/build/bundle/packages/gst-plugins-good.py
index 6d4203b..c68a0a5 100644
--- a/build/bundle/packages/gst-plugins-good.py
+++ b/build/bundle/packages/gst-plugins-good.py
@@ -24,7 +24,7 @@ package = {
 		'http://gstreamer.freedesktop.org/src/%{name}/%{name}-%{version}.tar.gz'
 	],
 	'build': [
-		'CFLAGS=-I%{_prefix}/include %{__configure} ' + ' '.join (configure_flags),
-		'CFLAGS=-I%{_prefix}/include %{__make}'
+		'%{__configure} ' + ' '.join (configure_flags),
+		'%{__make}'
 	]
 }
diff --git a/build/bundle/profile.linux.py b/build/bundle/profile.linux.py
index b0eb73c..1fd6778 100644
--- a/build/bundle/profile.linux.py
+++ b/build/bundle/profile.linux.py
@@ -8,10 +8,12 @@ search_paths = ['%{prefix}']
 bin_paths = [os.path.join (p, 'bin') for p in search_paths]
 bin_paths.extend (['/usr/bin', '/bin'])
 lib_paths = [os.path.join (p, 'lib') for p in search_paths]
+include_paths = [os.path.join (p, 'include') for p in search_paths]
 aclocal_paths = [os.path.join (p, 'share', 'aclocal') for p in search_paths]
 
 profile['environ'] = {
 	'PATH': ':'.join (bin_paths),
+	'C_INCLUDE_PATH': ':'.join (include_paths),
 	'LD_LIBRARY_PATH': ':'.join (lib_paths),
 	'LDFLAGS': ' '.join (['-L' + p for p in lib_paths]),
 	'ACLOCAL_FLAGS': ' '.join (['-I' + p for p in aclocal_paths]),
@@ -24,6 +26,11 @@ profile['environ'] = {
 
 profile['packages'] = [
 	# Base dependencies
+	'packages/gettext.py',
+	'packages/pkg-config.py',
+	'packages/glib.py',
+	'packages/mono.py',
+
 	'packages/libxml2.py',
 	'packages/libproxy.py',
 	'packages/intltool.py',
diff --git a/build/bundle/profile.osx.py b/build/bundle/profile.osx.py
index f3a9817..b9bc014 100644
--- a/build/bundle/profile.osx.py
+++ b/build/bundle/profile.osx.py
@@ -10,6 +10,7 @@ search_paths = ['%{prefix}', '%{mono_sdk_path}']
 bin_paths = [os.path.join (p, 'bin') for p in search_paths]
 bin_paths.extend (['/usr/bin', '/bin'])
 lib_paths = [os.path.join (p, 'lib') for p in search_paths]
+include_paths = [os.path.join (p, 'include') for p in search_paths]
 aclocal_paths = [os.path.join (p, 'share', 'aclocal') for p in search_paths]
 
 gcc_flags = [
@@ -17,15 +18,17 @@ gcc_flags = [
 	'-arch i386',
 	'-D_XOPEN_SOURCE',
 	'-isysroot %{mac_sdk_path}',
-	'-mmacosx-version-min=10.5',
+	'-mmacosx-version-min=10.5'
 ]
-gcc_flags.extend (['-I' + os.path.join (p, 'include') for p in search_paths])
+gcc_flags.extend (['-I' + p for p in include_paths])
 
 profile['environ'] = {
 	'PATH': ':'.join (bin_paths),
+	'C_INCLUDE_PATH': ':'.join (include_paths),
 	'CFLAGS': ' '.join (gcc_flags),
 	'CXXFLAGS': '%{CFLAGS}',
 	'LD_LIBRARY_PATH': ':'.join (lib_paths),
+	'DYLD_LIBRARY_PATH': '%{LD_LIBRARY_PATH}',
 	'LDFLAGS': ' '.join (['-L' + p for p in lib_paths]),
 	'ACLOCAL_FLAGS': ' '.join (['-I' + p for p in aclocal_paths]),
 	'PKG_CONFIG_PATH': ':'.join ([



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