diff options
author | Richard Purdie <rpurdie@rpsys.net> | 2008-03-27 12:14:05 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@rpsys.net> | 2008-03-27 12:14:05 +0000 |
commit | 154ce545bf6b5b9d3c6422a4167d4ce45a09b8af (patch) | |
tree | a3b11b837e2a912036ead39a21217f1fbb5c2c6c /packages | |
parent | ca3cda0f6b37ced3fbc0a19c8e5ef08d170625c0 (diff) | |
parent | 8cb565a2ef07ae9527da8981be82d07d8c8218fe (diff) |
merge of '58892f8690878f7ed6658262c62e3515f83d248a'
and 'd9f628bbbe62d8fe9b1dfa860de027f41eb7ef11'
Diffstat (limited to 'packages')
34 files changed, 441 insertions, 86 deletions
diff --git a/packages/device-mapper/device-mapper-1.01.05/remove_insanity.patch b/packages/device-mapper/device-mapper-1.01.05/remove_insanity.patch new file mode 100644 index 0000000000..1bc846e625 --- /dev/null +++ b/packages/device-mapper/device-mapper-1.01.05/remove_insanity.patch @@ -0,0 +1,33 @@ +Index: device-mapper.1.01.05/dmsetup/Makefile.in +=================================================================== +--- device-mapper.1.01.05.orig/dmsetup/Makefile.in 2008-03-26 09:17:23.000000000 +0000 ++++ device-mapper.1.01.05/dmsetup/Makefile.in 2008-03-26 09:18:01.000000000 +0000 +@@ -31,11 +31,11 @@ + + dmsetup: $(OBJECTS) $(interfacedir)/libdevmapper.$(LIB_SUFFIX) + $(CC) -o $@ $(OBJECTS) $(LDFLAGS) \ +- -L$(interfacedir) -L$(DESTDIR)/lib -ldevmapper $(LIBS) ++ -L$(interfacedir) -ldevmapper $(LIBS) + + dmsetup.static: $(OBJECTS) $(interfacedir)/libdevmapper.a + $(CC) -o $@ $(OBJECTS) $(LDFLAGS) -static \ +- -L$(interfacedir) -L$(DESTDIR)/lib -ldevmapper $(LIBS) ++ -L$(interfacedir) -ldevmapper $(LIBS) + + install: $(INSTALL_TYPE) + +Index: device-mapper.1.01.05/make.tmpl.in +=================================================================== +--- device-mapper.1.01.05.orig/make.tmpl.in 2008-03-26 09:18:44.000000000 +0000 ++++ device-mapper.1.01.05/make.tmpl.in 2008-03-26 09:19:10.000000000 +0000 +@@ -91,10 +91,6 @@ + + INCLUDES += -I. -I$(top_srcdir)/include + +-ifdef DESTDIR +- INCLUDES += -I$(DESTDIR)/usr/include +-endif +- + ifneq ("@missingkernel@", "yes") + INCLUDES += -I$(kerneldir)/include + endif diff --git a/packages/device-mapper/device-mapper_1.01.05.bb b/packages/device-mapper/device-mapper_1.01.05.bb index 1626f01ee4..bc02e6a71f 100644 --- a/packages/device-mapper/device-mapper_1.01.05.bb +++ b/packages/device-mapper/device-mapper_1.01.05.bb @@ -3,12 +3,13 @@ DESCRIPTION = "The Device-mapper is a new component of the linux kernel \ that supports logical volume management. It is required by LVM2 and EVMS. \ The original LVM (included in stock 2.4 kernels) does not use it." LICENSE = "GPL" -PR = "r2" +PR = "r3" S = "${WORKDIR}/${PN}.${PV}" SRC_URI = "ftp://sources.redhat.com/pub/dm/device-mapper.${PV}.tgz \ - file://devmap-mknod-busybox.patch;patch=1" + file://devmap-mknod-busybox.patch;patch=1 \ + file://remove_insanity.patch;patch=1 " inherit autotools update-rc.d diff --git a/packages/elfutils/elfutils-0.127/warnings.patch b/packages/elfutils/elfutils-0.127/warnings.patch index c2e7fc2f3d..454706de4b 100644 --- a/packages/elfutils/elfutils-0.127/warnings.patch +++ b/packages/elfutils/elfutils-0.127/warnings.patch @@ -1,7 +1,7 @@ -Index: elfutils-0.108/configure.ac +Index: elfutils-0.127/configure.ac =================================================================== ---- elfutils-0.108.orig/configure.ac 2006-04-10 19:18:34.000000000 +0100 -+++ elfutils-0.108/configure.ac 2006-04-10 19:19:33.000000000 +0100 +--- elfutils-0.127.orig/configure.ac 2007-04-19 07:55:07.000000000 +0100 ++++ elfutils-0.127/configure.ac 2008-03-26 10:45:54.000000000 +0000 @@ -55,6 +55,10 @@ dnl Add all the languages for which translations are available. ALL_LINGUAS= @@ -13,10 +13,10 @@ Index: elfutils-0.108/configure.ac AC_PROG_CC AC_PROG_RANLIB AC_PROG_YACC -Index: elfutils-0.108/lib/Makefile.am +Index: elfutils-0.127/lib/Makefile.am =================================================================== ---- elfutils-0.108.orig/lib/Makefile.am 2006-04-10 19:18:34.000000000 +0100 -+++ elfutils-0.108/lib/Makefile.am 2006-04-10 19:19:33.000000000 +0100 +--- elfutils-0.127.orig/lib/Makefile.am 2006-04-11 21:52:05.000000000 +0100 ++++ elfutils-0.127/lib/Makefile.am 2008-03-26 10:45:54.000000000 +0000 @@ -30,7 +30,7 @@ else AM_CFLAGS = @@ -26,10 +26,10 @@ Index: elfutils-0.108/lib/Makefile.am INCLUDES = -I$(srcdir)/../libelf -I.. noinst_LIBRARIES = libeu.a -Index: elfutils-0.108/libasm/Makefile.am +Index: elfutils-0.127/libasm/Makefile.am =================================================================== ---- elfutils-0.127.orig/libasm/Makefile.am 2006-04-10 19:18:34.000000000 +0100 -+++ elfutils-0.127/libasm/Makefile.am 2006-04-10 19:19:33.000000000 +0100 +--- elfutils-0.127.orig/libasm/Makefile.am 2006-08-29 20:31:57.000000000 +0100 ++++ elfutils-0.127/libasm/Makefile.am 2008-03-26 10:45:54.000000000 +0000 @@ -30,7 +30,7 @@ else AM_CFLAGS = @@ -37,15 +37,14 @@ Index: elfutils-0.108/libasm/Makefile.am -AM_CFLAGS += -std=gnu99 -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 +AM_CFLAGS += -std=gnu99 -Wshadow -Wunused -Wformat=2 INCLUDES = -I. -I$(srcdir) -I.. \ - -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl -I$(top_srcdir)/libdw\ + -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl -I$(top_srcdir)/libdw\ -I$(top_srcdir)/lib - GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include) -Index: elfutils-0.108/libcpu/Makefile.am +Index: elfutils-0.127/libcpu/Makefile.am =================================================================== ---- elfutils-0.108.orig/libcpu/Makefile.am 2006-04-10 19:18:34.000000000 +0100 -+++ elfutils-0.108/libcpu/Makefile.am 2006-04-10 19:19:33.000000000 +0100 -@@ -13,7 +13,7 @@ - ## 3001 King Ranch Road, Ukiah, CA 95482. +--- elfutils-0.127.orig/libcpu/Makefile.am 2006-04-11 21:52:05.000000000 +0100 ++++ elfutils-0.127/libcpu/Makefile.am 2008-03-26 10:45:54.000000000 +0000 +@@ -25,7 +25,7 @@ + ## <http://www.openinventionnetwork.com>. ## DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -AM_CFLAGS = -Wall -Wshadow -Werror -Wextra -Wformat=2 -Wunused @@ -53,24 +52,24 @@ Index: elfutils-0.108/libcpu/Makefile.am INCLUDES = -I$(srcdir) noinst_LIBRARIES = libcpu_i386.a -Index: elfutils-0.108/libdw/Makefile.am +Index: elfutils-0.127/libdw/Makefile.am =================================================================== ---- elfutils-0.108.orig/libdw/Makefile.am 2006-04-10 19:18:34.000000000 +0100 -+++ elfutils-0.108/libdw/Makefile.am 2006-04-10 19:19:33.000000000 +0100 -@@ -18,7 +18,7 @@ - else - AM_CFLAGS = +--- elfutils-0.127.orig/libdw/Makefile.am 2007-04-05 11:26:50.000000000 +0100 ++++ elfutils-0.127/libdw/Makefile.am 2008-03-26 10:45:54.000000000 +0000 +@@ -33,7 +33,7 @@ + if BUILD_STATIC + AM_CFLAGS += -fpic endif -AM_CFLAGS += -Wall -Werror -Wshadow -Wunused -Wformat=2 -Wextra -std=gnu99 +AM_CFLAGS += -Wshadow -Wunused -Wformat=2 -std=gnu99 INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I.. -I$(srcdir)/../lib VERSION = 1 -Index: elfutils-0.108/libebl/Makefile.am +Index: elfutils-0.127/libebl/Makefile.am =================================================================== ---- elfutils-0.108.orig/libebl/Makefile.am 2006-04-10 19:18:34.000000000 +0100 -+++ elfutils-0.108/libebl/Makefile.am 2006-04-10 19:19:33.000000000 +0100 -@@ -18,7 +18,7 @@ +--- elfutils-0.127.orig/libebl/Makefile.am 2007-04-05 10:12:36.000000000 +0100 ++++ elfutils-0.127/libebl/Makefile.am 2008-03-26 10:45:54.000000000 +0000 +@@ -30,7 +30,7 @@ else AM_CFLAGS = endif @@ -78,25 +77,25 @@ Index: elfutils-0.108/libebl/Makefile.am +AM_CFLAGS += -fpic -Wshadow -Wunused -Wformat=2 \ -std=gnu99 - INCLUDES = -I$(srcdir) -I$(top_srcdir)/libelf -I$(top_srcdir)/lib -I.. -Index: elfutils-0.108/libelf/Makefile.am + INCLUDES = -I$(srcdir) -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \ +Index: elfutils-0.127/libelf/Makefile.am =================================================================== ---- elfutils-0.108.orig/libelf/Makefile.am 2006-04-10 19:18:34.000000000 +0100 -+++ elfutils-0.108/libelf/Makefile.am 2006-04-10 19:19:33.000000000 +0100 -@@ -21,7 +21,7 @@ - else - AM_CFLAGS = +--- elfutils-0.127.orig/libelf/Makefile.am 2007-04-05 10:12:36.000000000 +0100 ++++ elfutils-0.127/libelf/Makefile.am 2008-03-26 10:45:54.000000000 +0000 +@@ -33,7 +33,7 @@ + if BUILD_STATIC + AM_CFLAGS += -fpic endif -AM_CFLAGS += -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 -std=gnu99 \ +AM_CFLAGS += -Wshadow -Wunused -Wformat=2 -std=gnu99 \ $($(*F)_CFLAGS) INCLUDES = -I$(srcdir) -I$(top_srcdir)/lib -I.. GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include) -Index: elfutils-0.108/tests/Makefile.am +Index: elfutils-0.127/tests/Makefile.am =================================================================== ---- elfutils-0.108.orig/tests/Makefile.am 2006-04-10 19:18:34.000000000 +0100 -+++ elfutils-0.108/tests/Makefile.am 2006-04-10 19:19:33.000000000 +0100 -@@ -14,10 +14,10 @@ +--- elfutils-0.127.orig/tests/Makefile.am 2007-04-18 21:44:32.000000000 +0100 ++++ elfutils-0.127/tests/Makefile.am 2008-03-26 10:45:54.000000000 +0000 +@@ -26,11 +26,11 @@ ## DEFS = -DHAVE_CONFIG_H -D_GNU_SOURCE if MUDFLAP @@ -110,3 +109,41 @@ Index: elfutils-0.108/tests/Makefile.am $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) BUILT_RPATH = \$$ORIGIN/../libasm:\$$ORIGIN/../libdw:\$$ORIGIN/../backends:\$$ORIGIN/../libelf endif +Index: elfutils-0.127/backends/Makefile.am +=================================================================== +--- elfutils-0.127.orig/backends/Makefile.am 2007-04-05 10:12:36.000000000 +0100 ++++ elfutils-0.127/backends/Makefile.am 2008-03-26 10:45:54.000000000 +0000 +@@ -30,7 +30,7 @@ + else + AM_CFLAGS = + endif +-AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 \ ++AM_CFLAGS += -fpic -Wshadow -Wunused -Wformat=2 \ + -std=gnu99 + INCLUDES = -I$(srcdir) -I$(top_srcdir)/libebl \ + -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \ +Index: elfutils-0.127/libdwfl/Makefile.am +=================================================================== +--- elfutils-0.127.orig/libdwfl/Makefile.am 2007-04-05 10:12:36.000000000 +0100 ++++ elfutils-0.127/libdwfl/Makefile.am 2008-03-26 10:45:54.000000000 +0000 +@@ -32,7 +32,7 @@ + else + AM_CFLAGS = + endif +-AM_CFLAGS += -Wall -Werror -Wshadow -Wunused -Wformat=2 -Wextra -std=gnu99 ++AM_CFLAGS += -Wunused -Wformat=2 -std=gnu99 + INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \ + -I$(srcdir)/../libdw -I.. -I$(srcdir)/../lib + VERSION = 1 +Index: elfutils-0.127/src/Makefile.am +=================================================================== +--- elfutils-0.127.orig/src/Makefile.am 2008-03-26 10:48:00.000000000 +0000 ++++ elfutils-0.127/src/Makefile.am 2008-03-26 10:48:21.000000000 +0000 +@@ -32,7 +32,6 @@ + AM_CFLAGS = + endif + AM_CFLAGS += -Wall -Wshadow -std=gnu99 $(native_ld_cflags) \ +- $(if $($(*F)_no_Werror),,-Werror) \ + $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ + $(if $($(*F)_no_Wformat),,-Wformat=2) $(CFLAGS_$(*F)) + diff --git a/packages/elfutils/elfutils-0.131/.mtn2git_empty b/packages/elfutils/elfutils-0.131/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/elfutils/elfutils-0.131/.mtn2git_empty diff --git a/packages/elfutils/elfutils-0.131/warnings.patch b/packages/elfutils/elfutils-0.131/warnings.patch new file mode 100644 index 0000000000..454706de4b --- /dev/null +++ b/packages/elfutils/elfutils-0.131/warnings.patch @@ -0,0 +1,149 @@ +Index: elfutils-0.127/configure.ac +=================================================================== +--- elfutils-0.127.orig/configure.ac 2007-04-19 07:55:07.000000000 +0100 ++++ elfutils-0.127/configure.ac 2008-03-26 10:45:54.000000000 +0000 +@@ -55,6 +55,10 @@ + dnl Add all the languages for which translations are available. + ALL_LINGUAS= + ++if test X"$CFLAGS" = X; then ++ CFLAGS="-Wall -Werror -g -O2" ++fi ++ + AC_PROG_CC + AC_PROG_RANLIB + AC_PROG_YACC +Index: elfutils-0.127/lib/Makefile.am +=================================================================== +--- elfutils-0.127.orig/lib/Makefile.am 2006-04-11 21:52:05.000000000 +0100 ++++ elfutils-0.127/lib/Makefile.am 2008-03-26 10:45:54.000000000 +0000 +@@ -30,7 +30,7 @@ + else + AM_CFLAGS = + endif +-AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused -Wextra $($(*F)_CFLAGS) ++AM_CFLAGS += -fpic -Wshadow -Wunused $($(*F)_CFLAGS) + INCLUDES = -I$(srcdir)/../libelf -I.. + + noinst_LIBRARIES = libeu.a +Index: elfutils-0.127/libasm/Makefile.am +=================================================================== +--- elfutils-0.127.orig/libasm/Makefile.am 2006-08-29 20:31:57.000000000 +0100 ++++ elfutils-0.127/libasm/Makefile.am 2008-03-26 10:45:54.000000000 +0000 +@@ -30,7 +30,7 @@ + else + AM_CFLAGS = + endif +-AM_CFLAGS += -std=gnu99 -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 ++AM_CFLAGS += -std=gnu99 -Wshadow -Wunused -Wformat=2 + INCLUDES = -I. -I$(srcdir) -I.. \ + -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl -I$(top_srcdir)/libdw\ + -I$(top_srcdir)/lib +Index: elfutils-0.127/libcpu/Makefile.am +=================================================================== +--- elfutils-0.127.orig/libcpu/Makefile.am 2006-04-11 21:52:05.000000000 +0100 ++++ elfutils-0.127/libcpu/Makefile.am 2008-03-26 10:45:54.000000000 +0000 +@@ -25,7 +25,7 @@ + ## <http://www.openinventionnetwork.com>. + ## + DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H +-AM_CFLAGS = -Wall -Wshadow -Werror -Wextra -Wformat=2 -Wunused ++AM_CFLAGS = -Wshadow -Wformat=2 -Wunused + INCLUDES = -I$(srcdir) + + noinst_LIBRARIES = libcpu_i386.a +Index: elfutils-0.127/libdw/Makefile.am +=================================================================== +--- elfutils-0.127.orig/libdw/Makefile.am 2007-04-05 11:26:50.000000000 +0100 ++++ elfutils-0.127/libdw/Makefile.am 2008-03-26 10:45:54.000000000 +0000 +@@ -33,7 +33,7 @@ + if BUILD_STATIC + AM_CFLAGS += -fpic + endif +-AM_CFLAGS += -Wall -Werror -Wshadow -Wunused -Wformat=2 -Wextra -std=gnu99 ++AM_CFLAGS += -Wshadow -Wunused -Wformat=2 -std=gnu99 + INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I.. -I$(srcdir)/../lib + VERSION = 1 + +Index: elfutils-0.127/libebl/Makefile.am +=================================================================== +--- elfutils-0.127.orig/libebl/Makefile.am 2007-04-05 10:12:36.000000000 +0100 ++++ elfutils-0.127/libebl/Makefile.am 2008-03-26 10:45:54.000000000 +0000 +@@ -30,7 +30,7 @@ + else + AM_CFLAGS = + endif +-AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 \ ++AM_CFLAGS += -fpic -Wshadow -Wunused -Wformat=2 \ + -std=gnu99 + + INCLUDES = -I$(srcdir) -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \ +Index: elfutils-0.127/libelf/Makefile.am +=================================================================== +--- elfutils-0.127.orig/libelf/Makefile.am 2007-04-05 10:12:36.000000000 +0100 ++++ elfutils-0.127/libelf/Makefile.am 2008-03-26 10:45:54.000000000 +0000 +@@ -33,7 +33,7 @@ + if BUILD_STATIC + AM_CFLAGS += -fpic + endif +-AM_CFLAGS += -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 -std=gnu99 \ ++AM_CFLAGS += -Wshadow -Wunused -Wformat=2 -std=gnu99 \ + $($(*F)_CFLAGS) + INCLUDES = -I$(srcdir) -I$(top_srcdir)/lib -I.. + GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include) +Index: elfutils-0.127/tests/Makefile.am +=================================================================== +--- elfutils-0.127.orig/tests/Makefile.am 2007-04-18 21:44:32.000000000 +0100 ++++ elfutils-0.127/tests/Makefile.am 2008-03-26 10:45:54.000000000 +0000 +@@ -26,11 +26,11 @@ + ## + DEFS = -DHAVE_CONFIG_H -D_GNU_SOURCE + if MUDFLAP +-AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 -fmudflap\ ++AM_CFLAGS = -std=gnu99 -fmudflap\ + $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) + BUILD_RPATH = \$$ORIGIN/../backends + else +-AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 \ ++AM_CFLAGS = -std=gnu99 \ + $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) + BUILT_RPATH = \$$ORIGIN/../libasm:\$$ORIGIN/../libdw:\$$ORIGIN/../backends:\$$ORIGIN/../libelf + endif +Index: elfutils-0.127/backends/Makefile.am +=================================================================== +--- elfutils-0.127.orig/backends/Makefile.am 2007-04-05 10:12:36.000000000 +0100 ++++ elfutils-0.127/backends/Makefile.am 2008-03-26 10:45:54.000000000 +0000 +@@ -30,7 +30,7 @@ + else + AM_CFLAGS = + endif +-AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 \ ++AM_CFLAGS += -fpic -Wshadow -Wunused -Wformat=2 \ + -std=gnu99 + INCLUDES = -I$(srcdir) -I$(top_srcdir)/libebl \ + -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \ +Index: elfutils-0.127/libdwfl/Makefile.am +=================================================================== +--- elfutils-0.127.orig/libdwfl/Makefile.am 2007-04-05 10:12:36.000000000 +0100 ++++ elfutils-0.127/libdwfl/Makefile.am 2008-03-26 10:45:54.000000000 +0000 +@@ -32,7 +32,7 @@ + else + AM_CFLAGS = + endif +-AM_CFLAGS += -Wall -Werror -Wshadow -Wunused -Wformat=2 -Wextra -std=gnu99 ++AM_CFLAGS += -Wunused -Wformat=2 -std=gnu99 + INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \ + -I$(srcdir)/../libdw -I.. -I$(srcdir)/../lib + VERSION = 1 +Index: elfutils-0.127/src/Makefile.am +=================================================================== +--- elfutils-0.127.orig/src/Makefile.am 2008-03-26 10:48:00.000000000 +0000 ++++ elfutils-0.127/src/Makefile.am 2008-03-26 10:48:21.000000000 +0000 +@@ -32,7 +32,6 @@ + AM_CFLAGS = + endif + AM_CFLAGS += -Wall -Wshadow -std=gnu99 $(native_ld_cflags) \ +- $(if $($(*F)_no_Werror),,-Werror) \ + $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ + $(if $($(*F)_no_Wformat),,-Wformat=2) $(CFLAGS_$(*F)) + diff --git a/packages/elfutils/elfutils_0.131.bb b/packages/elfutils/elfutils_0.131.bb new file mode 100644 index 0000000000..22f3b0ae46 --- /dev/null +++ b/packages/elfutils/elfutils_0.131.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "A collection of utilities and DSOs to handle compiled objects." +SECTION = "base" +LICENSE = "OSL" +DEPENDS = "libtool" + +SRC_URI = "http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles/elfutils-${PV}.tar.gz \ + file://warnings.patch;patch=1" + +inherit autotools + +do_stage () { + autotools_stage_all +} + + diff --git a/packages/esmtp/esmtp_0.5.1.bb b/packages/esmtp/esmtp_0.5.1.bb index 2ab587a505..47709c1dac 100644 --- a/packages/esmtp/esmtp_0.5.1.bb +++ b/packages/esmtp/esmtp_0.5.1.bb @@ -5,7 +5,11 @@ mechanisms) and StartTLS SMTP extensions." SECTION = "console/network" LICENSE = "GPL" DEPENDS = "libesmtp" +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/esmtp/esmtp-${PV}.tar.bz2" +# Have to set this or we get -L/lib in LDFLAGS +EXTRA_OECONF = "--with-libesmtp=${STAGING_EXECPREFIXDIR}" + inherit autotools diff --git a/packages/gcc/gcc-3.4.4.inc b/packages/gcc/gcc-3.4.4.inc index 2cd2ddd4a4..704d9bc5c8 100644 --- a/packages/gcc/gcc-3.4.4.inc +++ b/packages/gcc/gcc-3.4.4.inc @@ -13,6 +13,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://gcc-3.4.0-arm-bigendian-uclibc.patch;patch=1 \ file://GCC3.4.0VisibilityPatch.diff;patch=1 \ file://15342.patch;patch=1 \ + file://jarfix.patch;patch=1 \ file://always-fixincperm.patch;patch=1 \ file://GCOV_PREFIX_STRIP-cross-profile_3.4.patch;patch=1 \ file://zecke-xgcc-cpp.patch;patch=1 \ diff --git a/packages/gcc/gcc-3.4.4/jarfix.patch b/packages/gcc/gcc-3.4.4/jarfix.patch new file mode 100644 index 0000000000..082daf4a7e --- /dev/null +++ b/packages/gcc/gcc-3.4.4/jarfix.patch @@ -0,0 +1,30 @@ + libjava/Makefile.am | 2 +- + libjava/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +Index: gcc-3.4.4/libjava/Makefile.am +=================================================================== +--- gcc-3.4.4.orig/libjava/Makefile.am 2006-12-05 15:37:50.000000000 +0000 ++++ gcc-3.4.4/libjava/Makefile.am 2006-12-05 15:38:27.000000000 +0000 +@@ -77,7 +77,7 @@ if NULL_TARGET + ZIP = $(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar + GCJH = gcjh + else +-ZIP = jar ++ZIP = $(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar + GCJH = $(target_alias)-gcjh + endif + else # CANADIAN +Index: gcc-3.4.4/libjava/Makefile.in +=================================================================== +--- gcc-3.4.4.orig/libjava/Makefile.in 2006-12-05 15:39:08.000000000 +0000 ++++ gcc-3.4.4/libjava/Makefile.in 2006-12-05 15:39:21.000000000 +0000 +@@ -193,7 +193,7 @@ propdir = $(libdir) + + bin_SCRIPTS = addr2name.awk + @CANADIAN_TRUE@@NULL_TARGET_TRUE@ZIP = @CANADIAN_TRUE@@NULL_TARGET_TRUE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar +-@CANADIAN_TRUE@@NULL_TARGET_FALSE@ZIP = @CANADIAN_TRUE@@NULL_TARGET_FALSE@jar ++@CANADIAN_TRUE@@NULL_TARGET_FALSE@ZIP = @CANADIAN_TRUE@@NULL_TARGET_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar + @CANADIAN_FALSE@ZIP = @CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar + @CANADIAN_TRUE@@NULL_TARGET_TRUE@GCJH = @CANADIAN_TRUE@@NULL_TARGET_TRUE@gcjh + @CANADIAN_TRUE@@NULL_TARGET_FALSE@GCJH = @CANADIAN_TRUE@@NULL_TARGET_FALSE@$(target_alias)-gcjh diff --git a/packages/gcc/gcc-4.0.0.inc b/packages/gcc/gcc-4.0.0.inc index 7b231771f1..5745ba050d 100644 --- a/packages/gcc/gcc-4.0.0.inc +++ b/packages/gcc/gcc-4.0.0.inc @@ -7,3 +7,5 @@ SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " # Language Overrides FORTRAN = ",f95" + +EXTRA_OECONF_BASE = "--disable-libssp" diff --git a/packages/gcc/gcc-4.0.2.inc b/packages/gcc/gcc-4.0.2.inc index a0a6a6ae66..e3fafb8a7f 100644 --- a/packages/gcc/gcc-4.0.2.inc +++ b/packages/gcc/gcc-4.0.2.inc @@ -25,5 +25,5 @@ SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " # Language Overrides FORTRAN = "" -EXTRA_OECONF += "--disable-libssp" +EXTRA_OECONF_BASE = "--disable-libssp" diff --git a/packages/gcc/gcc-4.1.0.inc b/packages/gcc/gcc-4.1.0.inc index 4e6dcfd4e2..e12f93c800 100644 --- a/packages/gcc/gcc-4.1.0.inc +++ b/packages/gcc/gcc-4.1.0.inc @@ -11,7 +11,7 @@ SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.0/gcc-4.1.0.tar.bz2 \ SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += "--disable-libssp" +EXTRA_OECONF_BASE = "--disable-libssp --disable-libmudflap" # Language Overrides FORTRAN = "" diff --git a/packages/gcc/gcc-4.1.1.inc b/packages/gcc/gcc-4.1.1.inc index a892dc31e3..92ee2d7bb8 100644 --- a/packages/gcc/gcc-4.1.1.inc +++ b/packages/gcc/gcc-4.1.1.inc @@ -42,4 +42,4 @@ SRC_URI_append_linux = " file://ppc-gcc-41-20060515.patch;patch=1 \ FORTRAN = "" JAVA = "" -EXTRA_OECONF += " --disable-libssp " +EXTRA_OECONF_BASE = "--disable-libssp --disable-libmudflap" diff --git a/packages/gcc/gcc-4.1.2.inc b/packages/gcc/gcc-4.1.2.inc index 6e5671280a..614e2bb421 100644 --- a/packages/gcc/gcc-4.1.2.inc +++ b/packages/gcc/gcc-4.1.2.inc @@ -55,4 +55,6 @@ do_compile_prepend_avr32() { FORTRAN = "" JAVA = "" -EXTRA_OECONF += " --disable-libssp " +EXTRA_OECONF_BASE = "--disable-libssp --disable-libmudflap" + +ARM_INSTRUCTION_SET = "arm" diff --git a/packages/gcc/gcc-4.2.1.inc b/packages/gcc/gcc-4.2.1.inc index d48078384d..16e5b8f5bc 100644 --- a/packages/gcc/gcc-4.2.1.inc +++ b/packages/gcc/gcc-4.2.1.inc @@ -92,4 +92,6 @@ FORTRAN = "" FORTRAN_linux-gnueabi = ",fortran" JAVA = "" -EXTRA_OECONF += " --disable-libgomp --disable-libssp --disable-bootstrap " +EXTRA_OECONF_BASE = "--disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap" + +ARM_INSTRUCTION_SET = "arm" diff --git a/packages/gcc/gcc-4.2.2.inc b/packages/gcc/gcc-4.2.2.inc index e2b4c92669..02fe1162bc 100644 --- a/packages/gcc/gcc-4.2.2.inc +++ b/packages/gcc/gcc-4.2.2.inc @@ -69,5 +69,6 @@ FORTRAN = "" FORTRAN_linux-gnueabi = ",fortran" JAVA = "" -EXTRA_OECONF += " --disable-libssp --disable-bootstrap " +EXTRA_OECONF_BASE = "--disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap" +ARM_INSTRUCTION_SET = "arm"
\ No newline at end of file diff --git a/packages/gcc/gcc-4.3.0.inc b/packages/gcc/gcc-4.3.0.inc index 64d52cabbe..1d7184ca7a 100644 --- a/packages/gcc/gcc-4.3.0.inc +++ b/packages/gcc/gcc-4.3.0.inc @@ -49,5 +49,5 @@ SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 " FORTRAN = "" JAVA = "" -EXTRA_OECONF += " --disable-libssp --disable-bootstrap " +EXTRA_OECONF_BASE = " --disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap" diff --git a/packages/gcc/gcc-configure-common.inc b/packages/gcc/gcc-configure-common.inc index 9971c08c20..9085367b05 100644 --- a/packages/gcc/gcc-configure-common.inc +++ b/packages/gcc/gcc-configure-common.inc @@ -13,6 +13,9 @@ JAVA_sh3 ?= "" FORTRAN ?= ",f77" LANGUAGES ?= "c,c++${FORTRAN}${JAVA}" +EXTRA_OECONF_BASE ?= "" +EXTRA_OECONF_PATHS ?= "" + EXTRA_OECONF = "${@['--enable-clocale=generic', ''][bb.data.getVar('USE_NLS', d, 1) != 'no']} \ --with-gnu-ld \ --enable-shared \ @@ -25,6 +28,8 @@ EXTRA_OECONF = "${@['--enable-clocale=generic', ''][bb.data.getVar('USE_NLS', d, --enable-symvers=gnu \ --enable-libstdcxx-pch \ --program-prefix=${TARGET_PREFIX} \ + ${EXTRA_OECONF_BASE} \ + ${EXTRA_OECONF_FPU} \ ${EXTRA_OECONF_PATHS}" # Build uclibc compilers without cxa_atexit support @@ -32,7 +37,7 @@ EXTRA_OECONF_append_linux = " --enable-__cxa_atexit" EXTRA_OECONF_append_linux-gnueabi = " --enable-__cxa_atexit" EXTRA_OECONF_append_linux-uclibc = " --disable-__cxa_atexit" EXTRA_OECONF_append_linux-uclibcgnueabi = " --disable-__cxa_atexit" -EXTRA_OECONF += "${@get_gcc_fpu_setting(bb, d)}" +EXTRA_OECONF_FPU = "${@get_gcc_fpu_setting(bb, d)}" CPPFLAGS = "" # Used by configure to define additional values for FLAGS_FOR_TARGET - diff --git a/packages/gcc/gcc-cross-initial_csl-arm-2006q1.bb b/packages/gcc/gcc-cross-initial_csl-arm-2006q1.bb new file mode 100644 index 0000000000..2a5d4fc0cc --- /dev/null +++ b/packages/gcc/gcc-cross-initial_csl-arm-2006q1.bb @@ -0,0 +1,7 @@ +require gcc-cross_${PV}.bb +require gcc-cross-initial.inc + +S = "${WORKDIR}/gcc-2006q1" + +EXTRA_OECONF += "--disable-libmudflap \ + --disable-libssp" diff --git a/packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb b/packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb index 46a56fa339..e4068cbeb4 100644 --- a/packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb +++ b/packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb @@ -1,10 +1,13 @@ # This kernel compiler is required by the Freecom FSG-3 machine -# Please talk to Rod Whitby before considering removing this file. +# This kernel compiler is required by the Nokia tablets +# Please talk to Rod Whitby and Richard Purdie before considering removing this file. DEFAULT_PREFERENCE = "-1" -require gcc-cross-kernel.inc require gcc-cross-initial_csl-arm-2005q3.bb +require gcc-cross-kernel.inc + +PR = "r1" SRC_URI += "file://gcc-3.4.4-makefile-fix.patch;patch=1" diff --git a/packages/gcc/gcc-cross_4.1.0.bb b/packages/gcc/gcc-cross_4.1.0.bb index 576d487b34..82be62a91e 100644 --- a/packages/gcc/gcc-cross_4.1.0.bb +++ b/packages/gcc/gcc-cross_4.1.0.bb @@ -5,4 +5,4 @@ require gcc-cross4.inc require gcc-configure-cross.inc require gcc-package-cross.inc -EXTRA_OECONF += "--with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" diff --git a/packages/gcc/gcc-cross_4.2.1.bb b/packages/gcc/gcc-cross_4.2.1.bb index d886d147b0..8e20d03e68 100644 --- a/packages/gcc/gcc-cross_4.2.1.bb +++ b/packages/gcc/gcc-cross_4.2.1.bb @@ -6,10 +6,7 @@ require gcc-configure-cross.inc require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -# Do not build libssp libmudflap and libgomp -# We might need them for some beefy targets -EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ - --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" + +EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" diff --git a/packages/gcc/gcc-cross_4.2.2.bb b/packages/gcc/gcc-cross_4.2.2.bb index 8a7a21f188..11e04594fc 100644 --- a/packages/gcc/gcc-cross_4.2.2.bb +++ b/packages/gcc/gcc-cross_4.2.2.bb @@ -6,10 +6,7 @@ require gcc-configure-cross.inc require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -# Do not build libssp libmudflap and libgomp -# We might need them for some beefy targets -EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ - --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" + +EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" diff --git a/packages/gcc/gcc-cross_4.3.0.bb b/packages/gcc/gcc-cross_4.3.0.bb index 0c4c10bd7f..68c4d70551 100644 --- a/packages/gcc/gcc-cross_4.3.0.bb +++ b/packages/gcc/gcc-cross_4.3.0.bb @@ -6,10 +6,7 @@ require gcc-configure-cross.inc require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -# Do not build libssp libmudflap and libgomp -# We might need them for some beefy targets -EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ - --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" + +EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" diff --git a/packages/gcc/gcc-cross_csl-arm-2006q1.bb b/packages/gcc/gcc-cross_csl-arm-2006q1.bb new file mode 100644 index 0000000000..49ac900184 --- /dev/null +++ b/packages/gcc/gcc-cross_csl-arm-2006q1.bb @@ -0,0 +1,6 @@ +PR = "r1" + +require gcc-csl-arm-2006q1.inc +require gcc-cross.inc +require gcc-configure-cross.inc +require gcc-package-cross.inc diff --git a/packages/gcc/gcc-csl-arm-2006q1.inc b/packages/gcc/gcc-csl-arm-2006q1.inc new file mode 100644 index 0000000000..a208170b47 --- /dev/null +++ b/packages/gcc/gcc-csl-arm-2006q1.inc @@ -0,0 +1,19 @@ +require gcc-common.inc + +BINV = "4.1.0" +PV = "4.1.0+csl-arm-2006q1-6" + +FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm" + +SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2006q1-6-arm-none-eabi.src.tar.bz2 \ + file://gcc-configure-no-fortran.patch;patch=1;pnum=1 \ + file://gcc-new-makeinfo.patch;patch=1" + +S = "${WORKDIR}/gcc-2006q1" + +do_unpack2() { + cd ${WORKDIR} + tar -xvjf ./arm-2006q1-6-arm-none-eabi/gcc-2006q1-6.tar.bz2 +} + +addtask unpack2 after do_unpack before do_patch diff --git a/packages/gcc/gcc-csl-arm/gcc-new-makeinfo.patch b/packages/gcc/gcc-csl-arm/gcc-new-makeinfo.patch new file mode 100644 index 0000000000..b984605af7 --- /dev/null +++ b/packages/gcc/gcc-csl-arm/gcc-new-makeinfo.patch @@ -0,0 +1,35 @@ +--- + configure | 2 +- + configure.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +--- gcc-2006q1.orig/configure ++++ gcc-2006q1/configure +@@ -3453,11 +3453,11 @@ case " $build_configdirs " in + *) + + # For an installed makeinfo, we require it to be from texinfo 4.2 or + # higher, else we use the "missing" dummy. + if ${MAKEINFO} --version \ +- | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])' >/dev/null 2>&1; then ++ | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then + : + else + MAKEINFO="$MISSING makeinfo" + fi + ;; +--- gcc-2006q1.orig/configure.in ++++ gcc-2006q1/configure.in +@@ -2078,11 +2078,11 @@ case " $build_configdirs " in + *) + changequote(,) + # For an installed makeinfo, we require it to be from texinfo 4.2 or + # higher, else we use the "missing" dummy. + if ${MAKEINFO} --version \ +- | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])' >/dev/null 2>&1; then ++ | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then + : + else + MAKEINFO="$MISSING makeinfo" + fi + ;; diff --git a/packages/gcc/gcc-package-cross.inc b/packages/gcc/gcc-package-cross.inc index 559b9fe27d..54294f4fa6 100644 --- a/packages/gcc/gcc-package-cross.inc +++ b/packages/gcc/gcc-package-cross.inc @@ -2,29 +2,16 @@ INHIBIT_PACKAGE_STRIP ?= "" OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}" INHIBIT_PACKAGE_STRIP = "1" -PACKAGES = "libgcc libgcc-dev libstdc++ libg2c libg2c-dev libgfortran libgfortran-dev" +PACKAGES = "libgcc libstdc++ libg2c libgfortran" # Called from within gcc-cross, so libdir is set wrong FILES_libg2c = "${target_libdir}/libg2c.so.*" -FILES_libg2c-dev = "${target_libdir}/libg2c.so \ - ${target_libdir}/libg2c.a \ - ${target_libdir}/libfrtbegin.a" FILES_libgfortran = "${target_libdir}/libgfortran.so.*" -FILES_libgfortran-dev = "${target_libdir}/libgfortran.a \ - ${target_libdir}/libgfortran.so \ - ${target_libdir}/libgfortranbegin.a" FILES_libgcc = "${target_base_libdir}/libgcc_s.so.1" -FILES_libgcc-dev = "${target_base_libdir}/libgcc_s.so" FILES_libstdc++ = "${target_libdir}/libstdc++.so.*" -FILES_libstdc++-dev = "${target_includedir}/c++/${PV} \ - ${target_libdir}/libstdc++.so \ - ${target_libdir}/libstdc++.la \ - ${target_libdir}/libstdc++.a \ - ${target_libdir}/libsupc++.la \ - ${target_libdir}/libsupc++.a" do_install () { oe_runmake 'DESTDIR=${D}' install diff --git a/packages/gcc/gcc-package-target.inc b/packages/gcc/gcc-package-target.inc index 0e03f29958..2c19c5ecc7 100644 --- a/packages/gcc/gcc-package-target.inc +++ b/packages/gcc/gcc-package-target.inc @@ -1,13 +1,15 @@ PACKAGES = "\ - libgcc ${PN} ${PN}-symlinks \ + ${PN} ${PN}-symlinks \ g++ g++-symlinks \ cpp cpp-symlinks \ g77 g77-symlinks \ gfortran gfortran-symlinks \ gcov gcov-symlinks \ libmudflap libmudflap-dev \ - libstdc++ libg2c \ - libstdc++-dev libg2c-dev \ + libgcc-dev \ + libstdc++-dev \ + libg2c-dev \ + libgfortran-dev \ ${PN}-doc \ " @@ -81,6 +83,10 @@ FILES_libstdc++-dev = "\ ${libdir}/libsupc++.a \ " +FILES_libgfortran-dev = "${libdir}/libgfortran.a \ + ${libdir}/libgfortran.so \ + ${libdir}/libgfortranbegin.a" + FILES_libmudflap = "${libdir}/libmudflap*.so.*" FILES_libmudflap-dev = "\ ${libdir}/libmudflap*.so \ diff --git a/packages/gcc/gcc_csl-arm-2006q1.bb b/packages/gcc/gcc_csl-arm-2006q1.bb new file mode 100644 index 0000000000..832167ca4e --- /dev/null +++ b/packages/gcc/gcc_csl-arm-2006q1.bb @@ -0,0 +1,5 @@ +PR = "r1" + +require gcc-${PV}.inc +require gcc-configure-target.inc +require gcc-package-target.inc diff --git a/packages/lvm2/lvm2-2.01.15/.mtn2git_empty b/packages/lvm2/lvm2-2.01.15/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/lvm2/lvm2-2.01.15/.mtn2git_empty diff --git a/packages/lvm2/lvm2-2.01.15/crosscompile_fix.patch b/packages/lvm2/lvm2-2.01.15/crosscompile_fix.patch new file mode 100644 index 0000000000..7f54f80072 --- /dev/null +++ b/packages/lvm2/lvm2-2.01.15/crosscompile_fix.patch @@ -0,0 +1,13 @@ +Index: LVM2.2.01.15/make.tmpl.in +=================================================================== +--- LVM2.2.01.15.orig/make.tmpl.in 2008-03-26 11:24:50.000000000 +0000 ++++ LVM2.2.01.15/make.tmpl.in 2008-03-26 11:25:02.000000000 +0000 +@@ -72,7 +72,7 @@ + CFLAGS += -DINTL_PACKAGE=\"@INTL_PACKAGE@\" -DLOCALEDIR=\"@LOCALEDIR@\" + endif + +-LDFLAGS += -L$(top_srcdir)/lib -L$(libdir) ++LDFLAGS += -L$(top_srcdir)/lib + + #CFLAGS += -DDEBUG_POOL + #CFLAGS += -DBOUNDS_CHECK diff --git a/packages/lvm2/lvm2_2.01.15.bb b/packages/lvm2/lvm2_2.01.15.bb index ee726f7e6b..61a18ab87e 100644 --- a/packages/lvm2/lvm2_2.01.15.bb +++ b/packages/lvm2/lvm2_2.01.15.bb @@ -1,12 +1,13 @@ SECTION = "utils" DESCRIPTION = "LVM2 is a set of utilities to manage logical volumes in Linux." LICENSE = "GPL" -PR = "r0" +PR = "r1" DEPENDS = "device-mapper" S = "${WORKDIR}/LVM2.${PV}" -SRC_URI = "ftp://sources.redhat.com/pub/lvm2/LVM2.${PV}.tgz" +SRC_URI = "ftp://sources.redhat.com/pub/lvm2/LVM2.${PV}.tgz \ + file://crosscompile_fix.patch;patch=1" # Unset user/group to unbreak install. EXTRA_OECONF = "--with-user= --with-group= --disable-o_direct" diff --git a/packages/vte/vte.inc b/packages/vte/vte.inc index e9313cd861..587ea85a39 100644 --- a/packages/vte/vte.inc +++ b/packages/vte/vte.inc @@ -1,13 +1,13 @@ DESCRIPTION = "vte is a virtual terminal emulator" LICENSE = "LGPL" -DEPENDS += " glib-2.0 gtk+" +DEPENDS += " glib-2.0 gtk+ intltool-native" RDEPENDS = "termcap" inherit gnome SRC_URI += "file://vte-pkgconfig-fixes.patch;patch=1" -EXTRA_OECONF = "--disable-gtk-doc" +EXTRA_OECONF = "--disable-gtk-doc --disable-python" do_stage() { autotools_stage_all |