summaryrefslogtreecommitdiffstats
path: root/meta-rcar-gen3-adas/recipes-support/spacenav/libspnav
diff options
context:
space:
mode:
Diffstat (limited to 'meta-rcar-gen3-adas/recipes-support/spacenav/libspnav')
-rw-r--r--meta-rcar-gen3-adas/recipes-support/spacenav/libspnav/0001-libspnav-cross-compile.patch42
-rw-r--r--meta-rcar-gen3-adas/recipes-support/spacenav/libspnav/0002-Fix-configuration-for-libdir.patch87
-rw-r--r--meta-rcar-gen3-adas/recipes-support/spacenav/libspnav/libspnav-0.2.3.tar.gzbin0 -> 11985 bytes
3 files changed, 129 insertions, 0 deletions
diff --git a/meta-rcar-gen3-adas/recipes-support/spacenav/libspnav/0001-libspnav-cross-compile.patch b/meta-rcar-gen3-adas/recipes-support/spacenav/libspnav/0001-libspnav-cross-compile.patch
new file mode 100644
index 0000000..3a33da1
--- /dev/null
+++ b/meta-rcar-gen3-adas/recipes-support/spacenav/libspnav/0001-libspnav-cross-compile.patch
@@ -0,0 +1,42 @@
+diff -pruN libspnav-0.2.3.orig/configure libspnav-0.2.3/configure
+--- libspnav-0.2.3.orig/configure 2011-11-25 18:36:43.000000000 -0800
++++ libspnav-0.2.3/configure 2016-03-18 04:46:31.327083251 -0700
+@@ -8,7 +8,7 @@ DBG=yes
+ X11=yes
+
+ srcdir="`dirname "$0"`"
+-libdir=lib
++libdir=lib64
+
+ #if [ "`uname -m`" = 'x86_64' ]; then
+ # libdir=lib64
+diff -pruN libspnav-0.2.3.orig/Makefile.in libspnav-0.2.3/Makefile.in
+--- libspnav-0.2.3.orig/Makefile.in 2014-08-17 18:38:31.000000000 -0700
++++ libspnav-0.2.3/Makefile.in 2016-03-18 04:46:31.339083251 -0700
+@@ -8,10 +8,11 @@ lib_a = lib$(name).a
+ incpaths = -I. -I/usr/local/include -I/usr/X11R6/include
+ libpaths = -L/usr/local/lib -L/usr/X11R6/lib
+
+-CC = gcc
+-AR = ar
+-CFLAGS = $(opt) $(dbg) -std=c89 $(pic) -pedantic -Wall -fno-strict-aliasing $(incpaths) $(user_cflags)
+-LDFLAGS = $(libpaths) $(user_ldflags) $(xlib)
++CC ?= gcc
++AR ?= ar
++CFLAGS ?= -std=c89 -pedantic -Wall -fno-strict-aliasing
++CFLAGS += $(opt) $(dbg) $(pic) -I. $(user_cflags)
++LDFLAGS ?= $(libpaths) $(user_ldflags) $(xlib)
+
+ ifeq ($(shell uname -s), Darwin)
+ lib_so = libspnav.dylib
+@@ -54,8 +55,8 @@ install: $(lib_a) $(lib_so)
+ cp $(lib_so) $(DESTDIR)$(PREFIX)/$(libdir)/$(lib_so)
+ [ -n "$(soname)" ] && \
+ rm -f $(DESTDIR)$(PREFIX)/$(libdir)/$(soname) $(DESTDIR)$(PREFIX)/$(libdir)/$(devlink) && \
+- ln -s $(DESTDIR)$(PREFIX)/$(libdir)/$(lib_so) $(DESTDIR)$(PREFIX)/$(libdir)/$(soname) && \
+- ln -s $(DESTDIR)$(PREFIX)/$(libdir)/$(soname) $(DESTDIR)$(PREFIX)/$(libdir)/$(devlink) || \
++ ln -s $(lib_so) $(DESTDIR)$(PREFIX)/$(libdir)/$(soname) && \
++ ln -s $(soname) $(DESTDIR)$(PREFIX)/$(libdir)/$(devlink) || \
+ true
+ for h in $(hdr); do cp -p $(srcdir)/$$h $(DESTDIR)$(PREFIX)/include/; done
+
diff --git a/meta-rcar-gen3-adas/recipes-support/spacenav/libspnav/0002-Fix-configuration-for-libdir.patch b/meta-rcar-gen3-adas/recipes-support/spacenav/libspnav/0002-Fix-configuration-for-libdir.patch
new file mode 100644
index 0000000..8976eb6
--- /dev/null
+++ b/meta-rcar-gen3-adas/recipes-support/spacenav/libspnav/0002-Fix-configuration-for-libdir.patch
@@ -0,0 +1,87 @@
+From c79af49c33f8ce705f63dee9dbc48cd716064e98 Mon Sep 17 00:00:00 2001
+From: Andrey Vostrikov <andrey.vostrikov@cogentembedded.com>
+Date: Fri, 22 Apr 2016 13:38:21 +0300
+Subject: [PATCH] Fix configuration for libdir
+
+Signed-off-by: Andrey Vostrikov <andrey.vostrikov@cogentembedded.com>
+---
+ Makefile.in | 18 +++++++++---------
+ configure | 13 +++++++------
+ 2 files changed, 16 insertions(+), 15 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index eb996a9..6808e44 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -50,22 +50,22 @@ distclean:
+
+ .PHONY: install
+ install: $(lib_a) $(lib_so)
+- mkdir -p $(DESTDIR)$(PREFIX)/$(libdir) $(DESTDIR)$(PREFIX)/include
+- cp $(lib_a) $(DESTDIR)$(PREFIX)/$(libdir)/$(lib_a)
+- cp $(lib_so) $(DESTDIR)$(PREFIX)/$(libdir)/$(lib_so)
++ mkdir -p $(DESTDIR)/$(libdir) $(DESTDIR)$(PREFIX)/include
++ cp $(lib_a) $(DESTDIR)/$(libdir)/$(lib_a)
++ cp $(lib_so) $(DESTDIR)/$(libdir)/$(lib_so)
+ [ -n "$(soname)" ] && \
+- rm -f $(DESTDIR)$(PREFIX)/$(libdir)/$(soname) $(DESTDIR)$(PREFIX)/$(libdir)/$(devlink) && \
+- ln -s $(lib_so) $(DESTDIR)$(PREFIX)/$(libdir)/$(soname) && \
+- ln -s $(soname) $(DESTDIR)$(PREFIX)/$(libdir)/$(devlink) || \
++ rm -f $(DESTDIR)/$(libdir)/$(soname) $(DESTDIR)/$(libdir)/$(devlink) && \
++ ln -s $(lib_so) $(DESTDIR)/$(libdir)/$(soname) && \
++ ln -s $(soname) $(DESTDIR)/$(libdir)/$(devlink) || \
+ true
+ for h in $(hdr); do cp -p $(srcdir)/$$h $(DESTDIR)$(PREFIX)/include/; done
+
+ .PHONY: uninstall
+ uninstall:
+- rm -f $(DESTDIR)$(PREFIX)/$(libdir)/$(lib_a)
+- rm -f $(DESTDIR)$(PREFIX)/$(libdir)/$(lib_so)
++ rm -f $(DESTDIR)/$(libdir)/$(lib_a)
++ rm -f $(DESTDIR)/$(libdir)/$(lib_so)
+ [ -n "$(soname)" ] && \
+- rm -f $(DESTDIR)$(PREFIX)/$(libdir)/$(soname) $(DESTDIR)$(PREFIX)/$(libdir)/$(devlink) || \
++ rm -f $(DESTDIR)/$(libdir)/$(soname) $(DESTDIR)/$(libdir)/$(devlink) || \
+ true
+ for i in $(hdr); do rm -f $(DESTDIR)$(PREFIX)/include/$$i; done
+
+diff --git a/configure b/configure
+index 6f85fec..7f6289d 100755
+--- a/configure
++++ b/configure
+@@ -8,18 +8,18 @@ DBG=yes
+ X11=yes
+
+ srcdir="`dirname "$0"`"
+-libdir=lib64
+-
+-#if [ "`uname -m`" = 'x86_64' ]; then
+-# libdir=lib64
+-#fi
+-
++libdir=/usr/lib
++echo "initial $prefix"
+ for arg; do
+ case "$arg" in
+ --prefix=*)
+ value=`echo $arg | sed 's/--prefix=//'`
+ PREFIX=${value:-$prefix}
+ ;;
++ --libdir=*)
++ value=`echo $arg | sed 's/--libdir=//'`
++ libdir=${value:-$libdir}
++ ;;
+
+ --enable-opt)
+ OPT=yes;;
+@@ -53,6 +53,7 @@ for arg; do
+ done
+
+ echo " prefix: $PREFIX"
++echo " libdir: $libdir"
+ echo " optimize for speed: $OPT"
+ echo " include debugging symbols: $DBG"
+ echo " x11 communication method: $X11"
+--
+2.1.4
+
diff --git a/meta-rcar-gen3-adas/recipes-support/spacenav/libspnav/libspnav-0.2.3.tar.gz b/meta-rcar-gen3-adas/recipes-support/spacenav/libspnav/libspnav-0.2.3.tar.gz
new file mode 100644
index 0000000..ed9da47
--- /dev/null
+++ b/meta-rcar-gen3-adas/recipes-support/spacenav/libspnav/libspnav-0.2.3.tar.gz
Binary files differ