diff options
| -rw-r--r-- | README.Solaris | 4 | ||||
| -rw-r--r-- | apps/couch/rebar.config | 4 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | couchjs/c_src/SConscript | 5 | ||||
| -rwxr-xr-x | rel/overlay/bin/bigcouch | 2 |
5 files changed, 14 insertions, 3 deletions
diff --git a/README.Solaris b/README.Solaris new file mode 100644 index 00000000..bcfb243d --- /dev/null +++ b/README.Solaris @@ -0,0 +1,4 @@ + +To build on solaris, you will need some additional packages. + +sudo pkgin install erlang-14.1.1 spidermonkey-1.8.0 icu-4.2.1 scmgit-1.7.0.7 diff --git a/apps/couch/rebar.config b/apps/couch/rebar.config index 94291c70..25b7e569 100644 --- a/apps/couch/rebar.config +++ b/apps/couch/rebar.config @@ -4,5 +4,7 @@ {"DRV_LDFLAGS", "$DRV_LDFLAGS -lm -licuuc -licudata -licui18n -lpthread"}, {"linux", "DRV_LDFLAGS", "$DRV_LDFLAGS -lcrypt"}, {"freebsd", "DRV_CFLAGS", "$DRV_CFLAGS -I/usr/local/include"}, - {"freebsd", "DRV_LDFLAGS", "$DRV_LDFLAGS -L/usr/local/lib"} + {"freebsd", "DRV_LDFLAGS", "$DRV_LDFLAGS -L/usr/local/lib"}, + {"solaris", "CC", "/usr/sfw/bin/gcc"}, + {"solaris", "DRV_LDFLAGS", "$DRV_LDFLAGS -L/opt/local/lib"} ]}. @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Copyright 2010 Cloudant # # Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/couchjs/c_src/SConscript b/couchjs/c_src/SConscript index f61cdf8b..7837be58 100644 --- a/couchjs/c_src/SConscript +++ b/couchjs/c_src/SConscript @@ -20,6 +20,11 @@ def require_lib(name): env = Environment(CCFLAGS='-g -O2 -DXP_UNIX') +if os.uname()[0] == 'SunOS': + env['CC'] = '/usr/sfw/bin/gcc' + env['CCFLAGS'] += ' -I/opt/local/include' + env.Append(LINKFLAGS=['-L/opt/local/lib']) + if os.uname()[0] == 'FreeBSD': env['CCFLAGS'] += ' -I/usr/local/include' env.Append(LINKFLAGS=['-L/usr/local/lib']) diff --git a/rel/overlay/bin/bigcouch b/rel/overlay/bin/bigcouch index 86aa29f4..22275daf 100755 --- a/rel/overlay/bin/bigcouch +++ b/rel/overlay/bin/bigcouch @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Licensed under the Apache License, Version 2.0 (the "License"); you may not # use this file except in compliance with the License. You may obtain a copy of |