From 26300da96f14c4821d7c87bde5117f3eb4947487 Mon Sep 17 00:00:00 2001 From: Aloisio Almeida Jr Date: Fri, 24 Jul 2009 17:00:49 -0300 Subject: [PATCH 053/118] texinfo: Fix compilation bug. Passing BUILD_(C|LD)FLAGS to native part compilation texinfo has a native part compilation. It creates a new environment with some BUILD_* variables to configure/compile it. As BUILD_CFLAGS and BUILD_LDFLAGS were not being passed to this new environment the local machine headers/libs (/usr/lib and /usr/include) were being used instead of the stage-native ones. texinfo build was working before in machines with libncurses-dev installed :( Signed-off-by: Aloisio Almeida Jr --- recipes/texinfo/texinfo/configure.patch | 13 +++++++++++++ recipes/texinfo/texinfo_4.8a.bb | 7 +++++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 recipes/texinfo/texinfo/configure.patch diff --git a/recipes/texinfo/texinfo/configure.patch b/recipes/texinfo/texinfo/configure.patch new file mode 100644 index 0000000..cb8c7c6 --- /dev/null +++ b/recipes/texinfo/texinfo/configure.patch @@ -0,0 +1,13 @@ +Index: texinfo-4.8/configure.ac +=================================================================== +--- texinfo-4.8.orig/configure.ac 2009-07-24 16:56:36.979721511 -0300 ++++ texinfo-4.8/configure.ac 2009-07-24 16:57:40.840433019 -0300 +@@ -105,7 +105,7 @@ + # it gets the wrong CC etc. env -i gives this build host configure + # a clean environment. + env -i CC="${BUILD_CC}" AR="${BUILD_AR}" RANLIB="${BUILD_RANLIB}" \ +- PATH="${PATH}" \ ++ PATH="${PATH}" CFLAGS="${BUILD_CFLAGS}" LDFLAGS="${BUILD_LDFLAGS}"\ + tools_only=1 \ + ${confdir}/configure --build=${build} --host=${build} \ + --disable-rpath --disable-nls diff --git a/recipes/texinfo/texinfo_4.8a.bb b/recipes/texinfo/texinfo_4.8a.bb index 7386226..5bc45d2 100644 --- a/recipes/texinfo/texinfo_4.8a.bb +++ b/recipes/texinfo/texinfo_4.8a.bb @@ -2,9 +2,12 @@ DESCRIPTION = "Documentation system for on-line information and printed output" HOMEPAGE = "http://www.gnu.org/software/texinfo/" SECTION = "console/utils" LICENSE = "GPL" -DEPENDS = "ncurses" +DEPENDS = "ncurses ncurses-native" -SRC_URI = "${GNU_MIRROR}/texinfo/texinfo-${PV}.tar.bz2" +PR = "r1" + +SRC_URI = "${GNU_MIRROR}/texinfo/texinfo-${PV}.tar.bz2 \ + file://configure.patch;patch=1" inherit autotools gettext -- 1.6.3.3