Tue May 28 19:01:22 2013 UTC ()
Honor wrapper paths.


(joerg)
diff -r1.1.1.1 -r1.2 pkgsrc/devel/tolua++/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/devel/tolua++/patches/patch-SConstruct
cvs diff -r1.1.1.1 -r1.2 pkgsrc/devel/tolua++/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/tolua++/Attic/distinfo 2012/05/08 09:34:17 1.1.1.1
+++ pkgsrc/devel/tolua++/Attic/distinfo 2013/05/28 19:01:22 1.2
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.1.1.1 2012/05/08 09:34:17 imil Exp $ 1$NetBSD: distinfo,v 1.2 2013/05/28 19:01:22 joerg Exp $
2 2
3SHA1 (tolua++-1.0.93.tar.bz2) = 4a4d4d948e03320ef74314aa6698677c0af4199f 3SHA1 (tolua++-1.0.93.tar.bz2) = 4a4d4d948e03320ef74314aa6698677c0af4199f
4RMD160 (tolua++-1.0.93.tar.bz2) = 1e1ffaff985832d2355a07ee6a94c4c67ca38551 4RMD160 (tolua++-1.0.93.tar.bz2) = 1e1ffaff985832d2355a07ee6a94c4c67ca38551
5Size (tolua++-1.0.93.tar.bz2) = 163956 bytes 5Size (tolua++-1.0.93.tar.bz2) = 163956 bytes
6SHA1 (patch-SConstruct) = dfd520a0c30e64f9c895b956175b1dd996863691 6SHA1 (patch-SConstruct) = 88e9f0c8fef1475d5c420fa8fa71835870d42a62
7SHA1 (patch-src_lib_SCsub) = e86f249905b171d248f0a498728ce4b17ae074f7 7SHA1 (patch-src_lib_SCsub) = e86f249905b171d248f0a498728ce4b17ae074f7
cvs diff -r1.1.1.1 -r1.2 pkgsrc/devel/tolua++/patches/Attic/patch-SConstruct (expand / switch to unified diff)

--- pkgsrc/devel/tolua++/patches/Attic/patch-SConstruct 2012/05/08 09:34:17 1.1.1.1
+++ pkgsrc/devel/tolua++/patches/Attic/patch-SConstruct 2013/05/28 19:01:22 1.2
@@ -1,19 +1,28 @@ @@ -1,19 +1,28 @@
1$NetBSD: patch-SConstruct,v 1.1.1.1 2012/05/08 09:34:17 imil Exp $ 1$NetBSD: patch-SConstruct,v 1.2 2013/05/28 19:01:22 joerg Exp $
2 2
3Create shared object. 3Create shared object.
4 4
5--- SConstruct.orig 2008-04-21 00:05:35.000000000 +0000 5--- SConstruct.orig 2008-04-21 00:05:35.000000000 +0000
6+++ SConstruct 6+++ SConstruct
 7@@ -5,7 +5,7 @@ tools = ['default']
 8 if os.name == 'nt':
 9 tools = ['mingw']
 10
 11-env = Environment(tools = tools)
 12+env = Environment(tools = tools, ENV = {'PATH': os.environ['PATH']})
 13
 14 options_file = None
 15 if sys.platform == 'linux2':
7@@ -22,6 +22,7 @@ opts.Add('CXX', 'The C++ compiler (for t 16@@ -22,6 +22,7 @@ opts.Add('CXX', 'The C++ compiler (for t
8 opts.Add('CCFLAGS', 'Flags for the compiler.', ['-O2', '-Wall']) 17 opts.Add('CCFLAGS', 'Flags for the compiler.', ['-O2', '-Wall'])
9 opts.Add('LINK', 'The linker.') 18 opts.Add('LINK', 'The linker.')
10 opts.Add('LINKFLAGS', 'Linker flags.', []) 19 opts.Add('LINKFLAGS', 'Linker flags.', [])
11+opts.Add('SONAME', 'Shared library name.') 20+opts.Add('SONAME', 'Shared library name.')
12 opts.Add('no_cygwin', 'Use -mno-cygwin to build using the mingw compiler on cygwin', 0) 21 opts.Add('no_cygwin', 'Use -mno-cygwin to build using the mingw compiler on cygwin', 0)
13 opts.Add('LIBS', 'libraries', []) 22 opts.Add('LIBS', 'libraries', [])
14 opts.Add('LIBPATH', 'library path', []) 23 opts.Add('LIBPATH', 'library path', [])
15@@ -147,6 +148,8 @@ Files will be installed on <prefix>/bin, 24@@ -147,6 +148,8 @@ Files will be installed on <prefix>/bin,
16 env['CPPPATH'] = '#/include' 25 env['CPPPATH'] = '#/include'
17 env['LIBPATH'] = ['#/lib'] + env['LIBPATH'] 26 env['LIBPATH'] = ['#/lib'] + env['LIBPATH']
18  27
19+env.Append(SHLINKFLAGS=' -Wl,-soname='+env['SONAME']) 28+env.Append(SHLINKFLAGS=' -Wl,-soname='+env['SONAME'])