Commit b5d4fb6b authored by Andrey V.Kosteltsev's avatar Andrey V.Kosteltsev

Unicode ICU 65.1; GNU grep 3.3

parent c3adb2e3
......@@ -15,7 +15,7 @@ SOURCE_REQUIRES = sources/packages/l/harfbuzz
REQUIRES = libs/harfbuzz/1.2.7
REQUIRES += libs/glib2/2.48.0-x86_32
REQUIRES += libs/libpng/libpng14/1.4.19-x86_32
REQUIRES += libs/icu4c/55.1-x86_32
REQUIRES += libs/icu4c/65.1-x86_32
REQUIRES += X11/libs/cairo/1.14.6-x86_32
REQUIRES += libs/libffi/3.2.1-x86_32
REQUIRES += libs/zlib/1.2.8-x86_32
......
......@@ -55,7 +55,7 @@ REQUIRES = dev/gcc/6.5.0
endif
REQUIRES += libs/glib2/2.48.0
REQUIRES += libs/libpng/libpng14/1.4.19
REQUIRES += libs/icu4c/55.1
REQUIRES += libs/icu4c/65.1
REQUIRES += X11/libs/cairo/1.14.6
REQUIRES += libs/libffi/3.2.1
REQUIRES += libs/zlib/1.2.8
......
......@@ -19,7 +19,7 @@ REQUIRES += libs/pulseaudio/9.0-x86_32
REQUIRES += X11/app/dbus-x11-launch/1.11.2-x86_32
REQUIRES += libs/libmng/2.0.3-x86_32
REQUIRES += libs/icu4c/55.1-x86_32
REQUIRES += libs/icu4c/65.1-x86_32
REQUIRES += app/cups/2.1.3-x86_32
REQUIRES += X11/libs/fontconfig/2.12.4-x86_32
......
......@@ -63,7 +63,7 @@ REQUIRES += libs/pulseaudio/9.0
REQUIRES += X11/app/dbus-x11-launch/1.11.2
REQUIRES += libs/libmng/2.0.3
REQUIRES += libs/icu4c/55.1
REQUIRES += libs/icu4c/65.1
REQUIRES += app/cups/2.1.3
REQUIRES += X11/libs/fontconfig/2.12.4
......
......@@ -19,7 +19,7 @@ REQUIRES += libs/pulseaudio/9.0-x86_32
REQUIRES += X11/app/dbus-x11-launch/1.11.2-x86_32
REQUIRES += libs/libmng/2.0.3-x86_32
REQUIRES += libs/icu4c/55.1-x86_32
REQUIRES += libs/icu4c/65.1-x86_32
REQUIRES += libs/libvpx/1.5.0-x86_32
REQUIRES += libs/assimp/3.2-x86_32
REQUIRES += app/cups/2.1.3-x86_32
......
......@@ -67,7 +67,7 @@ REQUIRES += libs/pulseaudio/9.0
REQUIRES += X11/app/dbus-x11-launch/1.11.2
REQUIRES += libs/libmng/2.0.3
REQUIRES += libs/icu4c/55.1
REQUIRES += libs/icu4c/65.1
REQUIRES += libs/libvpx/1.5.0
REQUIRES += libs/assimp/3.2
REQUIRES += app/cups/2.1.3
......
......@@ -50,16 +50,12 @@ include ../../../build-system/constants.mk
SOURCE_REQUIRES = sources/GNU/grep
ifeq ($(__USE_BUILT_GCC_LIBS__),yes)
REQUIRES = dev/gcc/6.5.0
else
REQUIRES = libs/glibc/2.28
endif
REQUIRES = libs/pcre/8.43
# ======= __END_OF_REQUIRES__ =======
version = 2.18
version = 3.3
tar_xz_archive = $(SRC_PACKAGE_PATH)/GNU/grep/grep-$(version).tar.xz
SRC_ARCHIVE = $(tar_xz_archive)
SRC_DIR = $(TARGET_BUILD_DIR)/grep-$(version)
......@@ -81,13 +77,13 @@ PKG_GROUP = app
# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
#
GREP_PKG_NAME = grep
GREP_PKG_VERSION = 2.18
GREP_PKG_VERSION = 3.3
GREP_PKG_ARCH = $(TOOLCHAIN)
GREP_PKG_DISTRO_NAME = $(DISTRO_NAME)
GREP_PKG_DISTRO_VERSION = $(DISTRO_VERSION)
GREP_PKG_GROUP = $(PKG_GROUP)
### |---handy-ruler-------------------------------|
GREP_PKG_SHORT_DESCRIPTION = print lines matching a pattern
GREP_PKG_SHORT_DESCRIPTION = print lines that match patterns
GREP_PKG_URL = $(BUG_URL)
GREP_PKG_LICENSE = GPLv2
GREP_PKG_DESCRIPTION_FILE = $(TARGET_BUILD_DIR)/$(GREP_PKG_NAME)-pkg-description
......
......@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
grep: grep @VERSION@ (print lines matching a pattern)
grep: grep @VERSION@ (print lines that match patterns)
grep:
grep: This is GNU grep, the "fastest grep in the west" (we hope). Grep
grep: searches through textual input for lines which contain a match to
......
......@@ -33,7 +33,7 @@ post_install() {
cat << EOF >> usr/share/info/dir
Text creation and manipulation
* grep: (grep). Print lines matching a pattern.
* grep: (grep). Print lines that match patterns.
EOF
fi
}
......
......@@ -13,7 +13,7 @@ include ../../../build-system/constants.mk
SOURCE_REQUIRES = sources/packages/l/boost
REQUIRES = libs/boost/1.61.0
REQUIRES += libs/icu4c/55.1-x86_32
REQUIRES += libs/icu4c/65.1-x86_32
REQUIRES += app/bzip2/1.0.6-x86_32
REQUIRES += libs/zlib/1.2.8-x86_32
REQUIRES += libs/openmpi/1.8.8-x86_32
......
......@@ -50,7 +50,7 @@ include ../../../build-system/constants.mk
SOURCE_REQUIRES = sources/packages/l/boost
REQUIRES = libs/icu4c/55.1
REQUIRES = libs/icu4c/65.1
REQUIRES += app/bzip2/1.0.6
REQUIRES += libs/zlib/1.2.8
REQUIRES += libs/openmpi/1.8.8
......
......@@ -14,7 +14,7 @@ SOURCE_REQUIRES = sources/packages/l/harfbuzz
REQUIRES = libs/harfbuzz/1.2.7
REQUIRES += libs/libpng/libpng14/1.4.19-x86_32
REQUIRES += libs/icu4c/55.1-x86_32
REQUIRES += libs/icu4c/65.1-x86_32
REQUIRES += libs/cairo/1.14.6-x86_32
REQUIRES += env/freetype/2.6.3-x86_32
......
......@@ -51,7 +51,7 @@ include ../../../build-system/constants.mk
SOURCE_REQUIRES = sources/packages/l/harfbuzz
REQUIRES = libs/libpng/libpng14/1.4.19
REQUIRES += libs/icu4c/55.1
REQUIRES += libs/icu4c/65.1
REQUIRES += libs/cairo/1.14.6
REQUIRES += env/freetype/2.6.3
......
../../../sources/packages/l/icu4c/patches/icu4c-54.1.patch -p0
../../../sources/packages/l/icu4c/patches/icu4c-54.1.patch -p0
../../../sources/packages/l/icu4c/patches/icu4c-55.1.patch -p0
../../../sources/packages/l/icu4c/patches/icu4c-55.1.patch -p0
# HOW TO EDIT THIS FILE:
# The "handy ruler" below makes it easier to edit a package description. Line
# up the first '|' above the ':' following the base package name, and the '|'
# on the right side marks the last column you can put a character in. You must
# make exactly 11 lines for the formatting to be correct. It's also
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
icu4c: icu4c @VERSION@ (International Components for Unicode)
icu4c:
icu4c: The International Components for Unicode (ICU) libraries provide
icu4c: robust and full-featured Unicode services on a wide variety of
icu4c: platforms.
icu4c:
icu4c: Homepage: http://www.icu-project.org
icu4c:
icu4c:
icu4c:
icu4c:
../../../sources/packages/l/icu4c/patches/icu4c-65.1.patch -p0
COMPONENT_TARGETS = $(HARDWARE_PC64)
COMPONENT_TARGETS = $(HARDWARE_MBC4_PC)
NEED_ABS_PATH = true
COMPONENT_IS_3PP = true
CREATE_X86_32_PACKAGE = true
CREATE_SPARC32_PACKAGE = true
include ../../../build-system/constants.mk
......@@ -12,14 +12,15 @@ include ../../../build-system/constants.mk
SOURCE_REQUIRES = sources/packages/l/icu4c
REQUIRES = libs/icu4c/55.1
REQUIRES = libs/icu4c/65.1
REQUIRES += libs/glibc/2.28-sparc32
# ======= __END_OF_REQUIRES__ =======
version = 55.1
tar_bz2_archive = $(SRC_PACKAGE_PATH)/packages/l/icu4c/icu4c-$(version).tar.bz2
SRC_ARCHIVE = $(tar_bz2_archive)
version = 65.1
tar_xz_archive = $(SRC_PACKAGE_PATH)/packages/l/icu4c/icu4c-$(version).tar.xz
SRC_ARCHIVE = $(tar_xz_archive)
SRC_DIR = $(TARGET_BUILD_DIR)/icu4c-$(version)
src_dir_name = icu4c-$(version)
src_done = $(TARGET_BUILD_DIR)/.source_done
......@@ -41,7 +42,7 @@ PKG_GROUP = libs
# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
#
ICU4C_32_PKG_NAME = icu4c-x32
ICU4C_32_PKG_VERSION = 55.1
ICU4C_32_PKG_VERSION = 65.1
ICU4C_32_PKG_ARCH = $(TOOLCHAIN)
ICU4C_32_PKG_DISTRO_NAME = $(DISTRO_NAME)
ICU4C_32_PKG_DISTRO_VERSION = $(DISTRO_VERSION)
......@@ -78,13 +79,17 @@ include ../../../build-system/core.mk
env_sysroot = DESTDIR=$(ICU4C_32_PKG)
extra_configure_switches = --libdir=/usr/lib$(MULTILIB_X86_32_SUFFIX)
extra_configure_switches = --libdir=/usr/lib$(MULTILIB_SPARC32_SUFFIX)
extra_configure_switches += --mandir=/usr/share/man
extra_configure_switches += --sysconfdir=/etc
extra_configure_switches += --localstatedir=/var
extra_configure_switches += --disable-samples
extra_configure_switches += --enable-shared=yes
ifeq ($(__ENABLE_STATIC__),yes)
extra_configure_switches += --enable-static=yes
else
extra_configure_switches += --enable-static=no
endif
extra_configure_switches += --enable-shared=yes
extra_configure_switches += --with-cross-build=$(CURDIR)/$(build_host_dir)
......@@ -102,10 +107,10 @@ $(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
$(build_target): $(src_done)
@mkdir -p $(build_host_dir)
@mkdir -p $(build_target_dir)
@cd $(build_host_dir) && $(CURDIR)/$(SRC_DIR)/source/runConfigureICU Linux
@cd $(build_host_dir) && $(CURDIR)/$(SRC_DIR)/source/runConfigureICU Linux/gcc
@cd $(build_host_dir) && $(MAKE)
@cd $(build_target_dir) && \
$(BUILD_ENVIRONMENT) $(CURDIR)/$(SRC_DIR)/source/configure \
$(BUILD_ENVIRONMENT) LIBS='-latomic' $(CURDIR)/$(SRC_DIR)/source/configure \
--prefix=/usr \
--build=$(BUILD) \
--host=$(TARGET32) \
......@@ -126,22 +131,28 @@ $(install_target): $(build_target)
)
@rm -rf $(ICU4C_32_PKG)/usr/include
@rm -rf $(ICU4C_32_PKG)/usr/share
ifeq ($(__ENABLE_STATIC__),yes)
# ======= change permissions of *.a files =======
@( cd $(ICU4C_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
@( cd $(ICU4C_32_PKG)/usr/lib$(MULTILIB_SPARC32_SUFFIX) ; \
chmod 0644 *.a ; \
)
endif
# ======= Install the same to $(TARGET_DEST_DIR) =======
$(call install-into-devenv, $(ICU4C_32_PKG))
# ======= tune pkg-config *.pc search path to the target destination for development =======
@( cd $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_X86_32_SUFFIX)/pkgconfig ; \
sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" icu-i18n.pc icu-io.pc icu-le.pc icu-lx.pc icu-uc.pc \
@( cd $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_SPARC32_SUFFIX)/pkgconfig ; \
sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" icu-i18n.pc icu-io.pc icu-uc.pc \
)
# ======= Strip binaries =======
@( cd $(ICU4C_32_PKG) ; \
find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
find . | xargs file | grep "current ar archive" | cut -f 1 -d : | xargs $(STRIP) -g 2> /dev/null \
)
ifeq ($(__ENABLE_STATIC__),yes)
@( cd $(ICU4C_32_PKG) ; \
find . | xargs file | grep "current ar archive" | cut -f 1 -d : | xargs $(STRIP) -g 2> /dev/null ; \
)
endif
@touch $@
$(ICU4C_32_PKG_DESCRIPTION_FILE): $(ICU4C_32_PKG_DESCRIPTION_FILE_IN)
......
../../../sources/packages/l/icu4c/patches/icu4c-65.1.patch -p0
......@@ -12,14 +12,15 @@ include ../../../build-system/constants.mk
SOURCE_REQUIRES = sources/packages/l/icu4c
REQUIRES = libs/icu4c/54.1
REQUIRES = libs/icu4c/65.1
REQUIRES += libs/glibc/2.28-x86_32
# ======= __END_OF_REQUIRES__ =======
version = 54.1
tar_bz2_archive = $(SRC_PACKAGE_PATH)/packages/l/icu4c/icu4c-$(version).tar.bz2
SRC_ARCHIVE = $(tar_bz2_archive)
version = 65.1
tar_xz_archive = $(SRC_PACKAGE_PATH)/packages/l/icu4c/icu4c-$(version).tar.xz
SRC_ARCHIVE = $(tar_xz_archive)
SRC_DIR = $(TARGET_BUILD_DIR)/icu4c-$(version)
src_dir_name = icu4c-$(version)
src_done = $(TARGET_BUILD_DIR)/.source_done
......@@ -41,7 +42,7 @@ PKG_GROUP = libs
# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
#
ICU4C_32_PKG_NAME = icu4c-x32
ICU4C_32_PKG_VERSION = 54.1
ICU4C_32_PKG_VERSION = 65.1
ICU4C_32_PKG_ARCH = $(TOOLCHAIN)
ICU4C_32_PKG_DISTRO_NAME = $(DISTRO_NAME)
ICU4C_32_PKG_DISTRO_VERSION = $(DISTRO_VERSION)
......@@ -83,8 +84,12 @@ extra_configure_switches += --mandir=/usr/share/man
extra_configure_switches += --sysconfdir=/etc
extra_configure_switches += --localstatedir=/var
extra_configure_switches += --disable-samples
extra_configure_switches += --enable-shared=yes
ifeq ($(__ENABLE_STATIC__),yes)
extra_configure_switches += --enable-static=yes
else
extra_configure_switches += --enable-static=no
endif
extra_configure_switches += --enable-shared=yes
extra_configure_switches += --with-cross-build=$(CURDIR)/$(build_host_dir)
......@@ -102,7 +107,7 @@ $(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
$(build_target): $(src_done)
@mkdir -p $(build_host_dir)
@mkdir -p $(build_target_dir)
@cd $(build_host_dir) && $(CURDIR)/$(SRC_DIR)/source/runConfigureICU Linux
@cd $(build_host_dir) && $(CURDIR)/$(SRC_DIR)/source/runConfigureICU Linux/gcc
@cd $(build_host_dir) && $(MAKE)
@cd $(build_target_dir) && \
$(BUILD_ENVIRONMENT) $(CURDIR)/$(SRC_DIR)/source/configure \
......@@ -126,22 +131,28 @@ $(install_target): $(build_target)
)
@rm -rf $(ICU4C_32_PKG)/usr/include
@rm -rf $(ICU4C_32_PKG)/usr/share
ifeq ($(__ENABLE_STATIC__),yes)
# ======= change permissions of *.a files =======
@( cd $(ICU4C_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
chmod 0644 *.a ; \
)
endif
# ======= Install the same to $(TARGET_DEST_DIR) =======
$(call install-into-devenv, $(ICU4C_32_PKG))
# ======= tune pkg-config *.pc search path to the target destination for development =======
@( cd $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_X86_32_SUFFIX)/pkgconfig ; \
sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" icu-i18n.pc icu-io.pc icu-le.pc icu-lx.pc icu-uc.pc \
sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" icu-i18n.pc icu-io.pc icu-uc.pc \
)
# ======= Strip binaries =======
@( cd $(ICU4C_32_PKG) ; \
find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
find . | xargs file | grep "current ar archive" | cut -f 1 -d : | xargs $(STRIP) -g 2> /dev/null \
)
ifeq ($(__ENABLE_STATIC__),yes)
@( cd $(ICU4C_32_PKG) ; \
find . | xargs file | grep "current ar archive" | cut -f 1 -d : | xargs $(STRIP) -g 2> /dev/null ; \
)
endif
@touch $@
$(ICU4C_32_PKG_DESCRIPTION_FILE): $(ICU4C_32_PKG_DESCRIPTION_FILE_IN)
......
../../../sources/packages/l/icu4c/patches/icu4c-65.1.patch -p0
# HOW TO EDIT THIS FILE:
# The "handy ruler" below makes it easier to edit a package description. Line
# up the first '|' above the ':' following the base package name, and the '|'
# on the right side marks the last column you can put a character in. You must
# make exactly 11 lines for the formatting to be correct. It's also
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
icu4c-x32: icu4c-x32 @VERSION@ (International Components for Unicode)
icu4c-x32:
icu4c-x32: The International Components for Unicode (ICU) libraries provide
icu4c-x32: robust and full-featured Unicode services on a wide variety of
icu4c-x32: platforms.
icu4c-x32:
icu4c-x32: Homepage: http://www.icu-project.org
icu4c-x32:
icu4c-x32:
icu4c-x32:
icu4c-x32:
......@@ -53,19 +53,15 @@ SOURCE_REQUIRES = sources/packages/l/icu4c
ifeq ($(__USE_BUILT_GCC_LIBS__),yes)
REQUIRES = dev/gcc/6.5.0
else
ifneq ($(HARDWARE),$(HARDWARE_PC64))
REQUIRES = libs/glibc/2.28
else
REQUIRES = libs/glibc/2.28-x86_32
endif
endif
# ======= __END_OF_REQUIRES__ =======
version = 55.1
tar_bz2_archive = $(SRC_PACKAGE_PATH)/packages/l/icu4c/icu4c-$(version).tar.bz2
SRC_ARCHIVE = $(tar_bz2_archive)
version = 65.1
tar_xz_archive = $(SRC_PACKAGE_PATH)/packages/l/icu4c/icu4c-$(version).tar.xz
SRC_ARCHIVE = $(tar_xz_archive)
SRC_DIR = $(TARGET_BUILD_DIR)/icu4c-$(version)
src_dir_name = icu4c-$(version)
src_done = $(TARGET_BUILD_DIR)/.source_done
......@@ -87,7 +83,7 @@ PKG_GROUP = libs
# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
#
ICU4C_PKG_NAME = icu4c
ICU4C_PKG_VERSION = 55.1
ICU4C_PKG_VERSION = 65.1
ICU4C_PKG_ARCH = $(TOOLCHAIN)
ICU4C_PKG_DISTRO_NAME = $(DISTRO_NAME)
ICU4C_PKG_DISTRO_VERSION = $(DISTRO_VERSION)
......@@ -129,8 +125,12 @@ extra_configure_switches += --mandir=/usr/share/man
extra_configure_switches += --sysconfdir=/etc
extra_configure_switches += --localstatedir=/var
extra_configure_switches += --disable-samples
extra_configure_switches += --enable-shared=yes
ifeq ($(__ENABLE_STATIC__),yes)
extra_configure_switches += --enable-static=yes
else
extra_configure_switches += --enable-static=no
endif
extra_configure_switches += --enable-shared=yes
extra_configure_switches += --with-cross-build=$(CURDIR)/$(build_host_dir)
......@@ -148,7 +148,7 @@ $(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
$(build_target): $(src_done)
@mkdir -p $(build_host_dir)
@mkdir -p $(build_target_dir)
@cd $(build_host_dir) && $(CURDIR)/$(SRC_DIR)/source/runConfigureICU Linux
@cd $(build_host_dir) && $(CURDIR)/$(SRC_DIR)/source/runConfigureICU Linux/gcc
@cd $(build_host_dir) && $(MAKE)
@cd $(build_target_dir) && \
$(BUILD_ENVIRONMENT) $(CURDIR)/$(SRC_DIR)/source/configure \
......@@ -177,29 +177,35 @@ $(install_target): $(build_target)
) \
fi
@mkdir -p $(ICU4C_PKG)/usr/doc/$(src_dir_name)
@cp -a $(SRC_DIR)/license.html $(SRC_DIR)/icu4c.css \
@cp -a $(SRC_DIR)/LICENSE $(SRC_DIR)/license.html $(SRC_DIR)/icu4c.css \
$(ICU4C_PKG)/usr/doc/$(src_dir_name)
@mkdir -p $(ICU4C_PKG)/usr/share/doc/$(src_dir_name)
@( cd $(SRC_DIR) ; \
cp -a *.html *.css \
cp -a LICENSE *.html *.css *.md \
$(ICU4C_PKG)/usr/share/doc/$(src_dir_name) ; \
)
ifeq ($(__ENABLE_STATIC__),yes)
# ======= change permissions of *.a files =======
@( cd $(ICU4C_PKG)/usr/lib$(LIBSUFFIX) ; \
chmod 0644 *.a ; \
)
endif
# ======= Install the same to $(TARGET_DEST_DIR) =======
$(call install-into-devenv, $(ICU4C_PKG))
# ======= tune pkg-config *.pc search path to the target destination for development =======
@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/pkgconfig ; \
sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" icu-i18n.pc icu-io.pc icu-le.pc icu-lx.pc icu-uc.pc \
sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" icu-i18n.pc icu-io.pc icu-uc.pc \
)
# ======= Strip binaries =======
@( cd $(ICU4C_PKG) ; \
find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
find . | xargs file | grep "current ar archive" | cut -f 1 -d : | xargs $(STRIP) -g 2> /dev/null \
)
ifeq ($(__ENABLE_STATIC__),yes)
@( cd $(ICU4C_PKG) ; \
find . | xargs file | grep "current ar archive" | cut -f 1 -d : | xargs $(STRIP) -g 2> /dev/null ; \
)
endif
@touch $@
$(ICU4C_PKG_DESCRIPTION_FILE): $(ICU4C_PKG_DESCRIPTION_FILE_IN)
......
../../../sources/packages/l/icu4c/patches/icu4c-65.1.patch -p0
......@@ -13,7 +13,7 @@ include ../../../build-system/constants.mk
SOURCE_REQUIRES = sources/packages/l/libical
REQUIRES = libs/libical/2.0.0
REQUIRES += libs/icu4c/55.1-x86_32
REQUIRES += libs/icu4c/65.1-x86_32
# ======= __END_OF_REQUIRES__ =======
......
......@@ -50,7 +50,7 @@ include ../../../build-system/constants.mk
SOURCE_REQUIRES = sources/packages/l/libical
REQUIRES = libs/icu4c/55.1
REQUIRES = libs/icu4c/65.1
# ======= __END_OF_REQUIRES__ =======
......
......@@ -608,7 +608,7 @@ REQUIRES += share/dict/words-ru/0.99f7-1
#######
REQUIRES += app/coreutils/8.31
REQUIRES += app/sharutils/4.15.2
REQUIRES += app/grep/2.18
REQUIRES += app/grep/3.3
REQUIRES += app/texinfo/5.2
REQUIRES += dev/gperf/3.0.4
REQUIRES += app/sysvinit/2.88
......@@ -808,10 +808,19 @@ REQUIRES += libs/libtiff/4.0.6
ifeq ($(HARDWARE),$(HARDWARE_PC64))
REQUIRES += libs/libtiff/4.0.6-x86_32
endif
REQUIRES += libs/icu4c/55.1
REQUIRES += libs/icu4c/65.1
ifneq ($(filter $(HARDWARE),$(HARDWARE_S824L) $(HARDWARE_VESNIN) \
$(HARDWARE_TL2WK2) $(HARDWARE_TL2SV2)),)
REQUIRES += libs/icu4c/65.1-ppc32
endif
ifneq ($(filter $(HARDWARE),$(HARDWARE_MBC4_PC)),)
REQUIRES += libs/icu4c/65.1-sparc32
endif
ifeq ($(HARDWARE),$(HARDWARE_PC64))
REQUIRES += libs/icu4c/55.1-x86_32
REQUIRES += libs/icu4c/65.1-x86_32
endif
REQUIRES += libs/libpipeline/1.4.1
ifeq ($(HARDWARE),$(HARDWARE_PC64))
REQUIRES += libs/libpipeline/1.4.1-x86_32
......
......@@ -51,7 +51,7 @@ include ../../../build-system/constants.mk
SOURCE_REQUIRES = sources/packages/a/linuxdoc-tools/sgml-common
REQUIRES = app/bash/4.3
REQUIRES += app/grep/2.18
REQUIRES += app/grep/3.3
REQUIRES += app/sed/4.7
# ======= __END_OF_REQUIRES__ =======
......
......@@ -7,7 +7,7 @@ include ../../../build-system/constants.mk
url = $(DOWNLOAD_SERVER)/sources/GNU/grep
versions = 2.17 2.18
versions = 3.3
pkgname = grep
suffix = tar.xz
......
......@@ -7,15 +7,14 @@ include ../../../../build-system/constants.mk
url = $(DOWNLOAD_SERVER)/sources/packages/l/icu4c
versions = 54.1 55.1
versions = 65.1
pkgname = icu4c
suffix = tar.bz2
suffix = tar.xz
tarballs = $(addsuffix .$(suffix), $(addprefix $(pkgname)-, $(versions)))
sha1s = $(addsuffix .sha1sum, $(tarballs))
patches = $(CURDIR)/patches/icu4c-54.1.patch
patches += $(CURDIR)/patches/icu4c-55.1.patch
patches = $(CURDIR)/patches/icu4c-65.1.patch
.NOTPARALLEL: $(patches)
......@@ -50,8 +49,7 @@ $(sha1s): $(tarballs)
$(patches): $(sha1s)
@echo -e "\n======= Create Patches =======\n" ; \
( cd create-54.1-patch ; ./create.patch.sh ) ; \
( cd create-55.1-patch ; ./create.patch.sh ) ; \
( cd create-65.1-patch ; ./create.patch.sh ) ; \
echo -e "\n"
download_clean:
......
#!/bin/sh
VERSION=55.1
tar --files-from=file.list -xjvf ../icu4c-$VERSION.tar.bz2
mv icu4c-$VERSION icu4c-$VERSION-orig
cp -rf ./icu4c-$VERSION-new ./icu4c-$VERSION
diff -b --unified -Nr icu4c-$VERSION-orig icu4c-$VERSION > icu4c-$VERSION.patch
mv icu4c-$VERSION.patch ../patches
rm -rf ./icu4c-$VERSION
rm -rf ./icu4c-$VERSION-orig
#!/bin/sh
VERSION=54.1
VERSION=65.1
tar --files-from=file.list -xjvf ../icu4c-$VERSION.tar.bz2
tar --files-from=file.list -xJvf ../icu4c-$VERSION.tar.xz
mv icu4c-$VERSION icu4c-$VERSION-orig
cp -rf ./icu4c-$VERSION-new ./icu4c-$VERSION
......
# Copyright (C) 2016 and later: Unicode, Inc. and others.
# License & terms of use: http://www.unicode.org/copyright.html
#******************************************************************************
#
# Copyright (C) 1998-2014, International Business Machines
# Copyright (C) 1998-2016, International Business Machines
# Corporation and others. All Rights Reserved.
#
#******************************************************************************
......@@ -29,23 +31,25 @@ subdir = .
#AUTOCONF = @AUTOCONF@
## Optional directory setup
@LAYOUT_TRUE@LAYOUT = layout
@LAYOUTEX_TRUE@LAYOUTEX = layoutex
@ICUIO_TRUE@ICUIO = io
@EXTRAS_TRUE@EXTRA = extra
@TESTS_TRUE@TEST = test
# need tools for tests
@TOOLS_TRUE@@TESTS_TRUE@TEST = test
@SAMPLES_TRUE@SAMPLE = samples
@TOOLS_TRUE@TOOLS = tools
@TOOLS_TRUE@DATASUBDIR = data
## pkgconfig setup. Always have uc and i18n. Others are optional.
ALL_PKGCONFIG_SUFFIX=uc i18n
@LAYOUT_TRUE@ALL_PKGCONFIG_SUFFIX+= le
@LAYOUTEX_TRUE@ALL_PKGCONFIG_SUFFIX+= lx
@ICUIO_TRUE@ALL_PKGCONFIG_SUFFIX+= io
DOXYGEN = @DOXYGEN@
DOCZIP = icu-docs.zip
INSTALL_ICU_CONFIG = @INSTALL_ICU_CONFIG@
## Files to remove for 'make clean'
CLEANFILES = *~
......@@ -58,11 +62,13 @@ INSTALLED_BUILT_FILES = $(top_builddir)/config/Makefile.inc $(top_builddir)/conf
LOCAL_BUILT_FILES = icudefs.mk config/icucross.mk config/icucross.inc
DOCDIRS = common i18n
SUBDIRS = stubdata common i18n $(LAYOUT) $(LAYOUTEX) $(ICUIO) $(TOOLS) data $(EXTRA) $(SAMPLE) $(TEST)
SUBDIRS = stubdata common i18n $(LAYOUTEX) $(ICUIO) $(TOOLS) $(DATASUBDIR) $(EXTRA) $(SAMPLE) $(TEST)
SECTION = 1
ifeq ($(INSTALL_ICU_CONFIG),true)
MANX_FILES = config/icu-config.$(SECTION)
endif
ALL_MAN_FILES = $(MANX_FILES)
......@@ -85,7 +91,7 @@ all: all-local all-recursive
install: install-recursive install-local
clean: clean-recursive-with-twist clean-local
distclean : distclean-recursive distclean-local
dist: dist-recursive dist-local
dist: dist-recursive
check: all check-recursive
check-recursive: all
xcheck: all xcheck-recursive
......@@ -113,13 +119,13 @@ doc doc-searchengine:
else
doc: doc/html/index.html
doc-searchengine: Doxyfile $(wildcard ./common/unicode/platform.h $(srcdir)/common/unicode/*.h $(srcdir)/i18n/unicode/*.h $(srcdir)/layout/unicode/*.h $(srcdir)/io/unicode/*.h)
doc-searchengine: Doxyfile $(wildcard ./common/unicode/platform.h $(srcdir)/common/unicode/*.h $(srcdir)/i18n/unicode/*.h $(srcdir)/io/unicode/*.h)
sed < Doxyfile -e 's%[^#]*SEARCHENGINE.*%SEARCHENGINE=YES%' | $(DOXYGEN) -
@echo adding links from non-namespaced class files
find doc/html -name 'classicu_1_1*' -print | sed -e 's%^\(.*class\)icu_1_1\(.*\)$$%ln & \1\2%' | sh
@echo Docs created - WARNING, probably contains non-GPL .js files
doc/html/index.html: Doxyfile $(wildcard ./common/unicode/platform.h $(srcdir)/common/unicode/*.h $(srcdir)/i18n/unicode/*.h $(srcdir)/layout/unicode/*.h $(srcdir)/io/unicode/*.h)
doc/html/index.html: Doxyfile $(wildcard ./common/unicode/platform.h $(srcdir)/common/unicode/*.h $(srcdir)/i18n/unicode/*.h $(srcdir)/io/unicode/*.h)
$(DOXYGEN)
@echo adding links from non-namespaced class files