[prev in list] [next in list] [prev in thread] [next in thread]
List: macports-changes
Subject: [140702] trunk/dports/databases/leveldb/Portfile
From: mcalhoun () macports ! org
Date: 2015-09-30 15:50:24
Message-ID: 20150930155024.4880814101E () svn ! macports ! org
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
Revision: 140702
https://trac.macports.org/changeset/140702
Author: mcalhoun@macports.org
Date: 2015-09-30 08:50:23 -0700 (Wed, 30 Sep 2015)
Log Message:
-----------
leveldb: Update version 1.9.0 -> 1.18
Modified Paths:
--------------
trunk/dports/databases/leveldb/Portfile
Modified: trunk/dports/databases/leveldb/Portfile
===================================================================
--- trunk/dports/databases/leveldb/Portfile 2015-09-30 14:44:45 UTC (rev 140701)
+++ trunk/dports/databases/leveldb/Portfile 2015-09-30 15:50:23 UTC (rev 140702)
@@ -2,31 +2,66 @@
# $Id$
PortSystem 1.0
+PortGroup github 1.0
-name leveldb
-version 1.9.0
+# When trying to build a universal variant, build_detect_platform script mistakenly \
can't find library snappy +# The following test fails for multiple archs (see \
https://llvm.org/bugs/show_bug.cgi?id=15403) +# # Test whether Snappy library is \
installed +# # http://code.google.com/p/snappy/
+# $CXX $CXXFLAGS -x c++ - -o $CXXOUTPUT 2>/dev/null <<EOF
+# #include <snappy.h>
+# int main() {}
+# EOF
+# We therefore use muniversal PortGroup
+PortGroup muniversal 1.0
+
+github.setup google leveldb 1.18 v
+
categories databases
platforms darwin
license BSD
maintainers nomaintainer
description A fast and lightweight key/value database library by Google
long_description A fast and lightweight key/value database library by Google
-homepage http://code.google.com/p/leveldb/
-master_sites googlecode:leveldb
-checksums rmd160 6d36b6b095c131aeb24fc75ecee8a7b9b4c5ce9e \
- sha256 \
b2699b04e5aba8e98382c4955b94725d1f76bd0b5decd60c5628205b717a1d4f +checksums \
rmd160 2431505d7d1a08a88b1d10068e571a49dd43a3a0 \ + sha256 \
007b554b52fb72877bd0a31c078a9ff67b8a9b8e0f55ff641b77783cfd030a4c
depends_lib port:snappy
use_configure no
-variant universal {}
+# default optimization flags
+configure.optflags-append -O2 -DNDEBUG
-build.env-append CXXFLAGS="[get_canonical_archflags]" \
- LDFLAGS="[get_canonical_archflags]" \
- INSTALL_PATH=${prefix}/lib
+if { [variant_isset universal] } {
+ foreach arch ${configure.universal_archs} {
+ set merger_build_env(${arch}) "CXXFLAGS=\"-arch ${arch}\" LDFLAGS=\"-arch \
${arch}\"" + }
+} else {
+ build.env-append \
+ CXXFLAGS="[get_canonical_archflags]" \
+ LDFLAGS="[get_canonical_archflags]"
+}
-destroot {
- eval file copy [glob ${worksrcpath}/libleveldb*] ${destroot}${prefix}/lib
- file copy ${worksrcpath}/include/leveldb ${destroot}${prefix}/include
+build.env-append \
+ INSTALL_PATH=${prefix}/lib \
+ CC="${configure.cc}" \
+ CXX="${configure.cxx}" \
+ OPT="${configure.optflags}"
+
+build.args-append libmemenv.a
+
+# muniversal build requires Makefile
+post-extract {
+ set makefile [open ${worksrcpath}/Makefile-Install "w"]
+ puts ${makefile} {install:}
+ puts ${makefile} "\t/usr/bin/install -d -m 0755 \
\$(DESTDIR)${prefix}/include/leveldb" + puts ${makefile} "\t/usr/bin/install -d -m \
0755 \$(DESTDIR)${prefix}/include/helpers/memenv" + puts ${makefile} \
"\t/usr/bin/install -m 0644 include/leveldb/*.h \$(DESTDIR)${prefix}/include/leveldb" \
+ puts ${makefile} "\t/usr/bin/install -m 0644 helpers/memenv/memenv.h \
\$(DESTDIR)${prefix}/include/helpers/memenv" + puts ${makefile} "\t/bin/cp -R \
libleveldb*.dylib* \$(DESTDIR)${prefix}/lib" + puts ${makefile} \
"\t/usr/bin/install -m 0644 lib*.a \$(DESTDIR)${prefix}/lib" + close ${makefile}
}
+
+destroot.args-append -f Makefile-Install
[Attachment #5 (text/html)]
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[140702] trunk/dports/databases/leveldb/Portfile</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: \
verdana,arial,helvetica,sans-serif; font-size: 10pt; } #msg dl a { font-weight: \
bold} #msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: \
bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: \
6px; } #logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em \
0; } #logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg \
h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } \
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; \
} #logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: \
-1.5em; padding-left: 1.5em; } #logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em \
1em 0 1em; background: white;} #logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid \
#fa0; border-bottom: 1px solid #fa0; background: #fff; } #logmsg table th { \
text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted \
#fa0; } #logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: \
0.2em 0.5em; } #logmsg table thead th { text-align: center; border-bottom: 1px solid \
#fa0; } #logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: \
6px; } #patch { width: 100%; }
#patch h4 {font-family: \
verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, \
#patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins \
{background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del \
{background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, \
.info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a \
href="https://trac.macports.org/changeset/140702">140702</a></dd> <dt>Author</dt> \
<dd>mcalhoun@macports.org</dd> <dt>Date</dt> <dd>2015-09-30 08:50:23 -0700 (Wed, 30 \
Sep 2015)</dd> </dl>
<h3>Log Message</h3>
<pre>leveldb: Update version 1.9.0 -> 1.18</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdatabasesleveldbPortfile">trunk/dports/databases/leveldb/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdatabasesleveldbPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/databases/leveldb/Portfile (140701 => \
140702)</h4> <pre class="diff"><span>
<span class="info">--- trunk/dports/databases/leveldb/Portfile 2015-09-30 14:44:45 \
UTC (rev 140701)
+++ trunk/dports/databases/leveldb/Portfile 2015-09-30 15:50:23 UTC (rev 140702)
</span><span class="lines">@@ -2,31 +2,66 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><ins>+PortGroup github 1.0
</ins><span class="cx">
</span><del>-name leveldb
-version 1.9.0
</del><ins>+# When trying to build a universal variant, build_detect_platform script \
mistakenly can't find library snappy +# The following test fails for multiple archs \
(see https://llvm.org/bugs/show_bug.cgi?id=15403) +# # Test whether Snappy library \
is installed +# # http://code.google.com/p/snappy/
+# $CXX $CXXFLAGS -x c++ - -o $CXXOUTPUT 2>/dev/null <<EOF
+# #include <snappy.h>
+# int main() {}
+# EOF
+# We therefore use muniversal PortGroup
+PortGroup muniversal 1.0
+
+github.setup google leveldb 1.18 v
+
</ins><span class="cx"> categories databases
</span><span class="cx"> platforms darwin
</span><span class="cx"> license BSD
</span><span class="cx"> maintainers nomaintainer
</span><span class="cx"> description A fast and lightweight key/value \
database library by Google </span><span class="cx"> long_description A fast and \
lightweight key/value database library by Google </span><del>-homepage \
http://code.google.com/p/leveldb/
-master_sites googlecode:leveldb
</del><span class="cx">
</span><del>-checksums rmd160 6d36b6b095c131aeb24fc75ecee8a7b9b4c5ce9e \
- sha256 \
b2699b04e5aba8e98382c4955b94725d1f76bd0b5decd60c5628205b717a1d4f \
</del><ins>+checksums rmd160 2431505d7d1a08a88b1d10068e571a49dd43a3a0 \ + \
sha256 007b554b52fb72877bd0a31c078a9ff67b8a9b8e0f55ff641b77783cfd030a4c </ins><span \
class="cx"> </span><span class="cx"> depends_lib port:snappy
</span><span class="cx"> use_configure no
</span><span class="cx">
</span><del>-variant universal {}
</del><ins>+# default optimization flags
+configure.optflags-append -O2 -DNDEBUG
</ins><span class="cx">
</span><del>-build.env-append CXXFLAGS="[get_canonical_archflags]" \
- LDFLAGS="[get_canonical_archflags]" \
- INSTALL_PATH=${prefix}/lib
</del><ins>+if { [variant_isset universal] } {
+ foreach arch ${configure.universal_archs} {
+ set merger_build_env(${arch}) "CXXFLAGS=\"-arch ${arch}\" \
LDFLAGS=\"-arch ${arch}\"" + }
+} else {
+ build.env-append \
+ CXXFLAGS="[get_canonical_archflags]" \
+ LDFLAGS="[get_canonical_archflags]"
+}
</ins><span class="cx">
</span><del>-destroot {
- eval file copy [glob ${worksrcpath}/libleveldb*] ${destroot}${prefix}/lib
- file copy ${worksrcpath}/include/leveldb ${destroot}${prefix}/include
</del><ins>+build.env-append \
+ INSTALL_PATH=${prefix}/lib \
+ CC="${configure.cc}" \
+ CXX="${configure.cxx}" \
+ OPT="${configure.optflags}"
+
+build.args-append libmemenv.a
+
+# muniversal build requires Makefile
+post-extract {
+ set makefile [open ${worksrcpath}/Makefile-Install "w"]
+ puts ${makefile} {install:}
+ puts ${makefile} "\t/usr/bin/install -d -m 0755 \
\$(DESTDIR)${prefix}/include/leveldb" + puts ${makefile} \
"\t/usr/bin/install -d -m 0755 \$(DESTDIR)${prefix}/include/helpers/memenv" \
+ puts ${makefile} "\t/usr/bin/install -m 0644 include/leveldb/*.h \
\$(DESTDIR)${prefix}/include/leveldb" + puts ${makefile} \
"\t/usr/bin/install -m 0644 helpers/memenv/memenv.h \
\$(DESTDIR)${prefix}/include/helpers/memenv" + puts ${makefile} \
"\t/bin/cp -R libleveldb*.dylib* \$(DESTDIR)${prefix}/lib" + puts \
${makefile} "\t/usr/bin/install -m 0644 lib*.a \$(DESTDIR)${prefix}/lib" + \
close ${makefile} </ins><span class="cx"> }
</span><ins>+
+destroot.args-append -f Makefile-Install
</ins></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
macports-changes mailing list
macports-changes@lists.macosforge.org
https://lists.macosforge.org/mailman/listinfo/macports-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic