From 78e789adde8a738f4c70bbc811acea15903d76b3 Mon Sep 17 00:00:00 2001 From: Martin Dietze Date: Sat, 23 May 2009 13:18:49 +0200 Subject: libusb: added patch to allow compiling with gcc 3, used by nylon distro * the gcc flags -fvisibility=hidden and -Wno-pointer-sign are removed from configure script and Makefile templates --- .../libusb-compat-0.1.0/gcc-3-compatibility.patch | 22 +++++++++++++++ recipes/libusb/libusb-compat_0.1.0.bb | 3 +- .../libusb/libusb1-1.0.0/gcc-3-compatibility.patch | 22 +++++++++++++++ .../libusb/libusb1-1.0.1/gcc-3-compatibility.patch | 33 ++++++++++++++++++++++ recipes/libusb/libusb1_1.0.0.bb | 2 ++ recipes/libusb/libusb1_1.0.1.bb | 2 ++ 6 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 recipes/libusb/libusb-compat-0.1.0/gcc-3-compatibility.patch create mode 100644 recipes/libusb/libusb1-1.0.0/gcc-3-compatibility.patch create mode 100644 recipes/libusb/libusb1-1.0.1/gcc-3-compatibility.patch diff --git a/recipes/libusb/libusb-compat-0.1.0/gcc-3-compatibility.patch b/recipes/libusb/libusb-compat-0.1.0/gcc-3-compatibility.patch new file mode 100644 index 0000000000..f07b5383bf --- /dev/null +++ b/recipes/libusb/libusb-compat-0.1.0/gcc-3-compatibility.patch @@ -0,0 +1,22 @@ +--- libusb-compat-0.1.0/configure.ac-orig 2009-02-26 15:30:51.000000000 +0100 ++++ libusb-compat-0.1.0/configure.ac 2009-02-26 15:31:04.000000000 +0100 +@@ -55,7 +55,7 @@ + CFLAGS="$saved_cflags" + + AC_DEFINE([API_EXPORTED], [__attribute__((visibility("default")))], [Default visibility]) +-AM_CFLAGS="-std=gnu99 $inline_cflags -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration -Wno-pointer-sign -Wshadow" ++AM_CFLAGS="-std=gnu99 $inline_cflags -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration -Wshadow" + AC_SUBST(AM_CFLAGS) + + AC_CONFIG_FILES([libusb.pc] [libusb-config] [Makefile] [libusb/Makefile] [examples/Makefile]) +--- libusb-compat-0.1.0/libusb/Makefile.am-orig 2009-02-26 15:33:30.000000000 +0100 ++++ libusb-compat-0.1.0/libusb/Makefile.am 2009-02-26 15:33:40.000000000 +0100 +@@ -2,7 +2,7 @@ + lib_LTLIBRARIES = libusb.la + + libusb_la_SOURCES = core.c usbi.h +-libusb_la_CFLAGS = -fvisibility=hidden $(AM_CFLAGS) $(LIBUSB_1_0_CFLAGS) ++libusb_la_CFLAGS = $(AM_CFLAGS) $(LIBUSB_1_0_CFLAGS) + libusb_la_LIBADD = $(LIBUSB_1_0_LIBS) + libusb_la_LDFLAGS = -version-info $(LT_MAJOR):$(LT_REVISION):$(LT_AGE) \ + -release 0.1 diff --git a/recipes/libusb/libusb-compat_0.1.0.bb b/recipes/libusb/libusb-compat_0.1.0.bb index 887765133a..48694403e5 100644 --- a/recipes/libusb/libusb-compat_0.1.0.bb +++ b/recipes/libusb/libusb-compat_0.1.0.bb @@ -11,7 +11,8 @@ DEPENDS = "libusb1" SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-compat-${PV}.tar.bz2 \ " - +SRC_URI_append_nylon = " file://gcc-3-compatibility.patch;patch=1 \ +" inherit autotools pkgconfig binconfig lib_package PARALLEL_MAKE = "" diff --git a/recipes/libusb/libusb1-1.0.0/gcc-3-compatibility.patch b/recipes/libusb/libusb1-1.0.0/gcc-3-compatibility.patch new file mode 100644 index 0000000000..d1bc6803d8 --- /dev/null +++ b/recipes/libusb/libusb1-1.0.0/gcc-3-compatibility.patch @@ -0,0 +1,22 @@ +--- libusb-1.0.0/configure.ac-orig 2009-02-26 13:18:31.000000000 +0100 ++++ libusb-1.0.0/configure.ac 2009-02-26 13:18:43.000000000 +0100 +@@ -62,7 +62,7 @@ + CFLAGS="$saved_cflags" + + AC_DEFINE([API_EXPORTED], [__attribute__((visibility("default")))], [Default visibility]) +-AM_CFLAGS="-std=gnu99 $inline_cflags -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration -Wno-pointer-sign -Wshadow" ++AM_CFLAGS="-std=gnu99 $inline_cflags -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration -Wshadow" + AC_SUBST(AM_CFLAGS) + + AC_CONFIG_FILES([libusb-1.0.pc] [Makefile] [libusb/Makefile] [examples/Makefile] [doc/Makefile] [doc/doxygen.cfg]) +--- libusb-1.0.0/libusb/Makefile.am-orig 2009-02-26 13:18:11.000000000 +0100 ++++ libusb-1.0.0/libusb/Makefile.am 2009-02-26 13:18:23.000000000 +0100 +@@ -8,7 +8,7 @@ + OS_SRC = $(LINUX_USBFS_SRC) + endif + +-libusb_1_0_la_CFLAGS = -fvisibility=hidden $(AM_CFLAGS) -pthread ++libusb_1_0_la_CFLAGS = $(AM_CFLAGS) -pthread + libusb_1_0_la_SOURCES = libusbi.h core.c descriptor.c io.c sync.c $(OS_SRC) + libusb_1_0_la_LIBADD = -lrt + diff --git a/recipes/libusb/libusb1-1.0.1/gcc-3-compatibility.patch b/recipes/libusb/libusb1-1.0.1/gcc-3-compatibility.patch new file mode 100644 index 0000000000..98c3674bca --- /dev/null +++ b/recipes/libusb/libusb1-1.0.1/gcc-3-compatibility.patch @@ -0,0 +1,33 @@ +--- libusb-1.0.1/libusb/Makefile.am-orig 2009-05-19 22:41:07.000000000 +0200 ++++ libusb-1.0.1/libusb/Makefile.am 2009-05-19 22:41:27.000000000 +0200 +@@ -14,7 +14,7 @@ + AM_CFLAGS_EXT = -no-cpp-precomp + endif + +-libusb_1_0_la_CFLAGS = -fvisibility=hidden $(AM_CFLAGS) -pthread ++libusb_1_0_la_CFLAGS = $(AM_CFLAGS) -pthread + libusb_1_0_la_SOURCES = libusbi.h core.c descriptor.c io.c sync.c $(OS_SRC) + + hdrdir = $(includedir)/libusb-1.0 +--- libusb-1.0.1/libusb/Makefile.in-orig 2009-05-19 22:41:13.000000000 +0200 ++++ libusb-1.0.1/libusb/Makefile.in 2009-05-19 22:41:42.000000000 +0200 +@@ -210,7 +210,7 @@ + @OS_DARWIN_TRUE@OS_SRC = $(DARWIN_USB_SRC) + @OS_LINUX_TRUE@OS_SRC = $(LINUX_USBFS_SRC) + @OS_DARWIN_TRUE@AM_CFLAGS_EXT = -no-cpp-precomp +-libusb_1_0_la_CFLAGS = -fvisibility=hidden $(AM_CFLAGS) -pthread ++libusb_1_0_la_CFLAGS = $(AM_CFLAGS) -pthread + libusb_1_0_la_SOURCES = libusbi.h core.c descriptor.c io.c sync.c $(OS_SRC) + hdrdir = $(includedir)/libusb-1.0 + hdr_HEADERS = libusb.h +--- libusb-1.0.1/configure.ac-orig 2009-05-19 22:44:06.000000000 +0200 ++++ libusb-1.0.1/configure.ac 2009-05-19 22:44:16.000000000 +0200 +@@ -72,7 +72,7 @@ + CFLAGS="$saved_cflags" + + AC_DEFINE([API_EXPORTED], [__attribute__((visibility("default")))], [Default visibility]) +-AM_CFLAGS="-std=gnu99 $inline_cflags -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration -Wno-pointer-sign -Wshadow" ++AM_CFLAGS="-std=gnu99 $inline_cflags -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration -Wshadow" + + AC_SUBST(AM_CFLAGS) + AC_SUBST(AM_LDFLAGS) diff --git a/recipes/libusb/libusb1_1.0.0.bb b/recipes/libusb/libusb1_1.0.0.bb index 8450a7c946..978d819a6f 100644 --- a/recipes/libusb/libusb1_1.0.0.bb +++ b/recipes/libusb/libusb1_1.0.0.bb @@ -9,6 +9,8 @@ PR = "r0" SRC_URI = "\ ${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \ " +SRC_URI_append_nylon = " file://gcc-3-compatibility.patch;patch=1 \ +" S = "${WORKDIR}/libusb-${PV}" inherit autotools pkgconfig binconfig lib_package diff --git a/recipes/libusb/libusb1_1.0.1.bb b/recipes/libusb/libusb1_1.0.1.bb index 1af46bcf98..3856812965 100644 --- a/recipes/libusb/libusb1_1.0.1.bb +++ b/recipes/libusb/libusb1_1.0.1.bb @@ -8,6 +8,8 @@ LICENSE = "LGPL" SRC_URI = "\ ${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \ " +SRC_URI_append_nylon = " file://gcc-3-compatibility.patch;patch=1 \ +" S = "${WORKDIR}/libusb-${PV}" inherit autotools_stage binconfig lib_package -- cgit 1.2.3-korg