From b5f1252f7bbf59b8cbf9a25db424bc04d9d9614a Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Sun, 10 May 2009 06:57:05 -0400 Subject: [PATCH] texinfo: Updated (4.7 -> 4.13a) --- base/texinfo/dont_clean_the_env.patch.cross | 27 +++++++++++++++++++++ base/texinfo/texinfo.conf | 18 +++++++------- base/texinfo/texinfo.desc | 6 ++--- 3 files changed, 39 insertions(+), 12 deletions(-) create mode 100644 base/texinfo/dont_clean_the_env.patch.cross diff --git a/base/texinfo/dont_clean_the_env.patch.cross b/base/texinfo/dont_clean_the_env.patch.cross new file mode 100644 index 000000000..0ed0d3ac1 --- /dev/null +++ b/base/texinfo/dont_clean_the_env.patch.cross @@ -0,0 +1,27 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../texinfo/dont_clean_the_env.patch.cross +# Copyright (C) 2009 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +--- ./configure.orig 2009-05-09 10:15:31.000000000 -0400 ++++ ./configure 2009-05-09 10:16:13.000000000 -0400 +@@ -17454,7 +17454,7 @@ + # it gets the wrong CC etc. + # env -i gives this build host configure a clean environment; + # consequently, we have to re-initialize $PATH. +- env -i CC="$BUILD_CC" AR="$BUILD_AR" RANLIB="$BUILD_RANLIB" \ ++ CC="$BUILD_CC" AR="$BUILD_AR" RANLIB="$BUILD_RANLIB" \ + PATH="$PATH" \ + tools_only=1 \ + ${confdir}/configure --build=${build} --host=${build} \ diff --git a/base/texinfo/texinfo.conf b/base/texinfo/texinfo.conf index 52b32f432..cf38288c7 100644 --- a/base/texinfo/texinfo.conf +++ b/base/texinfo/texinfo.conf @@ -2,8 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../texinfo/texinfo.conf -# Copyright (C) 2004 - 2006 The T2 SDE Project -# Copyright (C) 1998 - 2003 Clifford Wolf +# Copyright (C) 2009 The OpenSDE Project # # More information can be found in the files COPYING and README. # @@ -13,11 +12,12 @@ # GNU General Public License can be found in the file COPYING. # --- SDE-COPYRIGHT-NOTE-END --- -no_doc_info_subdirs() { - sed -i '/^SUBDIRS/ { s/\bdoc\b//; s/\binfo\b//; }' Makefile -} - -if ! atstage native; then - hook_add premake 5 no_doc_info_subdirs +if atstage cross; then + # get some native tooling + # TODO: research about using HOSTCC instead + texinfo_cross_hacks() { + make -C tools/gnulib/lib + make -C tools + } + hook_add premake 5 'texinfo_cross_hacks' fi - diff --git a/base/texinfo/texinfo.desc b/base/texinfo/texinfo.desc index 03bfdaf44..95ce878da 100644 --- a/base/texinfo/texinfo.desc +++ b/base/texinfo/texinfo.desc @@ -3,7 +3,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../texinfo/texinfo.desc -[COPY] Copyright (C) 2006 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2009 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 1998 - 2003 Clifford Wolf [COPY] @@ -29,8 +29,8 @@ [L] GPL [S] Stable -[V] 4.7 +[V] 4.13a [P] X -1-3-----9 108.700 -[D] 500067592 texinfo-4.7.tar.gz ftp://ftp.gnu.org/pub/gnu/texinfo/ +[D] 3366131615 texinfo-4.13a.tar.gz ftp://ftp.gnu.org/pub/gnu/texinfo/