summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Stelling <blubb@gentoo.org>2005-10-01 10:12:02 +0000
committerSimon Stelling <blubb@gentoo.org>2005-10-01 10:12:02 +0000
commit013c654fa91a32ef7f9fee94a089725a04b910b5 (patch)
treef8ce04593078fdad327a5717581b38671f841150 /media-gfx/yafray/files
parentFixing bug #99968; digest seems to be broken; also updating SRC_URI and HOMEP... (diff)
downloadgentoo-2-013c654fa91a32ef7f9fee94a089725a04b910b5.tar.gz
gentoo-2-013c654fa91a32ef7f9fee94a089725a04b910b5.tar.bz2
gentoo-2-013c654fa91a32ef7f9fee94a089725a04b910b5.zip
replace the old multilib-patch with a more elegant one, thanks to Ben Skeggs; bug 103431
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'media-gfx/yafray/files')
-rw-r--r--media-gfx/yafray/files/yafray-0.0.8-libdir.patch (renamed from media-gfx/yafray/files/yafray-0.0.8-multilib.patch)27
1 files changed, 18 insertions, 9 deletions
diff --git a/media-gfx/yafray/files/yafray-0.0.8-multilib.patch b/media-gfx/yafray/files/yafray-0.0.8-libdir.patch
index 1b68c2e6fc4b..adab682c93e8 100644
--- a/media-gfx/yafray/files/yafray-0.0.8-multilib.patch
+++ b/media-gfx/yafray/files/yafray-0.0.8-libdir.patch
@@ -1,22 +1,31 @@
---- linux-settings.py.old 2005-09-04 15:51:15.000000000 +0200
-+++ linux-settings.py 2005-09-04 15:52:29.000000000 +0200
-@@ -10,8 +10,8 @@
- global prefix
- prefix = args.get('prefix','/usr/local')
+--- linux-settings.old 2005-07-06 06:12:10.000000000 +1000
++++ linux-settings.py 2005-08-23 20:28:12.000000000 +1000
+@@ -5,13 +5,15 @@
+
+ srcroot = os.getcwd()
+ prefix = ''
++libdir = ''
+ def init(args):
+- global prefix
++ global prefix, libdir
+ prefix = args.get('prefix','/usr/local')
+-
-def get_libpath(args): return prefix+"/lib"
-def get_pluginpath(args): return prefix+"/lib/yafray"
-+def get_libpath(args): return prefix+"/lib64"
-+def get_pluginpath(args): return prefix+"/lib64/yafray"
++ libdir = args.get('libdir','/lib')
++
++def get_libpath(args): return prefix+libdir
++def get_pluginpath(args): return prefix+libdir+"/yafray"
def get_binpath(args): return prefix+"/bin"
def get_confpath(args): return prefix+"/etc"
def get_cxxflags(args):
-@@ -34,7 +34,7 @@
+@@ -34,7 +36,7 @@
return False
def get_include(args): return [ exr.PATH + "/include/OpenEXR" ]
- def get_libpath(args): return [ exr.PATH + "/lib" ]
-+ def get_libpath(args): return [ exr.PATH + "/lib64" ]
++ def get_libpath(args): return [ exr.PATH + libdir ]
def get_libs(args): return ['IlmImf', 'Imath', 'Iex', 'Half']
class jpeg(globalinfo.library):