summaryrefslogtreecommitdiff
path: root/recipes/disko/files/linkpath.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes/disko/files/linkpath.patch')
-rw-r--r--recipes/disko/files/linkpath.patch23
1 files changed, 8 insertions, 15 deletions
diff --git a/recipes/disko/files/linkpath.patch b/recipes/disko/files/linkpath.patch
index c28540848e..e38b0748c4 100644
--- a/recipes/disko/files/linkpath.patch
+++ b/recipes/disko/files/linkpath.patch
@@ -1,22 +1,15 @@
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 @@
+--- git.orig/SConstruct 2009-09-11 01:44:37.000000000 +0200
++++ git/SConstruct 2009-09-11 01:52:26.265319426 +0200
+@@ -161,8 +161,8 @@
+ idir_inc = idir_prefix + '/include/disko'
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')
+-# link with -rpath
+-# env['LINKFLAGS'].extend(['-Wl,-rpath=' + env['prefix'] + '/lib/disko'])
++# link with -rpath-link
++# env['LINKFLAGS'].extend(['-Wl,-rpath-link==' + env['prefix'] + '/lib/disko'])
# extra flags
if env['messages']: