[87157] trunk/dports/devel/pficommon
hum at macports.org
hum at macports.org
Sat Nov 12 07:28:02 PST 2011
Revision: 87157
http://trac.macports.org/changeset/87157
Author: hum at macports.org
Date: 2011-11-12 07:27:57 -0800 (Sat, 12 Nov 2011)
Log Message:
-----------
pficommon: add variants; divide --disable-database into --disable-mysql and --disable-postgresql; fix to compile with databases.
Modified Paths:
--------------
trunk/dports/devel/pficommon/Portfile
Added Paths:
-----------
trunk/dports/devel/pficommon/files/
trunk/dports/devel/pficommon/files/patch-wscript.diff
Modified: trunk/dports/devel/pficommon/Portfile
===================================================================
--- trunk/dports/devel/pficommon/Portfile 2011-11-12 14:11:11 UTC (rev 87156)
+++ trunk/dports/devel/pficommon/Portfile 2011-11-12 15:27:57 UTC (rev 87157)
@@ -5,6 +5,7 @@
name pficommon
version 1.3.1
+revision 1
categories devel
platforms darwin
maintainers hum openmaintainer
@@ -18,16 +19,44 @@
git.url https://github.com/pfi/pficommon.git
git.branch 3858e20dc7
+patchfiles patch-wscript.diff
+
# msgpack for jubatus.
-depends_lib port:msgpack
-# optional: fcgi mysql postgresql Magick++ gtest
+default_variants +mprpc
configure.cmd ./waf configure
configure.universal_args
-configure.args-append --disable-database \
+configure.args-append --disable-mysql \
+ --disable-postgresql \
+ --disable-mprpc \
--disable-fcgi \
--disable-magickpp
+variant mysql description {Enable mysql} {
+ depends_lib-append lib:mysql_config:mysql5
+ configure.args-delete --disable-mysql
+}
+
+variant postgresql description {Enable postgresql} {
+ depends_lib-append lib:libpq:postgresql91
+ configure.args-delete --disable-postgresql
+}
+
+variant fcgi description {Enable fcgi} {
+ depends_lib-append port:fcgi
+ configure.args-replace s|--disable-fcgi|--with-fcgi=${prefix}|
+}
+
+variant mprpc description {Enable mprpc} {
+ depends_lib-append port:msgpack
+ configure.args-delete --disable-mprpc
+}
+
+variant magickpp description {Enable magick++} {
+ depends_lib-append port:imagemagick
+ configure.args-delete --disable-magickpp
+}
+
build.cmd ./waf build
build.target
@@ -46,6 +75,8 @@
system "install_name_tool -change ${builddir}/libpficommon.dylib ${prefix}/lib/libpficommon.dylib ${path}"
system "install_name_tool -change ${builddir}/concurrent/libpficommon_concurrent.dylib ${prefix}/lib/libpficommon_concurrent.dylib ${path}"
system "install_name_tool -change ${builddir}/data/libpficommon_data.dylib ${prefix}/lib/libpficommon_data.dylib ${path}"
+ system "install_name_tool -change ${builddir}/database/mysql/libpficommon_database_mysql.dylib ${prefix}/lib/libpficommon_database_mysql.dylib ${path}"
+ system "install_name_tool -change ${builddir}/database/postgresql/libpficommon_database_postgresql.dylib ${prefix}/lib/libpficommon_database_postgresql.dylib ${path}"
system "install_name_tool -change ${builddir}/lang/libpficommon_lang.dylib ${prefix}/lib/libpficommon_lang.dylib ${path}"
system "install_name_tool -change ${builddir}/math/libpficommon_math.dylib ${prefix}/lib/libpficommon_math.dylib ${path}"
system "install_name_tool -change ${builddir}/network/libpficommon_network_base.dylib ${prefix}/lib/libpficommon_network_base.dylib ${path}"
Added: trunk/dports/devel/pficommon/files/patch-wscript.diff
===================================================================
--- trunk/dports/devel/pficommon/files/patch-wscript.diff (rev 0)
+++ trunk/dports/devel/pficommon/files/patch-wscript.diff 2011-11-12 15:27:57 UTC (rev 87157)
@@ -0,0 +1,73 @@
+--- wscript.orig 2011-10-26 15:20:56.000000000 +0900
++++ wscript 2011-11-12 23:54:05.000000000 +0900
+@@ -36,7 +36,7 @@
+
+ [Modules]
+ FCGI module: %s
+-Database module: %s
++Database module:
+ have MySQL lib: %s
+ have PostgreSQL lib: %s
+ MessagePack RPC module: %s
+@@ -52,7 +52,7 @@
+ Compiler version: %s
+ CXXFLAGS: %s
+ """ % (conf.env.BUILD_FCGI and 'yes' or 'no',
+- (not Options.options.disable_database) and 'yes' or 'no',
++# (not Options.options.disable_database) and 'yes' or 'no',
+ conf.env.BUILD_MYSQL and 'yes' or 'no',
+ conf.env.BUILD_PGSQL and 'yes' or 'no',
+ conf.env.BUILD_MPRPC and 'yes' or 'no',
+--- src/database/wscript.orig 2011-10-26 15:20:56.000000000 +0900
++++ src/database/wscript 2011-11-12 23:46:35.000000000 +0900
+@@ -2,26 +2,36 @@
+ import Options
+
+ def options(opt):
+- opt.add_option('--disable-database',
++ opt.add_option('--disable-mysql',
+ action = 'store_true',
+ default = False,
+- help = 'disable database')
++ help = 'disable mysql')
++ opt.add_option('--disable-postgresql',
++ action = 'store_true',
++ default = False,
++ help = 'disable postgresql')
+
+ def configure(conf):
+ conf.env.BUILD_MYSQL = False
+- if not Options.options.disable_database:
++ if not Options.options.disable_mysql:
+ if conf.check_cfg(path = 'mysql_config',
+ args = '--cflags --libs_r',
+ package = '',
+ uselib_store = 'MYSQL',
+ mandatory = False):
+ conf.env.BUILD_MYSQL = True
++ if conf.check_cfg(path = 'mysql_config5',
++ args = '--cflags --libs_r',
++ package = '',
++ uselib_store = 'MYSQL',
++ mandatory = False):
++ conf.env.BUILD_MYSQL = True
+
+ conf.env.BUILD_PGSQL = False
+- if not Options.options.disable_database:
++ if not Options.options.disable_postgresql:
+ try:
+- incdir = subprocess.check_output(['pg_config', '--includedir-server']).decode()
+- libdir = subprocess.check_output(['pg_config', '--libdir']).decode()
++ incdir = subprocess.check_output(['pg_config', '--includedir-server']).rstrip()
++ libdir = subprocess.check_output(['pg_config', '--libdir']).rstrip()
+ if conf.check_cxx(lib = 'pq',
+ header_name = 'postgres.h',
+ cxxflags = '-I' + incdir,
+--- src/database/postgresql/wscript.orig 2011-10-26 15:20:56.000000000 +0900
++++ src/database/postgresql/wscript 2011-11-12 23:24:54.000000000 +0900
+@@ -7,4 +7,4 @@
+ source = 'connection.cpp statement.cpp result.cpp value.cpp',
+ target = 'pficommon_database_postgresql',
+ includes = '. ..',
+- use = 'PGSQL')
++ use = ['pficommon_system', 'PGSQL'])
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111112/5f1cae84/attachment.html>
More information about the macports-changes
mailing list