From: Ronan Le Martret Date: Tue, 16 Apr 2013 15:21:59 +0000 (+0200) Subject: - solve libusb-compat. X-Git-Tag: rev_0.4~359 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4488c25f0f8bfa19ca26d197ad29900332568891;p=scm%2Fbb%2Ftizen.git - solve libusb-compat. --- diff --git a/meta-tizen-ivi/recipes-tizen/libusb-compat/libusb-compat-extraconf.inc b/meta-tizen-ivi/recipes-tizen/libusb-compat/libusb-compat-extraconf.inc index e69de29..2c83feb 100644 --- a/meta-tizen-ivi/recipes-tizen/libusb-compat/libusb-compat-extraconf.inc +++ b/meta-tizen-ivi/recipes-tizen/libusb-compat/libusb-compat-extraconf.inc @@ -0,0 +1,12 @@ +inherit pkgconfig binconfig lib_package + +EXTRA_OECONF = "--libdir=${base_libdir}" + +SRC_URI += "file://obsolete_automake_macros.patch \ + " + +do_patch () { + echo RLM begining of do_patch + cat ${WORKDIR}/obsolete_automake_macros.patch| patch -s -p1 --fuzz=2 + echo RLM end of do_patch +} \ No newline at end of file diff --git a/meta-tizen-ivi/recipes-tizen/libusb-compat/libusb-compat/obsolete_automake_macros.patch b/meta-tizen-ivi/recipes-tizen/libusb-compat/libusb-compat/obsolete_automake_macros.patch new file mode 100644 index 0000000..bc29de2 --- /dev/null +++ b/meta-tizen-ivi/recipes-tizen/libusb-compat/libusb-compat/obsolete_automake_macros.patch @@ -0,0 +1,15 @@ +Upstream-status: Submitted [https://libusb.org/ticket/161] + +Signed-off-by: Marko Lindqvist +diff -Nurd libusb-compat-0.1.4/configure.ac libusb-compat-0.1.4/configure.ac +--- libusb-compat-0.1.4/configure.ac 2012-04-24 08:45:46.000000000 +0300 ++++ libusb-compat-0.1.4/configure.ac 2013-01-02 16:41:30.440115202 +0200 +@@ -1,7 +1,7 @@ + AC_INIT([libusb-compat], [0.1.4]) + AM_INIT_AUTOMAKE + AC_CONFIG_SRCDIR([libusb/core.c]) +-AM_CONFIG_HEADER([config.h]) ++AC_CONFIG_HEADERS([config.h]) + AC_CONFIG_MACRO_DIR([m4]) + + AC_PREREQ([2.50]) diff --git a/meta-tizen-ivi/recipes-tizen/libusb/libusb-extraconf.inc b/meta-tizen-ivi/recipes-tizen/libusb/libusb-extraconf.inc index e69de29..8411e7e 100644 --- a/meta-tizen-ivi/recipes-tizen/libusb/libusb-extraconf.inc +++ b/meta-tizen-ivi/recipes-tizen/libusb/libusb-extraconf.inc @@ -0,0 +1,8 @@ +SRC_URI += "file://libusb.spec.patch \ + " + +do_patch () { + echo RLM begining of do_patch + cat ${WORKDIR}/libusb.spec.patch | patch -s -p1 --fuzz=2 + echo RLM end of do_patch +} \ No newline at end of file diff --git a/meta-tizen-ivi/recipes-tizen/libusb/libusb/libusb.spec.patch b/meta-tizen-ivi/recipes-tizen/libusb/libusb/libusb.spec.patch new file mode 100644 index 0000000..78042ee --- /dev/null +++ b/meta-tizen-ivi/recipes-tizen/libusb/libusb/libusb.spec.patch @@ -0,0 +1,15 @@ +diff --git a/packaging/libusb.spec b/packaging/libusb.spec +index f006611..39ce96a 100644 +--- a/packaging/libusb.spec ++++ b/packaging/libusb.spec +@@ -43,8 +43,8 @@ rm -rf %{buildroot} + + mkdir -p %{buildroot}/lib/ + mv %{buildroot}/usr/lib/libusb-1.0.so.* %{buildroot}/lib/ +-ln -sf /lib/libusb-1.0.so.0 %{buildroot}/usr/lib/libusb-1.0.so.0 +-ln -sf /lib/libusb-1.0.so.0.1.0 %{buildroot}/usr/lib/libusb-1.0.so ++ln -sf ../../lib/libusb-1.0.so.0 %{buildroot}/usr/lib/libusb-1.0.so.0 ++ln -sf ../../lib/libusb-1.0.so.0.1.0 %{buildroot}/usr/lib/libusb-1.0.so + + + %post -p /sbin/ldconfig