mirror of
https://git.yoctoproject.org/poky
synced 2026-05-01 06:32:11 +02:00
libiconv: remove recipe
It was in use by oe-core only when uclibc was used, and so serves no purpose anymore. Both glibc and musl provide their own implementation. However, meta-mingw still depends on it, and so the recipe has been moved there. (From OE-Core rev: fd5f849353e045d60965079a1571160fdd980b0c) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
5ab44ed7a5
commit
5c1243c5c0
File diff suppressed because it is too large
Load Diff
@@ -1,50 +0,0 @@
|
||||
It adds the variables that are needed
|
||||
for autoconf 2.65 to reconfigure libiconv and delete the m4 macros
|
||||
directory. Its imported from OE.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
|
||||
Index: libiconv-1.13.1/configure.ac
|
||||
===================================================================
|
||||
--- libiconv-1.13.1.orig/configure.ac
|
||||
+++ libiconv-1.13.1/configure.ac
|
||||
@@ -23,7 +23,7 @@ AC_CONFIG_AUX_DIR([build-aux])
|
||||
AM_INIT_AUTOMAKE([libiconv], [1.13.1])
|
||||
AC_CONFIG_HEADERS([config.h lib/config.h])
|
||||
AC_PROG_MAKE_SET
|
||||
-
|
||||
+AC_CONFIG_MACRO_DIR([m4])
|
||||
dnl checks for basic programs
|
||||
|
||||
AC_PROG_CC
|
||||
Index: libiconv-1.13.1/libcharset/configure.ac
|
||||
===================================================================
|
||||
--- libiconv-1.13.1.orig/libcharset/configure.ac
|
||||
+++ libiconv-1.13.1/libcharset/configure.ac
|
||||
@@ -16,17 +16,17 @@ dnl along with the GNU CHARSET Library;
|
||||
dnl write to the Free Software Foundation, Inc., 51 Franklin Street,
|
||||
dnl Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
||||
-AC_PREREQ([2.13])
|
||||
+AC_PREREQ(2.61)
|
||||
+AC_INIT([libcharset],[1.4] )
|
||||
+AC_CONFIG_SRCDIR([lib/localcharset.c])
|
||||
|
||||
-PACKAGE=libcharset
|
||||
-VERSION=1.4
|
||||
-
|
||||
-AC_INIT([lib/localcharset.c])
|
||||
AC_CONFIG_AUX_DIR([build-aux])
|
||||
AC_CONFIG_HEADER([config.h])
|
||||
AC_PROG_MAKE_SET
|
||||
-AC_SUBST([PACKAGE])
|
||||
-AC_SUBST([VERSION])
|
||||
+dnl AC_SUBST(PACKAGE)
|
||||
+dnl AC_SUBST(VERSION)
|
||||
+
|
||||
+AC_CONFIG_MACRO_DIR([m4])
|
||||
|
||||
dnl checks for basic programs
|
||||
|
||||
@@ -1,52 +0,0 @@
|
||||
SUMMARY = "Character encoding support library"
|
||||
DESCRIPTION = "GNU libiconv - libiconv is for you if your application needs to support \
|
||||
multiple character encodings, but that support lacks from your system."
|
||||
HOMEPAGE = "http://www.gnu.org/software/libiconv"
|
||||
SECTION = "libs"
|
||||
NOTES = "Needs to be stripped down to: ascii iso8859-1 eucjp iso-2022jp gb utf8"
|
||||
PROVIDES = "virtual/libiconv"
|
||||
PR = "r1"
|
||||
LICENSE = "LGPLv3"
|
||||
LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 \
|
||||
file://libcharset/COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674"
|
||||
|
||||
SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \
|
||||
file://autoconf.patch \
|
||||
file://add-relocatable-module.patch \
|
||||
file://0001-Fix-link-error-when-compiling-with-gcc-O0.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "e34509b1623cec449dfeb73d7ce9c6c6"
|
||||
SRC_URI[sha256sum] = "72b24ded17d687193c3366d0ebe7cde1e6b18f0df8c55438ac95be39e8a30613"
|
||||
|
||||
S = "${WORKDIR}/libiconv-${PV}"
|
||||
|
||||
inherit autotools pkgconfig gettext
|
||||
|
||||
python __anonymous() {
|
||||
if d.getVar("TARGET_OS") != "linux":
|
||||
return
|
||||
if d.getVar("TCLIBC") == "glibc":
|
||||
raise bb.parse.SkipPackage("libiconv is provided for use with uClibc only - glibc already provides iconv")
|
||||
}
|
||||
|
||||
EXTRA_OECONF += "--enable-shared --enable-static --enable-relocatable"
|
||||
|
||||
LEAD_SONAME = "libiconv.so"
|
||||
|
||||
do_configure_prepend () {
|
||||
rm -f ${S}/m4/libtool.m4 ${S}/m4/ltoptions.m4 ${S}/m4/ltsugar.m4 ${S}/m4/ltversion.m4 ${S}/m4/lt~obsolete.m4 ${S}/libcharset/m4/libtool.m4 ${S}/libcharset/m4/ltoptions.m4 ${S}/libcharset/m4/ltsugar.m4 ${S}/libcharset/m4/ltversion.m4 ${S}/libcharset/m4/lt~obsolete.m4
|
||||
}
|
||||
|
||||
do_configure_append () {
|
||||
# forcibly remove RPATH from libtool
|
||||
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' *libtool
|
||||
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=_NO_RPATH_|g' *libtool
|
||||
}
|
||||
|
||||
do_install_append () {
|
||||
rm -rf ${D}${libdir}/preloadable_libiconv.so
|
||||
rm -rf ${D}${libdir}/charset.alias
|
||||
}
|
||||
|
||||
BBCLASSEXTEND = "nativesdk"
|
||||
Reference in New Issue
Block a user