[144118] trunk/dports/gnome/gobject-introspection
jeremyhu at macports.org
jeremyhu at macports.org
Fri Jan 1 22:40:27 PST 2016
Revision: 144118
https://trac.macports.org/changeset/144118
Author: jeremyhu at macports.org
Date: 2016-01-01 22:40:27 -0800 (Fri, 01 Jan 2016)
Log Message:
-----------
gobject-introspection: Fix incorrect link flag for setting rpath.
Modified Paths:
--------------
trunk/dports/gnome/gobject-introspection/Portfile
Added Paths:
-----------
trunk/dports/gnome/gobject-introspection/files/
trunk/dports/gnome/gobject-introspection/files/PR-625195.patch
Modified: trunk/dports/gnome/gobject-introspection/Portfile
===================================================================
--- trunk/dports/gnome/gobject-introspection/Portfile 2016-01-02 03:28:15 UTC (rev 144117)
+++ trunk/dports/gnome/gobject-introspection/Portfile 2016-01-02 06:40:27 UTC (rev 144118)
@@ -6,6 +6,7 @@
name gobject-introspection
version 1.46.0
+revision 1
set branch [join [lrange [split ${version} .] 0 1] .]
categories gnome
platforms darwin
@@ -32,6 +33,8 @@
depends_run bin:glibtool:libtool
+patchfiles PR-625195.patch
+
post-patch {
reinplace "s|'cc'|'${configure.cc}'|g" ${worksrcpath}/giscanner/sourcescanner.py
reinplace "s|'gcc'|'${configure.cc}'|g" ${worksrcpath}/giscanner/dumper.py
Added: trunk/dports/gnome/gobject-introspection/files/PR-625195.patch
===================================================================
--- trunk/dports/gnome/gobject-introspection/files/PR-625195.patch (rev 0)
+++ trunk/dports/gnome/gobject-introspection/files/PR-625195.patch 2016-01-02 06:40:27 UTC (rev 144118)
@@ -0,0 +1,46 @@
+From 4a724ac699f0c34fba2fb452cfadea11540325e8 Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip.chimento at gmail.com>
+Date: Mon, 19 Oct 2015 23:10:27 -0700
+Subject: scanner: Fix non-libtool linker flags on Darwin
+
+Darwin's linker doesn't like "-rpath=path"; instead pass "-rpath path",
+which works on more linkers than the version with the = sign does.
+Additionally, Darwin's linker has no equivalent for "--no-as-needed" (it
+seems to do the right thing by default?)
+
+https://bugzilla.gnome.org/show_bug.cgi?id=625195
+---
+ giscanner/ccompiler.py | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git giscanner/ccompiler.py giscanner/ccompiler.py
+index 224c3e5..515b422 100644
+--- giscanner/ccompiler.py
++++ giscanner/ccompiler.py
+@@ -128,11 +128,12 @@ class CCompiler(object):
+ self.compiler.add_runtime_library_dir('.')
+
+ # https://bugzilla.gnome.org/show_bug.cgi?id=625195
+- args.append('-Wl,-rpath=.')
++ args.append('-Wl,-rpath,.')
+
+ # Ensure libraries are always linked as we are going to use ldd to work
+ # out their names later
+- args.append('-Wl,--no-as-needed')
++ if sys.platform != 'darwin':
++ args.append('-Wl,--no-as-needed')
+
+ for library in libraries:
+ self.compiler.add_library(library)
+@@ -140,7 +141,7 @@ class CCompiler(object):
+ for library_path in libpaths:
+ args.append('-L' + library_path)
+ if os.path.isabs(library_path):
+- args.append('-Wl,-rpath=' + library_path)
++ args.append('-Wl,-rpath,' + library_path)
+
+ else:
+ # libtool case: assemble linker command arguments, like we did before
+--
+cgit v0.11.2
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160101/4122cfcc/attachment.html>
More information about the macports-changes
mailing list