<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/23f9313b3c1ffcb597d7101c131b82f5dc96356c">https://github.com/macports/macports-ports/commit/23f9313b3c1ffcb597d7101c131b82f5dc96356c</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 23f9313 iulib: Use the right compiler and flags
</span>23f9313 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 23f9313b3c1ffcb597d7101c131b82f5dc96356c
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat Feb 8 03:47:46 2020 -0600
<span style='display:block; white-space:pre;color:#404040;'> iulib: Use the right compiler and flags
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/38037
</span>---
graphics/iulib/Portfile | 7 +++++++
graphics/iulib/files/patch-SConstruct.diff | 20 +++++++++++---------
2 files changed, 18 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/iulib/Portfile b/graphics/iulib/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a536009..9255137 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/iulib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/iulib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,8 +38,15 @@ post-patch {
</span>
use_configure no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant universal {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build.cmd ${prefix}/bin/scons
build.target
<span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env "CC=${configure.cc}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXX=${configure.cxx}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXFLAGS=${configure.cxxflags} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LINKFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span> # you can remove the build.args test=yes, but it nice to know they work
build.args test=yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/iulib/files/patch-SConstruct.diff b/graphics/iulib/files/patch-SConstruct.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 5f83ff6..871f1ee 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/iulib/files/patch-SConstruct.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/iulib/files/patch-SConstruct.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,19 +1,21 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- SConstruct.orig 2011-05-18 09:00:42.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ SConstruct 2011-05-18 11:32:01.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -48,6 +48,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- SConstruct.orig 2014-12-16 14:53:37.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ SConstruct 2020-02-08 03:35:01.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -48,6 +48,14 @@
</span> # opts.Add(BoolVariable('style', 'Check style', "no"))
env = Environment(options=opts, CXXFLAGS=["${opt}","${warn}"])
+env.Append( CPPPATH=["@@PREFIX@@/include"] )
+env.Append( LIBPATH=["@@PREFIX@@/lib/"] )
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+env["CFLAGS"] = os.getenv("CFLAGS")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+env["CXXFLAGS"] = os.getenv("CXXFLAGS")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+env["LINKFLAGS"] = os.getenv("LINKFLAGS")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++env["CC"] = os.getenv("CC")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++env["CFLAGS"] = Split(os.getenv("CFLAGS"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++env["CXX"] = os.getenv("CXX")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++env["CXXFLAGS"] = Split(os.getenv("CXXFLAGS"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++env["LINKFLAGS"] = Split(os.getenv("LINKFLAGS"))
</span> +
Help(opts.GenerateHelpText(env))
conf = Configure(env)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -117,6 +123,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -118,6 +126,7 @@
</span> else:
sources += ["utils/dgraphics_nosdl.cc"]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,14 +23,14 @@
</span> libiulib = env.SharedLibrary('libiulib',sources)
env.Append(CXXFLAGS=['-g','-fPIC'])
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -145,8 +152,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -146,8 +155,10 @@
</span> progs.Append(BUILDERS={'Test':test_builder})
if env["test"]:
+ progs.Prepend(ENV = {'DYLD_LIBRARY_PATH': '.'})
for file in glob.glob("*/test-*.cc") + glob.glob("*/*/test-*.cc"):
- if not file.startswith('vidio'):
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #Jason C - I exclude test-pbmpng becuase it depends on convert from ImageMagick
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #Jason C - I exclude test-pbmpng because it depends on convert from ImageMagick
</span> + if not (file.startswith('vidio') or file.startswith('imgio/tests/test-pbmpng')):
progs.Program(file[:-3],file)
progs.Test(file[:-3])
</pre><pre style='margin:0'>
</pre>