Add eventmachine and thin native extensions

phusion · Dec 21, 2014 · aa5e6b9 · aa5e6b9
1 parent 393a928
commit aa5e6b9
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## Next version
 
  * Fixed the mysql2 native extension not working on Linux. This is done by dynamically linking against libstdc++. Closes GH-21.
+ * Added the eventmachine and thin native extension gems.
 
 ## Version 20141219
 

diff --git a/osx/internal/sanity_check b/osx/internal/sanity_check
@@ -24,7 +24,7 @@ DIR="$1"
 TAB=`perl -e 'print "\t"'`
 ERROR=false
 STANDARD_LIBS="(@executable_path/|/usr/lib/libobjc|/usr/lib/libSystem|/usr/lib/libutil|/usr/lib/libz"
-STANDARD_LIBS="$STANDARD_LIBS|/usr/lib/libiconv)\."
+STANDARD_LIBS="$STANDARD_LIBS|/usr/lib/libiconv|/usr/lib/libstdc\+\+)\."
 STANDARD_LIBS="($STANDARD_LIBS|CoreFoundation)"
 
 for F in $DIR/bin.real/ruby `find $DIR -name '*.bundle'` `find $DIR -name '*.dylib'`; do

diff --git a/shared/Gemfile b/shared/Gemfile
@@ -9,3 +9,4 @@ gem 'json'
 gem 'ffi'
 gem 'bcrypt'
 gem 'yajl-ruby'
+gem 'thin'
diff --git a/shared/Gemfile.lock b/shared/Gemfile.lock
@@ -2,14 +2,21 @@ GEM
  remote: https://rubygems.org/
  specs:
  bcrypt (3.1.9)
+ daemons (1.1.9)
+ eventmachine (1.0.4)
  ffi (1.9.6)
  json (1.8.1)
  mini_portile (0.6.1)
  mysql2 (0.3.17)
  nokogiri (1.6.5)
  mini_portile (~> 0.6.0)
  pg (0.17.1)
+ rack (1.6.0)
  sqlite3 (1.3.9)
+ thin (1.6.3)
+ daemons (~> 1.0, >= 1.0.9)
+ eventmachine (~> 1.0)
+ rack (~> 1.0)
  yajl-ruby (1.2.1)
 
 PLATFORMS
@@ -23,4 +30,5 @@ DEPENDENCIES
  nokogiri
  pg
  sqlite3
+ thin
  yajl-ruby