diff options
author | taca <taca> | 2016-05-26 17:08:57 +0000 |
---|---|---|
committer | taca <taca> | 2016-05-26 17:08:57 +0000 |
commit | 131b8e2fba5d3b7a9885ff00ad45412c4d04e756 (patch) | |
tree | 4a961f291fdb5c442b53890b48256ac681badc44 /graphics | |
parent | 76f80733087b7a7232374714e519244d41cb18d2 (diff) | |
download | pkgsrc-131b8e2fba5d3b7a9885ff00ad45412c4d04e756.tar.gz |
Fix rpath provlem with native X11.
Bump PKGREVISION.
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/ruby-opengl/Makefile | 5 | ||||
-rw-r--r-- | graphics/ruby-opengl/distinfo | 5 | ||||
-rw-r--r-- | graphics/ruby-opengl/patches/patch-ext_gl_mkrf__conf.rb | 20 | ||||
-rw-r--r-- | graphics/ruby-opengl/patches/patch-ext_glu_mkrf__conf.rb | 21 | ||||
-rw-r--r-- | graphics/ruby-opengl/patches/patch-ext_glut_mkrf__conf.rb | 21 |
5 files changed, 69 insertions, 3 deletions
diff --git a/graphics/ruby-opengl/Makefile b/graphics/ruby-opengl/Makefile index 1dffdba1a04..23955834ea0 100644 --- a/graphics/ruby-opengl/Makefile +++ b/graphics/ruby-opengl/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.32 2015/04/25 14:23:19 tnn Exp $ +# $NetBSD: Makefile,v 1.33 2016/05/26 17:08:57 taca Exp $ DISTNAME= ruby-opengl-0.60.1 PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME:S/ruby-//} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= graphics MAINTAINER= taca@NetBSD.org @@ -13,6 +13,7 @@ LICENSE= mit DEPENDS+= ${RUBY_PKGPREFIX}-mkrf>=0.2.0:../../devel/ruby-mkrf USE_RAKE= YES +MAKE_ENV+= LDSHARED=${COMPILER_RPATH_FLAG:Q}${X11BASE:Q}/lib pre-configure: ${FIND} ${WRKSRC} -type f -exec ${CHMOD} -x {} \; diff --git a/graphics/ruby-opengl/distinfo b/graphics/ruby-opengl/distinfo index 9b4e61b620f..1339a307940 100644 --- a/graphics/ruby-opengl/distinfo +++ b/graphics/ruby-opengl/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.13 2015/11/03 21:34:19 agc Exp $ +$NetBSD: distinfo,v 1.14 2016/05/26 17:08:57 taca Exp $ SHA1 (ruby-opengl-0.60.1.gem) = ae8a2ceec7102fce6450273885372fa16d820c87 RMD160 (ruby-opengl-0.60.1.gem) = fc046485ad0da0a269c5b282cef9f027dad16077 @@ -6,3 +6,6 @@ SHA512 (ruby-opengl-0.60.1.gem) = 2ddb8acf3e74f48b173a6f5421f6ba57c82f6871d1f332 Size (ruby-opengl-0.60.1.gem) = 245248 bytes SHA1 (patch-Rakefile) = 3fc0debd15a230e43dde593af79aa3e857fa4c2d SHA1 (patch-ext_common_conv.h) = 12bc77ddbdfd2df39aa7c9688847bae433a8c620 +SHA1 (patch-ext_gl_mkrf__conf.rb) = 1043fd1b2c5d0edc2bd70bd2fe86e210ce4ca537 +SHA1 (patch-ext_glu_mkrf__conf.rb) = e1a8c53b8538c015b17237fd228f63447cb1d653 +SHA1 (patch-ext_glut_mkrf__conf.rb) = 94e4f50e3a5dbad5dc0beb8a887c608747b5c43f diff --git a/graphics/ruby-opengl/patches/patch-ext_gl_mkrf__conf.rb b/graphics/ruby-opengl/patches/patch-ext_gl_mkrf__conf.rb new file mode 100644 index 00000000000..eeb9578bcdd --- /dev/null +++ b/graphics/ruby-opengl/patches/patch-ext_gl_mkrf__conf.rb @@ -0,0 +1,20 @@ +$NetBSD: patch-ext_gl_mkrf__conf.rb,v 1.1 2016/05/26 17:08:57 taca Exp $ + +Make sure to set rpath. + +--- ext/gl/mkrf_conf.rb.orig 2016-05-26 07:39:33.064606316 +0000 ++++ ext/gl/mkrf_conf.rb +@@ -24,11 +24,13 @@ Mkrf::Generator.new( 'gl' ) do |g| + when /darwin/ + g.cflags << RUBYVER + g.ldshared << ' -framework OpenGL' ++ g.ldshared << " #{ENV['LDSHARED']}" + when /mswin32/ + g.cflags << ' -DWIN32' + RUBYVER + g.include_library( 'opengl32.lib', 'glVertex3d') + else + g.cflags << ' -Wall' + RUBYVER + g.include_library( 'GL', 'glVertex3d') ++ g.ldshared << " #{ENV['LDSHARED']}" + end + end diff --git a/graphics/ruby-opengl/patches/patch-ext_glu_mkrf__conf.rb b/graphics/ruby-opengl/patches/patch-ext_glu_mkrf__conf.rb new file mode 100644 index 00000000000..7a7002a8eff --- /dev/null +++ b/graphics/ruby-opengl/patches/patch-ext_glu_mkrf__conf.rb @@ -0,0 +1,21 @@ +$NetBSD: patch-ext_glu_mkrf__conf.rb,v 1.1 2016/05/26 17:08:57 taca Exp $ + +Make sure to set rpath. + +--- ext/glu/mkrf_conf.rb.orig 2016-05-26 08:03:52.613279441 +0000 ++++ ext/glu/mkrf_conf.rb +@@ -23,6 +23,7 @@ Mkrf::Generator.new( 'glu' ) do |g| + when /darwin/ + g.cflags << RUBYVER + g.ldshared << ' -framework OpenGL' ++ g.ldshared << " #{ENV['LDSHARED']}" + when /mswin32/ + g.cflags << ' -DWIN32' + RUBYVER + g.include_library( 'opengl32.lib', 'glVertex3d') +@@ -31,5 +32,6 @@ Mkrf::Generator.new( 'glu' ) do |g| + g.cflags << ' -Wall' + RUBYVER + g.include_library( 'GLU', 'gluLookAt' ) + g.include_library( 'GL', 'glVertex3d') ++ g.ldshared << " #{ENV['LDSHARED']}" + end + end diff --git a/graphics/ruby-opengl/patches/patch-ext_glut_mkrf__conf.rb b/graphics/ruby-opengl/patches/patch-ext_glut_mkrf__conf.rb new file mode 100644 index 00000000000..133e8e415b6 --- /dev/null +++ b/graphics/ruby-opengl/patches/patch-ext_glut_mkrf__conf.rb @@ -0,0 +1,21 @@ +$NetBSD: patch-ext_glut_mkrf__conf.rb,v 1.1 2016/05/26 17:08:57 taca Exp $ + +Make sure to set rpath. + +--- ext/glut/mkrf_conf.rb.orig 2016-05-26 08:03:52.577469373 +0000 ++++ ext/glut/mkrf_conf.rb +@@ -23,6 +23,7 @@ Mkrf::Generator.new( 'glut' ) do |g| + when /darwin/ + g.cflags << RUBYVER + g.ldshared << ' -framework GLUT -framework OpenGL -framework Cocoa' ++ g.ldshared << " #{ENV['LDSHARED']}" + when /mswin32/ + g.cflags << ' -DWIN32' + RUBYVER + g.include_library( 'glut32.lib', 'glutSolidTeapot' ) +@@ -33,5 +34,6 @@ Mkrf::Generator.new( 'glut' ) do |g| + g.include_library( 'glut', 'glutSolidTeapot' ) + g.include_library( 'GLU', 'gluLookAt' ) + g.include_library( 'GL', 'glVertex3d') ++ g.ldshared << " #{ENV['LDSHARED']}" + end + end |