Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

FreeBSD compatibility #29

Merged
1 commit merged into from

3 participants

Benoit Chesneau Adam Kocoloski Joe Williams
Benoit Chesneau

Some changes to allow bigcouch to build on freebsd 8.1.

Adam Kocoloski
Owner

Hi Benoit, the changeset overall looks good. Ideally I'd like to see the typo commit squashed into the FreeBSD compatibility one, and I agree that we should check whether the scripts will work with a general Bourne-compatible shell rather than requiring bash.

Joe Williams

@benoitc I have switched our bigcouch and erl scripts to use sh instead of bash (fd1496a). My initial testing was positive on linux, please give them a shot in your environment.

Benoit Chesneau

typo commit squashed. Also rebased with fd1496a changes . Tested under fbsd 8.1 and works .

This issue was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jan 1, 2011
  1. Benoit Chesneau

    freebsd compat

    benoitc authored
This page is out of date. Refresh to see the latest.
Showing with 13 additions and 3 deletions.
  1. +3 −1 apps/couch/rebar.config
  2. +1 −2  configure
  3. +9 −0 couchjs/c_src/SConscript
4 apps/couch/rebar.config
View
@@ -2,5 +2,7 @@
{port_envs, [
{"DRV_CFLAGS", "$DRV_CFLAGS -DPIC -O2 -fno-common"},
{"DRV_LDFLAGS", "$DRV_LDFLAGS -lm -licuuc -licudata -licui18n -lpthread"},
- {"linux", "DRV_LDFLAGS", "$DRV_LDFLAGS -lcrypt"}
+ {"linux", "DRV_LDFLAGS", "$DRV_LDFLAGS -lcrypt"},
+ {"freebsd", "DRV_CFLAGS", "$DRV_CFLAGS -I/usr/local/include"},
+ {"freebsd", "DRV_LDFLAGS", "$DRV_LDFLAGS -L/usr/local/lib"}
]}.
3  configure
View
@@ -1,5 +1,4 @@
-#!/bin/bash
-
+#!/bin/sh
# Copyright 2010 Cloudant
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may not
9 couchjs/c_src/SConscript
View
@@ -11,6 +11,7 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations under
# the License.
+import os
def require_lib(name):
if not conf.CheckLib(name):
@@ -18,6 +19,14 @@ def require_lib(name):
Exit(1)
env = Environment(CCFLAGS='-g -O2 -DXP_UNIX')
+
+if os.uname()[0] == 'FreeBSD':
+ env['CCFLAGS'] += ' -I/usr/local/include'
+ env.Append(LINKFLAGS=['-L/usr/local/lib'])
+ env['LIB_DL'] = env['LIB_RT'] = ''
+ env['LIB_COMPAT'] = 'compat'
+
+
if not env.GetOption('clean'):
conf = Configure(env, config_h='config.h')
Something went wrong with that request. Please try again.