summaryrefslogtreecommitdiff
path: root/recipes/disko/files/linkpath.patch
diff options
context:
space:
mode:
authorSergey Lapin <slapin@ossfans.org>2009-08-05 17:14:29 +0400
committerSergey Lapin <slapin@ossfans.org>2009-08-05 17:14:29 +0400
commit5d87cec7a3e962afb7cfa621d172abc3effc085d (patch)
tree5e26142100749807b517588779120b73a83a30d2 /recipes/disko/files/linkpath.patch
parentc91a54aef8a39e7cbb2571574f56f2cf12104ff1 (diff)
parent2880b3877d38bfaa4056af6df7f122a64e955292 (diff)
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/disko/files/linkpath.patch')
-rw-r--r--recipes/disko/files/linkpath.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/recipes/disko/files/linkpath.patch b/recipes/disko/files/linkpath.patch
new file mode 100644
index 0000000000..c28540848e
--- /dev/null
+++ b/recipes/disko/files/linkpath.patch
@@ -0,0 +1,22 @@
+Index: git/SConstruct
+===================================================================
+--- git.orig/SConstruct 2009-07-14 20:45:56.924100368 +0200
++++ git/SConstruct 2009-07-14 20:46:27.553677127 +0200
+@@ -131,7 +131,7 @@
+ if os.environ.has_key('CXXFLAGS'):
+ env['CCFLAGS'] = [os.environ['CXXFLAGS'].split()]
+ if os.environ.has_key('LD'):
+- env['LINK'] = [os.environ['LD'].split()]
++ env['LINK'] = [os.environ['CXX'].split()]
+ if os.environ.has_key('LDFLAGS'):
+ env['LINKFLAGS'] = [os.environ['LDFLAGS'].split()]
+
+@@ -156,7 +156,7 @@
+ idir_data = idir_prefix + '/share/disko'
+
+ # link with -rpath
+-env['LINKFLAGS'].append('-Wl,-rpath=' + env['prefix'] + '/lib/disko')
++env['LINKFLAGS'].append('-Wl,-rpath-link=' + env['prefix'] + '/lib/disko')
+
+ # extra flags
+ if env['messages']: