Initial commit
This commit is contained in:
Your Name
@@ -0,0 +1,28 @@
|
||||
From 0c82d6aa02c08e41b13c83b14782bd7024e25d59 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sat, 15 Feb 2014 21:06:42 +0000
|
||||
Subject: [PATCH] Disable LDFLAGSICUDT for Linux
|
||||
|
||||
Upstream-Status: Inappropriate [ OE Configuration ]
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
source/config/mh-linux | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/config/mh-linux b/config/mh-linux
|
||||
index 366f0cc..2689aab 100644
|
||||
--- a/config/mh-linux
|
||||
+++ b/config/mh-linux
|
||||
@@ -21,7 +21,7 @@ LD_RPATH= -Wl,-zorigin,-rpath,'$$'ORIGIN
|
||||
LD_RPATH_PRE = -Wl,-rpath,
|
||||
|
||||
## These are the library specific LDFLAGS
|
||||
-LDFLAGSICUDT=-nodefaultlibs -nostdlib
|
||||
+# LDFLAGSICUDT=-nodefaultlibs -nostdlib
|
||||
|
||||
## Compiler switch to embed a library name
|
||||
# The initial tab in the next line is to prevent icu-config from reading it.
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
From e3c25af4b40d64f098e7b8ae5a91fdc3c90163c4 Mon Sep 17 00:00:00 2001
|
||||
From: Lei Maohui <leimaohui@cn.fujitsu.com>
|
||||
Date: Wed, 8 May 2019 14:42:30 +0900
|
||||
Subject: [PATCH] icu: Added armeb support.
|
||||
|
||||
Make icu support arm32 BE.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
|
||||
|
||||
---
|
||||
i18n/double-conversion-utils.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/source/i18n/double-conversion-utils.h b/source/i18n/double-conversion-utils.h
|
||||
index 7f23e0a..7f89094 100644
|
||||
--- a/i18n/double-conversion-utils.h
|
||||
+++ b/i18n/double-conversion-utils.h
|
||||
@@ -115,7 +115,7 @@ int main(int argc, char** argv) {
|
||||
//
|
||||
// If it prints "correct" then the architecture should be here, in the "correct" section.
|
||||
#if defined(_M_X64) || defined(__x86_64__) || \
|
||||
- defined(__ARMEL__) || defined(__avr32__) || defined(_M_ARM) || defined(_M_ARM64) || \
|
||||
+ defined(__arm__) || defined(__avr32__) || defined(_M_ARM) || defined(_M_ARM64) || \
|
||||
defined(__hppa__) || defined(__ia64__) || \
|
||||
defined(__mips__) || \
|
||||
defined(__loongarch__) || \
|
||||
@@ -0,0 +1,2 @@
|
||||
{
|
||||
}
|
||||
@@ -0,0 +1,54 @@
|
||||
From a6ddabc8cadb76bfe2d2e374a6702442cfe51cce Mon Sep 17 00:00:00 2001
|
||||
From: Ross Burton <ross.burton@intel.com>
|
||||
Date: Fri, 9 Oct 2015 17:50:41 +0100
|
||||
Subject: [PATCH] icu: fix install race
|
||||
|
||||
The generic recursive target calls target-local so also adding it to the
|
||||
dependency list results in races due to install-local being executed twice in
|
||||
parallel. For example, install-manx can fail if the two install processes race
|
||||
and one process tries to chown a file that the other process has just deleted.
|
||||
|
||||
Also install-manx should be a phony target, and for clarity use $^ instead of $?
|
||||
in the install command.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||
|
||||
---
|
||||
source/Makefile.in | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index be9435b..ada20d7 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -77,7 +77,7 @@ EXTRA_DATA =
|
||||
|
||||
## List of phony targets
|
||||
.PHONY : all all-local all-recursive install install-local install-udata install-udata-files install-udata-dlls \
|
||||
-install-recursive clean clean-local clean-recursive distclean \
|
||||
+install-recursive install-manx clean clean-local clean-recursive distclean \
|
||||
distclean-local distclean-recursive doc dist dist-local dist-recursive \
|
||||
check check-local check-recursive clean-recursive-with-twist install-icu \
|
||||
doc install-doc tests icu4j-data icu4j-data-install update-windows-makefiles xcheck-local xcheck-recursive xperf xcheck xperf-recursive \
|
||||
@@ -88,9 +88,9 @@ check-exhaustive check-exhaustive-local check-exhaustive-recursive releaseDist
|
||||
|
||||
## List of standard targets
|
||||
all: all-local all-recursive
|
||||
-install: install-recursive install-local
|
||||
+install: install-recursive
|
||||
clean: clean-recursive-with-twist clean-local
|
||||
-distclean : distclean-recursive distclean-local
|
||||
+distclean : distclean-recursive
|
||||
dist: dist-recursive
|
||||
check: all check-recursive
|
||||
check-recursive: all
|
||||
@@ -357,7 +357,7 @@ config.status: $(srcdir)/configure $(srcdir)/common/unicode/uvernum.h
|
||||
install-manx: $(MANX_FILES)
|
||||
$(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
|
||||
ifneq ($(MANX_FILES),)
|
||||
- $(INSTALL_DATA) $? $(DESTDIR)$(mandir)/man$(SECTION)
|
||||
+ $(INSTALL_DATA) $^ $(DESTDIR)$(mandir)/man$(SECTION)
|
||||
endif
|
||||
|
||||
config/%.$(SECTION): $(srcdir)/config/%.$(SECTION).in
|
||||
@@ -0,0 +1,149 @@
|
||||
SUMMARY = "International Component for Unicode libraries"
|
||||
DESCRIPTION = "The International Component for Unicode (ICU) is a mature, \
|
||||
portable set of C/C++ and Java libraries for Unicode support, software \
|
||||
internationalization (I18N) and globalization (G11N), giving applications the \
|
||||
same results on all platforms."
|
||||
HOMEPAGE = "http://site.icu-project.org/"
|
||||
|
||||
LICENSE = "ICU"
|
||||
DEPENDS = "icu-native autoconf-archive-native"
|
||||
|
||||
CVE_PRODUCT = "international_components_for_unicode"
|
||||
|
||||
S = "${WORKDIR}/icu/source"
|
||||
SPDX_S = "${WORKDIR}/icu"
|
||||
STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}"
|
||||
|
||||
ICU_MAJOR_VER = "${@d.getVar('PV').split('-')[0]}"
|
||||
|
||||
inherit autotools pkgconfig github-releases
|
||||
|
||||
# ICU needs the native build directory as an argument to its --with-cross-build option when
|
||||
# cross-compiling. Taken the situation that different builds may share a common sstate-cache
|
||||
# into consideration, the native build directory needs to be staged.
|
||||
EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE} --disable-icu-config"
|
||||
EXTRA_OECONF:class-native = "--disable-icu-config"
|
||||
EXTRA_OECONF:class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE} --disable-icu-config"
|
||||
|
||||
EXTRA_OECONF:append:class-target = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}"
|
||||
TARGET_CXXFLAGS:append = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}"
|
||||
|
||||
ASNEEDED = ""
|
||||
|
||||
do_compile:prepend:class-target () {
|
||||
# Make sure certain build host references do not end up being compiled
|
||||
# in the image. This only affects libicutu and icu-dbg
|
||||
sed \
|
||||
-e 's,DU_BUILD=,DU_BUILD_unused=,g' \
|
||||
-e '/^CPPFLAGS.*/ s,--sysroot=${STAGING_DIR_TARGET},,g' \
|
||||
-i ${B}/tools/toolutil/Makefile
|
||||
}
|
||||
|
||||
PREPROCESS_RELOCATE_DIRS = "${datadir}/${BPN}/${PV}"
|
||||
do_install:append:class-native() {
|
||||
mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config
|
||||
cp -r ${B}/config/icucross.mk ${D}/${STAGING_ICU_DIR_NATIVE}/config
|
||||
cp -r ${B}/config/icucross.inc ${D}/${STAGING_ICU_DIR_NATIVE}/config
|
||||
cp -r ${B}/lib ${D}/${STAGING_ICU_DIR_NATIVE}
|
||||
cp -r ${B}/bin ${D}/${STAGING_ICU_DIR_NATIVE}
|
||||
cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE}
|
||||
}
|
||||
|
||||
do_install:append:class-target() {
|
||||
# The native pkgdata can not generate the correct data file.
|
||||
# Use icupkg to re-generate it.
|
||||
if [ "${SITEINFO_ENDIANNESS}" = "be" ] ; then
|
||||
rm -f ${D}/${datadir}/${BPN}/${@icu_install_folder(d)}/icudt${ICU_MAJOR_VER}b.dat
|
||||
icupkg -tb ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat ${D}/${datadir}/${BPN}/${@icu_install_folder(d)}/icudt${ICU_MAJOR_VER}b.dat
|
||||
fi
|
||||
|
||||
# Remove build host references...
|
||||
sed -i \
|
||||
-e 's,--sysroot=${STAGING_DIR_TARGET},,g' \
|
||||
-e 's|${DEBUG_PREFIX_MAP}||g' \
|
||||
-e 's:${HOSTTOOLS_DIR}/::g' \
|
||||
${D}/${libdir}/${BPN}/${@icu_install_folder(d)}/Makefile.inc \
|
||||
${D}/${libdir}/${BPN}/${@icu_install_folder(d)}/pkgdata.inc
|
||||
}
|
||||
|
||||
PACKAGES =+ "libicudata libicuuc libicui18n libicutu libicuio"
|
||||
|
||||
FILES:${PN}-dev += "${libdir}/${BPN}/"
|
||||
|
||||
FILES:libicudata = "${libdir}/libicudata.so.*"
|
||||
FILES:libicuuc = "${libdir}/libicuuc.so.*"
|
||||
FILES:libicui18n = "${libdir}/libicui18n.so.*"
|
||||
FILES:libicutu = "${libdir}/libicutu.so.*"
|
||||
FILES:libicuio = "${libdir}/libicuio.so.*"
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
|
||||
LIC_FILES_CHKSUM = "file://../LICENSE;md5=80c2cf39ad8ae12b9b9482a1737c6650"
|
||||
|
||||
def icu_download_version(d):
|
||||
pvsplit = d.getVar('PV').split('-')
|
||||
return pvsplit[0] + "_" + pvsplit[1]
|
||||
|
||||
def icu_download_folder(d):
|
||||
pvsplit = d.getVar('PV').split('-')
|
||||
return pvsplit[0] + "-" + pvsplit[1]
|
||||
|
||||
def icu_install_folder(d):
|
||||
pvsplit = d.getVar('PV').split('-')
|
||||
return pvsplit[0] + "." + pvsplit[1]
|
||||
|
||||
ICU_PV = "${@icu_download_version(d)}"
|
||||
ICU_FOLDER = "${@icu_download_folder(d)}"
|
||||
|
||||
# http://errors.yoctoproject.org/Errors/Details/20486/
|
||||
ARM_INSTRUCTION_SET:armv4 = "arm"
|
||||
ARM_INSTRUCTION_SET:armv5 = "arm"
|
||||
|
||||
BASE_SRC_URI = "${GITHUB_BASE_URI}/download/release-${ICU_FOLDER}/icu4c-${ICU_PV}-src.tgz"
|
||||
DATA_SRC_URI = "${GITHUB_BASE_URI}/download/release-${ICU_FOLDER}/icu4c-${ICU_PV}-data.zip"
|
||||
SRC_URI = "${BASE_SRC_URI};name=code \
|
||||
${DATA_SRC_URI};name=data \
|
||||
file://filter.json \
|
||||
file://fix-install-manx.patch \
|
||||
file://0001-icu-Added-armeb-support.patch \
|
||||
"
|
||||
|
||||
SRC_URI:append:class-target = "\
|
||||
file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \
|
||||
"
|
||||
SRC_URI[code.sha256sum] = "818a80712ed3caacd9b652305e01afc7fa167e6f2e94996da44b90c2ab604ce1"
|
||||
SRC_URI[data.sha256sum] = "ca1ee076163b438461e484421a7679fc33a64cd0a54f9d4b401893fa1eb42701"
|
||||
|
||||
UPSTREAM_CHECK_REGEX = "releases/tag/release-(?P<pver>(?!.+rc).+)"
|
||||
GITHUB_BASE_URI = "https://github.com/unicode-org/icu/releases"
|
||||
|
||||
EXTRA_OECONF:append:libc-musl = " ac_cv_func_strtod_l=no"
|
||||
|
||||
PACKAGECONFIG ?= ""
|
||||
PACKAGECONFIG[make-icudata] = ",,,"
|
||||
|
||||
do_make_icudata:class-target () {
|
||||
${@bb.utils.contains('PACKAGECONFIG', 'make-icudata', '', 'exit 0', d)}
|
||||
cd ${S}
|
||||
rm -rf data
|
||||
cp -a ${WORKDIR}/data .
|
||||
AR='${BUILD_AR}' \
|
||||
CC='${BUILD_CC}' \
|
||||
CPP='${BUILD_CPP}' \
|
||||
CXX='${BUILD_CXX}' \
|
||||
RANLIB='${BUILD_RANLIB}' \
|
||||
CFLAGS='${BUILD_CFLAGS}' \
|
||||
CPPFLAGS='${BUILD_CPPFLAGS}' \
|
||||
CXXFLAGS='${BUILD_CXXFLAGS}' \
|
||||
LDFLAGS='${BUILD_LDFLAGS}' \
|
||||
ICU_DATA_FILTER_FILE=${WORKDIR}/filter.json \
|
||||
./runConfigureICU Linux --with-data-packaging=archive
|
||||
oe_runmake
|
||||
install -Dm644 ${S}/data/out/icudt${ICU_MAJOR_VER}l.dat ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat
|
||||
}
|
||||
|
||||
do_make_icudata() {
|
||||
:
|
||||
}
|
||||
|
||||
addtask make_icudata before do_configure after do_patch do_prepare_recipe_sysroot
|
||||
Reference in New Issue
Block a user