mirror of
https://git.yoctoproject.org/poky
synced 2026-05-09 05:29:32 +00:00
gettext: Drop old version
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
@@ -1,50 +0,0 @@
|
||||
Index: gettext-0.14.1/gettext-tools/configure.ac
|
||||
===================================================================
|
||||
--- gettext-0.14.1.orig/gettext-tools/configure.ac 2008-02-11 16:57:19.000000000 +0000
|
||||
+++ gettext-0.14.1/gettext-tools/configure.ac 2008-02-11 16:57:28.000000000 +0000
|
||||
@@ -37,28 +37,16 @@
|
||||
AC_PROG_YACC
|
||||
|
||||
gt_GCJ
|
||||
-if test -n "$HAVE_GCJ"; then
|
||||
- BUILDJAVAEXE=yes
|
||||
-else
|
||||
BUILDJAVAEXE=no
|
||||
-fi
|
||||
AC_SUBST(BUILDJAVAEXE)
|
||||
|
||||
gt_JAVACOMP
|
||||
AC_CHECK_PROG(JAR, jar, jar)
|
||||
-if test -n "$HAVE_JAVACOMP" && test -n "$JAR"; then
|
||||
- BUILDJAVA=yes
|
||||
-else
|
||||
BUILDJAVA=no
|
||||
-fi
|
||||
AC_SUBST(BUILDJAVA)
|
||||
|
||||
gt_JAVAEXEC
|
||||
-if test -n "$HAVE_JAVAEXEC" && test $BUILDJAVA = yes; then
|
||||
- TESTJAVA=yes
|
||||
-else
|
||||
TESTJAVA=no
|
||||
-fi
|
||||
AC_SUBST(TESTJAVA)
|
||||
|
||||
gt_CSHARPCOMP
|
||||
Index: gettext-0.14.1/gettext-runtime/configure.ac
|
||||
===================================================================
|
||||
--- gettext-0.14.1.orig/gettext-runtime/configure.ac 2008-02-11 16:57:34.000000000 +0000
|
||||
+++ gettext-0.14.1/gettext-runtime/configure.ac 2008-02-11 16:58:04.000000000 +0000
|
||||
@@ -37,11 +37,7 @@
|
||||
|
||||
gt_JAVACOMP
|
||||
AC_CHECK_PROG(JAR, jar, jar)
|
||||
-if test -n "$HAVE_JAVACOMP" && test -n "$JAR"; then
|
||||
- BUILDJAVA=yes
|
||||
-else
|
||||
- BUILDJAVA=no
|
||||
-fi
|
||||
+BUILDJAVA=no
|
||||
AC_SUBST(BUILDJAVA)
|
||||
|
||||
gt_CSHARPCOMP
|
||||
@@ -1,26 +0,0 @@
|
||||
Index: gettext-tools/m4/csharpcomp.m4
|
||||
===================================================================
|
||||
RCS file: /cvs/gettext/gettext/gettext-tools/m4/csharpcomp.m4,v
|
||||
retrieving revision 1.4
|
||||
retrieving revision 1.6
|
||||
diff -u -r1.4 -r1.6
|
||||
--- a/gettext-tools/m4/csharpcomp.m4 30 Jan 2004 11:01:18 -0000 1.4
|
||||
+++ a/gettext-tools/m4/csharpcomp.m4 26 May 2004 12:15:23 -0000 1.6
|
||||
@@ -1,4 +1,4 @@
|
||||
-# csharpcomp.m4 serial 2 (gettext-0.14.1)
|
||||
+# csharpcomp.m4 serial 4 (gettext-0.15)
|
||||
dnl Copyright (C) 2003-2004 Free Software Foundation, Inc.
|
||||
dnl This file is free software, distributed under the terms of the GNU
|
||||
dnl General Public License. As a special exception to the GNU General
|
||||
@@ -43,7 +43,8 @@
|
||||
;;
|
||||
sscli)
|
||||
if test -n "$HAVE_CSC_IN_PATH" \
|
||||
- && csc -help >/dev/null 2>/dev/null; then
|
||||
+ && csc -help >/dev/null 2>/dev/null \
|
||||
+ && { if csc -help 2>/dev/null | grep -i chicken > /dev/null; then false; else true; fi; }; then
|
||||
HAVE_CSC=1
|
||||
ac_result="csc"
|
||||
break
|
||||
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
--- /gettext-tools/m4/orig-getline.m4 2003-07-18 18:11:37.000000000 +0300
|
||||
+++ /gettext-tools/m4/getline.m4 2007-02-03 13:33:41.000000000 +0200
|
||||
@@ -42,12 +42,23 @@
|
||||
return 1;
|
||||
len = getline (&line, &siz, in);
|
||||
exit ((len == 4 && line && strcmp (line, "foo\n") == 0) ? 0 : 1);
|
||||
- }
|
||||
- ], am_cv_func_working_getline=yes dnl The library version works.
|
||||
- , am_cv_func_working_getline=no dnl The library version does NOT work.
|
||||
- , am_cv_func_working_getline=no dnl We're cross compiling.
|
||||
- )])
|
||||
- fi
|
||||
+ }
|
||||
+ ], am_cv_func_working_getline=yes dnl The library version works.
|
||||
+ , am_cv_func_working_getline=no dnl The library version does NOT work.
|
||||
+! , dnl We're cross compiling. Assume ir works on glibc2 systems.
|
||||
+! [AC_EGREP_CPP([Lucky GNU user],
|
||||
+! [
|
||||
+! #include <features.h>
|
||||
+! #ifdef __GNU_LIBRARY__
|
||||
+! #if (__GLIBC__ >= 2)
|
||||
+! Lucky GNU user
|
||||
+! #endif
|
||||
+! #endif
|
||||
+! ],
|
||||
+! [am_cv_func_working_getline=yes],
|
||||
+! [am_cv_func_working_getline=no])]
|
||||
+ )])
|
||||
+ fi
|
||||
|
||||
if test $am_cv_func_working_getline = no; then
|
||||
dnl We must choose a different name for our function, since on ELF systems
|
||||
@@ -1,12 +0,0 @@
|
||||
diff -ur gettext-0.14.6/gettext-tools/lib/error.h gettext-0.14.6-patched/gettext-tools/lib/error.h
|
||||
--- gettext-0.14.6/gettext-tools/lib/error.h 2005-05-20 16:03:42.000000000 -0500
|
||||
+++ gettext-0.14.6-patched/gettext-tools/lib/error.h 2007-01-13 20:57:24.422168053 -0600
|
||||
@@ -50,7 +50,7 @@
|
||||
/* If NULL, error will flush stdout, then print on stderr the program
|
||||
name, a colon and a space. Otherwise, error will call this
|
||||
function without parameters instead. */
|
||||
-extern DLL_VARIABLE void (*error_print_progname) (void);
|
||||
+void (*error_print_progname) (void);
|
||||
|
||||
/* This variable is incremented each time `error' is called. */
|
||||
extern DLL_VARIABLE unsigned int error_message_count;
|
||||
@@ -1,11 +0,0 @@
|
||||
--- gettext-0.14.1/gettext-runtime/intl/Makefile.in~ 2004-04-09 13:23:40.000000000 +0100
|
||||
+++ gettext-0.14.1/gettext-runtime/intl/Makefile.in 2004-04-09 13:22:05.000000000 +0100
|
||||
@@ -24,7 +24,7 @@
|
||||
srcdir = $(top_srcdir)/../gettext-runtime/intl
|
||||
top_srcdir = /var/tmp/oe-tmp.pb/base/gettext-0.14.1-r0/gettext-0.14.1/gettext-tools
|
||||
top_builddir = ..
|
||||
-VPATH = $(srcdir)
|
||||
+#VPATH = $(srcdir)
|
||||
|
||||
prefix = /usr
|
||||
exec_prefix = /usr
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,58 +0,0 @@
|
||||
require gettext_${PV}.bb
|
||||
inherit native
|
||||
PROVIDES = ""
|
||||
|
||||
M4 = "\
|
||||
lib-ld.m4 \
|
||||
lib-link.m4 \
|
||||
lib-prefix.m4 \
|
||||
codeset.m4 \
|
||||
gettext.m4 \
|
||||
glibc21.m4 \
|
||||
iconv.m4 \
|
||||
intdiv0.m4 \
|
||||
intmax.m4 \
|
||||
inttypes.m4 \
|
||||
inttypes_h.m4 \
|
||||
inttypes-pri.m4 \
|
||||
isc-posix.m4 \
|
||||
lcmessage.m4 \
|
||||
longdouble.m4 \
|
||||
longlong.m4 \
|
||||
nls.m4 \
|
||||
po.m4 \
|
||||
printf-posix.m4 \
|
||||
progtest.m4 \
|
||||
signed.m4 \
|
||||
size_max.m4 \
|
||||
stdint_h.m4 \
|
||||
uintmax_t.m4 \
|
||||
ulonglong.m4 \
|
||||
wchar_t.m4 \
|
||||
wint_t.m4 \
|
||||
xsize.m4 \
|
||||
"
|
||||
|
||||
do_stage_append() {
|
||||
for i in ${M4}; do
|
||||
src="gettext-runtime/m4/$i"
|
||||
if [ ! -f $src ]; then
|
||||
src="gettext-tools/m4/$i"
|
||||
fi
|
||||
if [ ! -f $src ]; then
|
||||
src="autoconf-lib-link/m4/$i"
|
||||
fi
|
||||
if [ ! -f $src ]; then
|
||||
echo "can't find $i" >&2
|
||||
exit 1
|
||||
fi
|
||||
install -m 0644 $src ${STAGING_DATADIR}/aclocal/$i
|
||||
done
|
||||
|
||||
# config.rpath is needed by some configure macros and needs to be autoinstalled.
|
||||
# automake will do this but config.rpath needs to be visible to automake
|
||||
for i in `ls -d ${STAGING_DATADIR}/automake*`
|
||||
do
|
||||
cp ${STAGING_DATADIR}/gettext/config.rpath $i
|
||||
done
|
||||
}
|
||||
@@ -1,43 +0,0 @@
|
||||
DESCRIPTION = "The GNU internationalization library."
|
||||
HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html"
|
||||
SECTION = "libs"
|
||||
LICENSE = "GPL"
|
||||
PR = "r11"
|
||||
PROVIDES = "virtual/libintl"
|
||||
|
||||
SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
|
||||
file://gettext-vpath.patch;patch=1;pnum=1 \
|
||||
file://fixchicken.patch;patch=1;pnum=1 \
|
||||
file://linklib_from_0.17.patch;patch=1 \
|
||||
file://getline.m4.patch;patch=1 \
|
||||
file://disable_java.patch;patch=1"
|
||||
|
||||
SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch;patch=1"
|
||||
SRC_URI_append_linux-uclibcgnueabi = " file://gettext-error_print_progname.patch;patch=1"
|
||||
|
||||
PARALLEL_MAKE = ""
|
||||
|
||||
inherit autotools
|
||||
|
||||
EXTRA_OECONF += "--without-lisp"
|
||||
acpaths = '-I ${S}/autoconf-lib-link/m4/ \
|
||||
-I ${S}/gettext-runtime/m4 \
|
||||
-I ${S}/gettext-tools/m4'
|
||||
|
||||
FILES_${PN} += "${libdir}/libgettextlib-${PV}.so ${libdir}/libgettextsrc-${PV}.so"
|
||||
|
||||
do_configure_prepend() {
|
||||
rm -f ${S}/config/m4/libtool.m4
|
||||
install -m 0644 ${STAGING_DATADIR}/aclocal/libtool.m4 ${S}/config/m4/
|
||||
}
|
||||
|
||||
do_stage () {
|
||||
autotools_stage_all
|
||||
|
||||
# config.rpath is needed by some configure macros and needs to be autoinstalled.
|
||||
# automake will do this but config.rpath needs to be visible to automake
|
||||
for i in `ls -d ${STAGING_DATADIR}/automake*`
|
||||
do
|
||||
cp ${STAGING_DATADIR}/gettext/config.rpath $i
|
||||
done
|
||||
}
|
||||
Reference in New Issue
Block a user