3 files changed, 13 insertions, 11 deletions
diff --git a/recipes-ruby/ruby-serialport/ruby-serialport_1.1.0.bb b/recipes-ruby/ruby-serialport/ruby-serialport_1.3.1.bb
index a020f90..d06be09 100644
--- a/recipes-ruby/ruby-serialport/ruby-serialport_1.1.0.bb
+++ b/recipes-ruby/ruby-serialport/ruby-serialport_1.3.1.bb
@@ -9,16 +9,18 @@ DEPENDS = "ruby"
 
 PR = "r2"
 
-# tag v1.1.0
-SRCREV = "709e385f6d20aaadc7f3252af59250336d27e607"
+# tag v1.3.0
+SRCREV = "2781dbb1ffbf33d7c65478aa25dad5f954d0d3bf"
 
 SRC_URI = "git://github.com/hparra/ruby-serialport.git;protocol=git"
 
 S = "${WORKDIR}/git"
+B = "${S}"
 
 do_compile() {
-  ${CC} ${CFLAGS} ${LDFLAGS} -Iext/native -I${STAGING_INCDIR}/ruby-1.9.1 -I${STAGING_INCDIR}/ruby-1.9.1/arm-linux-eabi -c ext/native/*.c
-  ${CC} ${CFLAGS} ${LDFLAGS} --shared -o ext/native/serialport.so serialport.o posix_serialport_impl.o
+  rp=$(ls -d ${STAGING_INCDIR}/ruby-* | head -1)
+  ${CC} -v ${CFLAGS} ${LDFLAGS} -Iext/native -I${rp} -I${rp}/arm-linux-gnueabi -c ext/native/*.c
+  ${CC} -v ${CFLAGS} ${LDFLAGS} --shared -o ext/native/serialport.so serialport.o posix_serialport_impl.o
 }
 
 do_install() {
diff --git a/recipes-ruby/ruby-sqlite3/ruby-sqlite3_1.3.7.bb b/recipes-ruby/ruby-sqlite3/ruby-sqlite3_1.3.13.bb
index b3210e6..82998bc 100644
--- a/recipes-ruby/ruby-sqlite3/ruby-sqlite3_1.3.7.bb
+++ b/recipes-ruby/ruby-sqlite3/ruby-sqlite3_1.3.13.bb
@@ -1,20 +1,20 @@
 DESCRIPTION = "Ruby bindings for the SQLite3 embedded database"
-HOMEPAGE = "https://github.com/luislavena/sqlite3-ruby"
-LICENSE = "custom-freely-distributable"
+HOMEPAGE = "https://github.com/sparklemotion/sqlite3-ruby"
+LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=f24ce0d57c8f8576a36e2803d35bcfec"
 SECTION = "console/utils"
 PRIORITY = "optional"
 
 DEPENDS = "ruby sqlite3"
 
-PR = "r0"
-
-SRC_URI = "git://github.com/luislavena/sqlite3-ruby.git;tag=v${PV};protocol=git"
-
+SRC_URI = "git://github.com/sparklemotion/sqlite3-ruby.git;branch=1-3-stable;tag=v${PV}"
 S = "${WORKDIR}/git"
 
+# Position independent code for shared lib
+CFLAGS += "-fPIC"
+
 do_compile() {
-  ${CC} ${CFLAGS} ${LDFLAGS} -Iext/sqlite3 -Iext/native -I${STAGING_INCDIR}/ruby-1.9.1 -I${STAGING_INCDIR}/ruby-1.9.1/arm-linux-eabi -c ext/sqlite3/*.c
+  ${CC} ${CFLAGS} ${LDFLAGS} -Iext/sqlite3 -Iext/native -I${STAGING_INCDIR}/ruby-2.2.0 -I${STAGING_INCDIR}/ruby-2.2.0/arm-linux-gnueabi -c ext/sqlite3/*.c -DHAVE_RB_INTEGER_PACK
   ${CC} ${CFLAGS} ${LDFLAGS} --shared -o ext/sqlite3/sqlite3_native.so *.o -lsqlite3
 }
 
diff --git a/recipes-ruby/ruby/ruby_1.9.3-p429.bbappend b/recipes-ruby/ruby/ruby_%.bbappend
index b31d44c..b31d44c 100644
--- a/recipes-ruby/ruby/ruby_1.9.3-p429.bbappend
+++ b/recipes-ruby/ruby/ruby_%.bbappend