diff options
author | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-01-10 01:49:36 +0100 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-01-10 02:16:54 +0100 |
commit | 3e66790c3d375e4627359ad44765f6e9de6423c4 (patch) | |
tree | 424887d1bd0eda6bb7a4b1923d187ed25575aacc /patches/libusb-compat-0.1.3 | |
parent | a4057f7f9a0d4b17efd9ae1584f0a9c451dc978f (diff) | |
download | ptxdist-3e66790c3d375e4627359ad44765f6e9de6423c4.tar.gz ptxdist-3e66790c3d375e4627359ad44765f6e9de6423c4.tar.xz |
[libusb-compat] libusb-config: add SYSROOT support
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'patches/libusb-compat-0.1.3')
4 files changed, 66 insertions, 25 deletions
diff --git a/patches/libusb-compat-0.1.3/0001-libusb-config-add-SYSROOT-support.patch b/patches/libusb-compat-0.1.3/0001-libusb-config-add-SYSROOT-support.patch new file mode 100644 index 000000000..5868b4261 --- /dev/null +++ b/patches/libusb-compat-0.1.3/0001-libusb-config-add-SYSROOT-support.patch @@ -0,0 +1,35 @@ +From c6ad7f4baf30275ddfaeba2b26d5727e48faf248 Mon Sep 17 00:00:00 2001 +From: Marc Kleine-Budde <mkl@pengutronix.de> +Date: Sat, 9 Jan 2010 23:35:22 +0100 +Subject: [PATCH 1/2] libusb-config: add SYSROOT support + +Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> +--- + libusb-config.in | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/libusb-config.in b/libusb-config.in +index 6fbda43..d47d63f 100644 +--- a/libusb-config.in ++++ b/libusb-config.in +@@ -52,8 +52,8 @@ while test $# -gt 0; do + exit 0 + ;; + --cflags) +- if test "$includedir" != /usr/include ; then +- includes="-I$includedir" ++ if test "${SYSROOT}$includedir" != /usr/include ; then ++ includes="-I${SYSROOT}$includedir" + fi + echo_cflags=yes + ;; +@@ -77,5 +77,5 @@ if test "$echo_cflags" = "yes"; then + echo $includes + fi + if test "$echo_libs" = "yes"; then +- echo -L$libdir -lusb ++ echo -L${SYSROOT}$libdir -lusb + fi +-- +1.6.6 + diff --git a/patches/libusb-compat-0.1.3/0002-libusb-pc-add-dependency-to-libusb.patch b/patches/libusb-compat-0.1.3/0002-libusb-pc-add-dependency-to-libusb.patch new file mode 100644 index 000000000..d8dc5dceb --- /dev/null +++ b/patches/libusb-compat-0.1.3/0002-libusb-pc-add-dependency-to-libusb.patch @@ -0,0 +1,29 @@ +From a64149eee40c5d764f0d373b5efb1a5eea7c6bde Mon Sep 17 00:00:00 2001 +From: Robert Schwebel <r.schwebel@pengutronix.de> +Date: Sat, 9 Jan 2010 23:36:35 +0100 +Subject: [PATCH 2/2] libusb-pc: add dependency to libusb + +Add dependency to libusb-1.0; the 'emulated_by' mechanics does not seem to +work. + +Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> +Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> +--- + libusb.pc.in | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/libusb.pc.in b/libusb.pc.in +index 02d67b8..87c4a47 100644 +--- a/libusb.pc.in ++++ b/libusb.pc.in +@@ -7,6 +7,7 @@ emulated=1 + emulated_by=libusb-1.0 + + Name: libusb ++Requires: libusb-1.0 + Description: USB access library (libusb-1.0 compat wrapper) + Version: @LIBUSB01_VERSION@ + Libs: -L${libdir} -lusb +-- +1.6.6 + diff --git a/patches/libusb-compat-0.1.3/libusb-compat-0.1.0-pkgconfig.diff b/patches/libusb-compat-0.1.3/libusb-compat-0.1.0-pkgconfig.diff deleted file mode 100644 index 00b4b83ee..000000000 --- a/patches/libusb-compat-0.1.3/libusb-compat-0.1.0-pkgconfig.diff +++ /dev/null @@ -1,24 +0,0 @@ -Subject: add dependency -From: Robert Schwebel <r.schwebel@pengutronix.de> - -Add dependency to libusb-1.0; the emulated_by mechanics does not seem to -work. - -Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> - ---- - libusb.pc.in | 1 + - 1 file changed, 1 insertion(+) - -Index: libusb-compat-0.1.0/libusb.pc.in -=================================================================== ---- libusb-compat-0.1.0.orig/libusb.pc.in -+++ libusb-compat-0.1.0/libusb.pc.in -@@ -7,6 +7,7 @@ emulated=1 - emulated_by=libusb-1.0 - - Name: libusb -+Requires: libusb-1.0 - Description: USB access library (libusb-1.0 compat wrapper) - Version: @LIBUSB01_VERSION@ - Libs: -L${libdir} -lusb diff --git a/patches/libusb-compat-0.1.3/series b/patches/libusb-compat-0.1.3/series index 71b991459..903968f6f 100644 --- a/patches/libusb-compat-0.1.3/series +++ b/patches/libusb-compat-0.1.3/series @@ -1 +1,2 @@ -libusb-compat-0.1.0-pkgconfig.diff +0001-libusb-config-add-SYSROOT-support.patch +0002-libusb-pc-add-dependency-to-libusb.patch |