Index: Makefile
===================================================================
--- Makefile (.../0.9.10) (revision 438)
+++ Makefile (.../1.3) (revision 439)
@@ -69,7 +69,7 @@
# ======= __END_OF_REQUIRES__ =======
-version = 0.9.10
+version = 1.3
tar_xz_archive = $(SRC_PACKAGE_PATH)/GNU/libunistring/libunistring-$(version).tar.xz
SRC_ARCHIVE = $(tar_xz_archive)
SRC_DIR = $(TARGET_BUILD_DIR)/libunistring-$(version)
@@ -91,7 +91,7 @@
# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
#
LIBUNISTR_PKG_NAME = libunistring
-LIBUNISTR_PKG_VERSION = 0.9.10
+LIBUNISTR_PKG_VERSION = 1.3
LIBUNISTR_PKG_ARCH = $(PKGARCH)
LIBUNISTR_PKG_DISTRO_NAME = $(DISTRO_NAME)
LIBUNISTR_PKG_DISTRO_VERSION = $(DISTRO_VERSION)
@@ -135,6 +135,7 @@
extra_configure_switches += --disable-dependency-tracking
extra_configure_switches += --sysconfdir=/etc
extra_configure_switches += --disable-rpath
+
ifeq ($(__ENABLE_STATIC__),yes)
extra_configure_switches += --enable-static=yes
else
@@ -201,14 +202,14 @@
)
# ======= remove toolchain path from target libtool *.la files =======
@( cd $(LIBUNISTR_PKG)/usr/lib$(LIBSUFFIX) ; \
- sed -i "s,$(TARGET_DEST_DIR),,g" libunistring.la \
+ sed -i "s,$(TARGET_DEST_DIR),,g" libunistring.la ; \
)
# ======= Install the same to $(TARGET_DEST_DIR) =======
$(call install-into-devenv, $(LIBUNISTR_PKG))
# ======= tune libtool *.la search path to the target destination for development =======
@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX) ; \
- sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libunistring.la ; \
- sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" libunistring.la \
+ sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libunistring.la ; \
+ sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" libunistring.la ; \
)
# ======= Strip binaries =======
@( cd $(LIBUNISTR_PKG) ; \
Index: libunistring-pkg-install.sh
===================================================================
--- libunistring-pkg-install.sh (.../0.9.10) (revision 438)
+++ libunistring-pkg-install.sh (.../1.3) (revision 439)
@@ -1,5 +1,19 @@
#!/bin/sh
+# Preserve new files
+install_file() {
+ NEW="$1"
+ OLD="`dirname $NEW`/`basename $NEW .new`"
+ # If there's no file by that name, mv it over:
+ if [ ! -r $OLD ]; then
+ mv $NEW $OLD
+ elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy
+ rm $NEW
+ fi
+ # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+
# arg 1: the new package version
pre_install() {
/bin/true
@@ -7,7 +21,22 @@
# arg 1: the new package version
post_install() {
- /bin/true
+ #
+ # NOTE:
+ # 'install-info' can work using relative paths and we can make use build machine
+ # utility during installation to the some partition and use target 'install-info'
+ # during installation directly on the running target machine.
+ #
+ if [ -x /usr/bin/install-info ] ; then
+ install-info --info-dir=usr/share/info usr/share/info/libunistring.info.gz 2>/dev/null
+ elif ! grep "(libunistring)" usr/share/info/dir 1> /dev/null 2> /dev/null ; then
+ cat << EOF >> usr/share/info/dir
+
+Software development
+* GNU libunistring: (libunistring).
+ Unicode string library.
+EOF
+ fi
}
# arg 1: the new package version
@@ -24,7 +53,9 @@
# arg 1: the old package version
pre_remove() {
- /bin/true
+ if [ -x /usr/bin/install-info ] ; then
+ install-info --delete --info-file=usr/share/info/libunistring.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
+ fi
}
# arg 1: the old package version