From 3030b331c6e2b012f6ab1ba6ad8273f1a286e479 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 4 Oct 2008 08:42:15 +0000 Subject: apache2 native: attempt to fix bug #4606 --- packages/apache2/apache2-native_2.2.3.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/apache2/apache2-native_2.2.3.bb b/packages/apache2/apache2-native_2.2.3.bb index ebf68b52e5..e6f9f4d3ab 100644 --- a/packages/apache2/apache2-native_2.2.3.bb +++ b/packages/apache2/apache2-native_2.2.3.bb @@ -3,7 +3,7 @@ DEPENDS = "expat pcre" inherit cross -PR="r6" +PR="r7" SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2" S = "${WORKDIR}/httpd-${PV}" @@ -13,6 +13,7 @@ do_configure () { } do_stage () { + install -d ${STAGING_BINDIR} cp srclib/pcre/dftables ${STAGING_BINDIR} cp server/gen_test_char ${STAGING_BINDIR} cp srclib/apr/apr-1-config ${STAGING_BINDIR} -- cgit v1.2.3 From 7dd9d57d7f31935f9b0be56f1b5debe7f9f6e67f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 4 Oct 2008 09:39:40 +0000 Subject: gpsd: fix bug #4611 --- packages/gpsd/gpsd.inc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'packages') diff --git a/packages/gpsd/gpsd.inc b/packages/gpsd/gpsd.inc index 06be2fe2eb..82f541ea99 100644 --- a/packages/gpsd/gpsd.inc +++ b/packages/gpsd/gpsd.inc @@ -25,6 +25,8 @@ INITSCRIPT_NAME = "gpsd" INITSCRIPT_PARAMS = "defaults 35" export LDFLAGS = "-L${STAGING_LIBDIR} -lm" +export STAGING_INCDIR +export STAGING_LIBDIR do_compile_prepend() { export BUILD_SYS="${BUILD_SYS}" -- cgit v1.2.3 From d9a4683da8347fcf1c4e375190c3c7124738b770 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Sat, 4 Oct 2008 14:35:59 +0000 Subject: gcc-4.3.2: fix unwind compiling when libc headers are available * add sh_unwind.patch, which fixes gcc/config/sh/linux-unwind.h like mips or i386 * patch will only ne applied for sh4 arch for now * do not bump PR because it only affects sh architecture on which gcc did not build before --- packages/gcc/gcc-4.3.2.inc | 3 +++ packages/gcc/gcc-4.3.2/sh_unwind.patch | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 packages/gcc/gcc-4.3.2/sh_unwind.patch (limited to 'packages') diff --git a/packages/gcc/gcc-4.3.2.inc b/packages/gcc/gcc-4.3.2.inc index 49b2a63b70..21c08ffccc 100644 --- a/packages/gcc/gcc-4.3.2.inc +++ b/packages/gcc/gcc-4.3.2.inc @@ -59,6 +59,9 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 " +SRC_URI_append_sh4 = " file://sh_unwind.patch;patch=1 \ + " + # Language Overrides FORTRAN = "" JAVA = "" diff --git a/packages/gcc/gcc-4.3.2/sh_unwind.patch b/packages/gcc/gcc-4.3.2/sh_unwind.patch new file mode 100644 index 0000000000..94921636bc --- /dev/null +++ b/packages/gcc/gcc-4.3.2/sh_unwind.patch @@ -0,0 +1,18 @@ +Index: gcc-4.2.4/gcc/config/sh/linux-unwind.h +=================================================================== +--- gcc-4.2.4.orig/gcc/config/sh/linux-unwind.h 2008-10-04 00:05:29.434889757 +0200 ++++ gcc-4.2.4/gcc/config/sh/linux-unwind.h 2008-10-04 00:06:02.594883544 +0200 +@@ -26,6 +26,7 @@ + the Free Software Foundation, 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ + ++#ifndef inhibit_libc + /* Do code reading to identify a signal frame, and set the frame + state data appropriately. See unwind-dw2.c for the structs. */ + +@@ -251,3 +252,5 @@ + return _URC_NO_REASON; + } + #endif /* defined (__SH5__) */ ++ ++#endif /* defined inhibit_libc */ -- cgit v1.2.3 From 0efef5b382ddc44841ec101eae4f5c2bd2257a0f Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Sat, 4 Oct 2008 14:44:56 +0000 Subject: gcc-4.2.4: fix gcc build for sh4 and uclibc * add sh_unwind.patch which fixes gcc/config/sh/linux-unwind.h like mips or i386 * add cppdefaults_cross.patch which removes /usr/include path from gcc/cppdefault.c when, this is needed because sh4 uses fixheader and fixproto and then zeckes no-host-include code yelling at the /usr/include * ATTENTION this may break sh4-native gcc, but I do not believe that someone would use gcc directly on sh4 arch, if there iare some crazy people doing it, I will fix it in another way * do not bump PR because it only affects sh4 arch --- packages/gcc/gcc-4.2.4.inc | 5 +++++ packages/gcc/gcc-4.2.4/cppdefault_cross.patch | 12 ++++++++++++ packages/gcc/gcc-4.2.4/sh_unwind.patch | 18 ++++++++++++++++++ 3 files changed, 35 insertions(+) create mode 100644 packages/gcc/gcc-4.2.4/cppdefault_cross.patch create mode 100644 packages/gcc/gcc-4.2.4/sh_unwind.patch (limited to 'packages') diff --git a/packages/gcc/gcc-4.2.4.inc b/packages/gcc/gcc-4.2.4.inc index ccca7705c1..b21569b270 100644 --- a/packages/gcc/gcc-4.2.4.inc +++ b/packages/gcc/gcc-4.2.4.inc @@ -63,6 +63,11 @@ PACKAGE_ARCH_ep93xx = "${MACHINE_ARCH}" SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 " +SRC_URI_append_sh4 = " file://sh_unwind.patch;patch=1 \ + file://cppdefault_cross.patch;patch=1 \ + " + + # Language Overrides FORTRAN = "" FORTRAN_linux-gnueabi = ",fortran" diff --git a/packages/gcc/gcc-4.2.4/cppdefault_cross.patch b/packages/gcc/gcc-4.2.4/cppdefault_cross.patch new file mode 100644 index 0000000000..dfdbeb32cf --- /dev/null +++ b/packages/gcc/gcc-4.2.4/cppdefault_cross.patch @@ -0,0 +1,12 @@ +Index: gcc-4.2.4/gcc/cppdefault.c +=================================================================== +--- gcc-4.2.4.orig/gcc/cppdefault.c 2008-10-04 00:07:13.161548578 +0200 ++++ gcc-4.2.4/gcc/cppdefault.c 2008-10-04 00:07:32.548205652 +0200 +@@ -39,6 +39,7 @@ + # undef STANDARD_INCLUDE_DIR + #else + # undef CROSS_INCLUDE_DIR ++# undef STANDARD_INCLUDE_DIR + #endif + + const struct default_include cpp_include_defaults[] diff --git a/packages/gcc/gcc-4.2.4/sh_unwind.patch b/packages/gcc/gcc-4.2.4/sh_unwind.patch new file mode 100644 index 0000000000..94921636bc --- /dev/null +++ b/packages/gcc/gcc-4.2.4/sh_unwind.patch @@ -0,0 +1,18 @@ +Index: gcc-4.2.4/gcc/config/sh/linux-unwind.h +=================================================================== +--- gcc-4.2.4.orig/gcc/config/sh/linux-unwind.h 2008-10-04 00:05:29.434889757 +0200 ++++ gcc-4.2.4/gcc/config/sh/linux-unwind.h 2008-10-04 00:06:02.594883544 +0200 +@@ -26,6 +26,7 @@ + the Free Software Foundation, 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ + ++#ifndef inhibit_libc + /* Do code reading to identify a signal frame, and set the frame + state data appropriately. See unwind-dw2.c for the structs. */ + +@@ -251,3 +252,5 @@ + return _URC_NO_REASON; + } + #endif /* defined (__SH5__) */ ++ ++#endif /* defined inhibit_libc */ -- cgit v1.2.3