Add libunistring package
This commit is contained in:
Alexpux
50
libunistring/PKGBUILD
Normal file
50
libunistring/PKGBUILD
Normal file
@@ -0,0 +1,50 @@
|
||||
# Maintainer: Alexey Pavlov <alexpux@gmail.com>
|
||||
|
||||
pkgname=('libunistring' 'libunistring-devel')
|
||||
pkgver=0.9.3
|
||||
pkgrel=1
|
||||
pkgdesc="Library for manipulating Unicode strings and C strings."
|
||||
url="http://www.gnu.org/software/libunistring/"
|
||||
arch=('i686' 'x86_64')
|
||||
license=('GPL')
|
||||
depends=('msys2-runtime')
|
||||
install=${pkgname}.install
|
||||
source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz
|
||||
libunistring-0.9.3-2.src.patch
|
||||
libunistring-0.9.3-msys2.patch)
|
||||
md5sums=('db8eca3b64163abadf8c40e5cecc261f'
|
||||
'341536a243f4219d962a60e12a53169d'
|
||||
'31994f6d4c7f862a32136f4c7cc61cf2')
|
||||
|
||||
prepare() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
patch -p2 -i ${srcdir}/libunistring-0.9.3-2.src.patch
|
||||
patch -p1 -i ${srcdir}/libunistring-0.9.3-msys2.patch
|
||||
|
||||
autoreconf -fi
|
||||
}
|
||||
|
||||
build() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
./configure --build=${CHOST} --prefix=/usr
|
||||
make
|
||||
make DESTDIR="${srcdir}/dest" install
|
||||
}
|
||||
|
||||
package_libunistring() {
|
||||
groups=('libraries')
|
||||
|
||||
mkdir -p ${pkgdir}/usr
|
||||
cp -rf ${srcdir}/dest/usr/bin ${pkgdir}/usr/
|
||||
cp -rf ${srcdir}/dest/usr/share ${pkgdir}/usr/
|
||||
}
|
||||
|
||||
package_libunistring-devel() {
|
||||
pkgdesc="libunistring headers and libraries"
|
||||
groups=('development')
|
||||
options=('staticlibs')
|
||||
|
||||
mkdir -p ${pkgdir}/usr
|
||||
cp -rf ${srcdir}/dest/usr/include ${pkgdir}/usr/
|
||||
cp -rf ${srcdir}/dest/usr/lib ${pkgdir}/usr/
|
||||
}
|
||||
31
libunistring/libunistring-0.9.3-2.src.patch
Normal file
31
libunistring/libunistring-0.9.3-2.src.patch
Normal file
@@ -0,0 +1,31 @@
|
||||
--- origsrc/libunistring-0.9.3/configure.ac 2010-03-29 04:35:26.000000000 +0200
|
||||
+++ src/libunistring-0.9.3/configure.ac 2011-10-07 17:42:13.943985300 +0200
|
||||
@@ -61,7 +61,7 @@ LT_LANG([Windows Resource])
|
||||
dnl On mingw and Cygwin, we can activate special Makefile rules which add
|
||||
dnl version information to the shared libraries and executables.
|
||||
case "$host_os" in
|
||||
- mingw* | cygwin*) is_woe32=yes ;;
|
||||
+ mingw*) is_woe32=yes ;;
|
||||
*) is_woe32=no ;;
|
||||
esac
|
||||
AM_CONDITIONAL([WOE32], [test $is_woe32 = yes])
|
||||
@@ -79,7 +79,7 @@ dnl must arrange to define the auxili
|
||||
dnl exported variables _also_ in the static library.
|
||||
if test "$enable_shared" = yes; then
|
||||
case "$host_os" in
|
||||
- mingw* | cygwin*) is_woe32dll=yes ;;
|
||||
+ mingw*) is_woe32dll=yes ;;
|
||||
*) is_woe32dll=no ;;
|
||||
esac
|
||||
else
|
||||
--- origsrc/libunistring-0.9.3/m4/woe32-dll.m4 2009-04-19 20:00:22.000000000 +0200
|
||||
+++ src/libunistring-0.9.3/m4/woe32-dll.m4 2011-10-07 17:42:13.959585300 +0200
|
||||
@@ -29,7 +29,7 @@ AC_DEFUN([gl_WOE32_DLL],
|
||||
[
|
||||
AC_REQUIRE([AC_CANONICAL_HOST])
|
||||
case "$host_os" in
|
||||
- mingw* | cygwin*)
|
||||
+ mingw*)
|
||||
AC_MSG_CHECKING([for auto-import of symbols])
|
||||
AC_CACHE_VAL([gl_cv_ld_autoimport], [
|
||||
gl_save_LDFLAGS="$LDFLAGS"
|
||||
899
libunistring/libunistring-0.9.3-msys2.patch
Normal file
899
libunistring/libunistring-0.9.3-msys2.patch
Normal file
@@ -0,0 +1,899 @@
|
||||
diff -Naur libunistring-0.9.3-orig/aclocal.m4 libunistring-0.9.3/aclocal.m4
|
||||
--- libunistring-0.9.3-orig/aclocal.m4 2010-05-02 21:28:11.000000000 +0000
|
||||
+++ libunistring-0.9.3/aclocal.m4 2013-05-02 05:32:48.539062500 +0000
|
||||
@@ -697,7 +697,7 @@
|
||||
;;
|
||||
|
||||
AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
|
||||
-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
|
||||
+[*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32*)
|
||||
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
|
||||
AC_CHECK_TOOL(AS, as, false)
|
||||
AC_CHECK_TOOL(OBJDUMP, objdump, false)
|
||||
@@ -818,7 +818,7 @@
|
||||
lt_cv_sys_max_cmd_len=-1;
|
||||
;;
|
||||
|
||||
- cygwin* | mingw*)
|
||||
+ cygwin* | msys* | mingw*)
|
||||
# On Win9x/ME, this test blows up -- it succeeds, but takes
|
||||
# about 5 minutes as the teststring grows exponentially.
|
||||
# Worse, since 9x/ME are not pre-emptively multitasking,
|
||||
@@ -1033,7 +1033,7 @@
|
||||
lt_cv_dlopen_libs=
|
||||
;;
|
||||
|
||||
- cygwin*)
|
||||
+ cygwin* | msys*)
|
||||
lt_cv_dlopen="dlopen"
|
||||
lt_cv_dlopen_libs=
|
||||
;;
|
||||
@@ -1447,14 +1447,14 @@
|
||||
# libtool to hard-code these into programs
|
||||
;;
|
||||
|
||||
-cygwin* | mingw* | pw32*)
|
||||
+cygwin* | msys* | mingw* | pw32*)
|
||||
version_type=windows
|
||||
shrext_cmds=".dll"
|
||||
need_version=no
|
||||
need_lib_prefix=no
|
||||
|
||||
case $GCC,$host_os in
|
||||
- yes,cygwin* | yes,mingw* | yes,pw32*)
|
||||
+ yes,cygwin* | yes,msys* | yes,mingw* | yes,pw32*)
|
||||
library_names_spec='$libname.dll.a'
|
||||
# DLL is installed to $(libdir)/../bin by postinstall_cmds
|
||||
postinstall_cmds='base_file=`basename \${file}`~
|
||||
@@ -1474,6 +1474,11 @@
|
||||
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
|
||||
sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
|
||||
;;
|
||||
+ msys*)
|
||||
+ # MSYS DLLs use 'msys-' prefix rather than 'lib'
|
||||
+ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
|
||||
+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
|
||||
+ ;;
|
||||
mingw*)
|
||||
# MinGW DLLs use traditional 'lib' prefix
|
||||
soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
|
||||
@@ -2418,7 +2423,7 @@
|
||||
lt_cv_file_magic_test_file=/shlib/libc.so
|
||||
;;
|
||||
|
||||
-cygwin*)
|
||||
+cygwin* | msys*)
|
||||
# func_win32_libid is a shell function defined in ltmain.sh
|
||||
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
|
||||
lt_cv_file_magic_cmd='func_win32_libid'
|
||||
@@ -2634,7 +2639,7 @@
|
||||
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
||||
LIBM=
|
||||
case $host in
|
||||
-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
|
||||
+*-*-beos* | *-*-cygwin* | *-*-msys* | *-*-pw32* | *-*-darwin*)
|
||||
# These system don't have libm, or don't need it
|
||||
;;
|
||||
*-ncr-sysv4.3*)
|
||||
@@ -3142,7 +3147,7 @@
|
||||
esac
|
||||
;;
|
||||
|
||||
- cygwin* | mingw* | pw32*)
|
||||
+ cygwin* | msys* | mingw* | pw32*)
|
||||
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
|
||||
# as there is no search path for DLLs.
|
||||
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
|
||||
@@ -4818,7 +4823,7 @@
|
||||
aix*)
|
||||
symcode='[[BCDT]]'
|
||||
;;
|
||||
-cygwin* | mingw* | pw32*)
|
||||
+cygwin* | msys* | mingw* | pw32*)
|
||||
symcode='[[ABCDGISTW]]'
|
||||
;;
|
||||
hpux*) # Its linker distinguishes data from code symbols
|
||||
@@ -5021,7 +5026,7 @@
|
||||
beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
|
||||
# PIC is the default for these OSes.
|
||||
;;
|
||||
- mingw* | cygwin* | os2* | pw32*)
|
||||
+ mingw* | cygwin* | msys* | os2* | pw32*)
|
||||
# This hack is so that the source file can tell whether it is being
|
||||
# built for inclusion in a dll (and should export symbols for example).
|
||||
# Although the cygwin gcc ignores -fPIC, still need this for old-style
|
||||
@@ -5306,7 +5311,7 @@
|
||||
# PIC is the default for these OSes.
|
||||
;;
|
||||
|
||||
- mingw* | cygwin* | pw32* | os2*)
|
||||
+ mingw* | cygwin* | msys* | pw32* | os2*)
|
||||
# This hack is so that the source file can tell whether it is being
|
||||
# built for inclusion in a dll (and should export symbols for example).
|
||||
# Although the cygwin gcc ignores -fPIC, still need this for old-style
|
||||
@@ -5379,7 +5384,7 @@
|
||||
esac
|
||||
;;
|
||||
|
||||
- mingw* | cygwin* | pw32* | os2*)
|
||||
+ mingw* | cygwin* | msys* | pw32* | os2*)
|
||||
# This hack is so that the source file can tell whether it is being
|
||||
# built for inclusion in a dll (and should export symbols for example).
|
||||
m4_if([$1], [GCJ], [],
|
||||
@@ -5572,7 +5577,7 @@
|
||||
pw32*)
|
||||
_LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
|
||||
;;
|
||||
- cygwin* | mingw*)
|
||||
+ cygwin* | msys* | mingw*)
|
||||
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
|
||||
;;
|
||||
*)
|
||||
@@ -5622,7 +5627,7 @@
|
||||
# Just being paranoid about ensuring that cc_basename is set.
|
||||
_LT_CC_BASENAME([$compiler])
|
||||
case $host_os in
|
||||
- cygwin* | mingw* | pw32*)
|
||||
+ cygwin* | msys* | mingw* | pw32*)
|
||||
# FIXME: the MSVC++ port hasn't been tested in a loooong time
|
||||
# When not using gcc, we currently assume that we are using
|
||||
# Microsoft Visual C++.
|
||||
@@ -5708,7 +5713,7 @@
|
||||
fi
|
||||
;;
|
||||
|
||||
- cygwin* | mingw* | pw32*)
|
||||
+ cygwin* | msys* | mingw* | pw32*)
|
||||
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
|
||||
# as there is no search path for DLLs.
|
||||
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
|
||||
@@ -6017,7 +6022,7 @@
|
||||
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
|
||||
;;
|
||||
|
||||
- cygwin* | mingw* | pw32*)
|
||||
+ cygwin* | msys* | mingw* | pw32*)
|
||||
# When not using gcc, we currently assume that we are using
|
||||
# Microsoft Visual C++.
|
||||
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
||||
diff -Naur libunistring-0.9.3-orig/build-aux/config.guess libunistring-0.9.3/build-aux/config.guess
|
||||
--- libunistring-0.9.3-orig/build-aux/config.guess 2010-05-02 11:23:58.000000000 +0000
|
||||
+++ libunistring-0.9.3/build-aux/config.guess 2013-05-02 06:10:25.148437500 +0000
|
||||
@@ -801,6 +801,9 @@
|
||||
i*:CYGWIN*:*)
|
||||
echo ${UNAME_MACHINE}-pc-cygwin
|
||||
exit ;;
|
||||
+ i*:MSYS*:*)
|
||||
+ echo ${UNAME_MACHINE}-pc-msys
|
||||
+ exit ;;
|
||||
*:MINGW*:*)
|
||||
echo ${UNAME_MACHINE}-pc-mingw32
|
||||
exit ;;
|
||||
@@ -841,6 +844,9 @@
|
||||
amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
|
||||
echo x86_64-unknown-cygwin
|
||||
exit ;;
|
||||
+ amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
|
||||
+ echo x86_64-unknown-msys
|
||||
+ exit ;;
|
||||
p*:CYGWIN*:*)
|
||||
echo powerpcle-unknown-cygwin
|
||||
exit ;;
|
||||
diff -Naur libunistring-0.9.3-orig/build-aux/config.rpath libunistring-0.9.3/build-aux/config.rpath
|
||||
--- libunistring-0.9.3-orig/build-aux/config.rpath 2010-01-01 10:02:01.000000000 +0000
|
||||
+++ libunistring-0.9.3/build-aux/config.rpath 2013-05-02 06:09:43.076171800 +0000
|
||||
@@ -64,7 +64,7 @@
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
||||
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
||||
;;
|
||||
hpux9* | hpux10* | hpux11*)
|
||||
wl='-Wl,'
|
||||
@@ -138,7 +138,7 @@
|
||||
hardcode_minus_L=no
|
||||
|
||||
case "$host_os" in
|
||||
- cygwin* | mingw* | pw32* | cegcc*)
|
||||
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
||||
# FIXME: the MSVC++ port hasn't been tested in a loooong time
|
||||
# When not using gcc, we currently assume that we are using
|
||||
# Microsoft Visual C++.
|
||||
@@ -188,7 +188,7 @@
|
||||
ld_shlibs=no
|
||||
fi
|
||||
;;
|
||||
- cygwin* | mingw* | pw32* | cegcc*)
|
||||
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
||||
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
||||
# no search path for DLLs.
|
||||
hardcode_libdir_flag_spec='-L$libdir'
|
||||
@@ -332,7 +332,7 @@
|
||||
;;
|
||||
bsdi[45]*)
|
||||
;;
|
||||
- cygwin* | mingw* | pw32* | cegcc*)
|
||||
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
||||
# When not using gcc, we currently assume that we are using
|
||||
# Microsoft Visual C++.
|
||||
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
||||
@@ -523,7 +523,7 @@
|
||||
bsdi[45]*)
|
||||
library_names_spec='$libname$shrext'
|
||||
;;
|
||||
- cygwin* | mingw* | pw32* | cegcc*)
|
||||
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
||||
shrext=.dll
|
||||
library_names_spec='$libname.dll.a $libname.lib'
|
||||
;;
|
||||
diff -Naur libunistring-0.9.3-orig/build-aux/config.sub libunistring-0.9.3/build-aux/config.sub
|
||||
--- libunistring-0.9.3-orig/build-aux/config.sub 2010-03-29 02:40:43.000000000 +0000
|
||||
+++ libunistring-0.9.3/build-aux/config.sub 2013-05-02 06:09:12.310546800 +0000
|
||||
@@ -1306,7 +1306,7 @@
|
||||
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
|
||||
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
|
||||
| -chorusos* | -chorusrdb* | -cegcc* \
|
||||
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
|
||||
+ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
|
||||
| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
|
||||
| -uxpv* | -beos* | -mpeix* | -udk* \
|
||||
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
|
||||
diff -Naur libunistring-0.9.3-orig/build-aux/ltmain.sh libunistring-0.9.3/build-aux/ltmain.sh
|
||||
--- libunistring-0.9.3-orig/build-aux/ltmain.sh 2008-09-28 21:58:12.000000000 +0000
|
||||
+++ libunistring-0.9.3/build-aux/ltmain.sh 2013-05-02 06:13:36.210937500 +0000
|
||||
@@ -805,7 +805,7 @@
|
||||
|
||||
|
||||
case $host in
|
||||
- *cygwin* | *mingw* | *pw32* | *cegcc*)
|
||||
+ *cygwin* | *msys* | *mingw* | *pw32* | *cegcc*)
|
||||
# don't eliminate duplications in $postdeps and $predeps
|
||||
opt_duplicate_compiler_generated_deps=:
|
||||
;;
|
||||
@@ -1276,7 +1276,7 @@
|
||||
|
||||
# On Cygwin there's no "real" PIC flag so we must build both object types
|
||||
case $host_os in
|
||||
- cygwin* | mingw* | pw32* | os2* | cegcc*)
|
||||
+ cygwin* | msys* | mingw* | pw32* | os2* | cegcc*)
|
||||
pic_mode=default
|
||||
;;
|
||||
esac
|
||||
@@ -2047,7 +2047,7 @@
|
||||
'exit $?'
|
||||
tstripme="$stripme"
|
||||
case $host_os in
|
||||
- cygwin* | mingw* | pw32* | cegcc*)
|
||||
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
||||
case $realname in
|
||||
*.dll.a)
|
||||
tstripme=""
|
||||
@@ -2153,7 +2153,7 @@
|
||||
|
||||
# Do a test to see if this is really a libtool program.
|
||||
case $host in
|
||||
- *cygwin* | *mingw*)
|
||||
+ *cygwin* | *msys* | *mingw*)
|
||||
if func_ltwrapper_executable_p "$file"; then
|
||||
func_ltwrapper_scriptname "$file"
|
||||
wrapper=$func_ltwrapper_scriptname_result
|
||||
@@ -2228,7 +2228,7 @@
|
||||
# remove .exe since cygwin /usr/bin/install will append another
|
||||
# one anyway
|
||||
case $install_prog,$host in
|
||||
- */usr/bin/install*,*cygwin*)
|
||||
+ */usr/bin/install*,*cygwin*|*/usr/bin/install*,*msys*)
|
||||
case $file:$destfile in
|
||||
*.exe:*.exe)
|
||||
# this is ok
|
||||
@@ -2359,7 +2359,7 @@
|
||||
$RM $export_symbols
|
||||
eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
|
||||
case $host in
|
||||
- *cygwin* | *mingw* | *cegcc* )
|
||||
+ *cygwin* | *msys* | *mingw* | *cegcc* )
|
||||
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
|
||||
eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
|
||||
;;
|
||||
@@ -2371,7 +2371,7 @@
|
||||
eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
|
||||
eval '$MV "$nlist"T "$nlist"'
|
||||
case $host in
|
||||
- *cygwin | *mingw* | *cegcc* )
|
||||
+ *cygwin | *msys | *mingw* | *cegcc* )
|
||||
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
|
||||
eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
|
||||
;;
|
||||
@@ -2427,7 +2427,7 @@
|
||||
} lt_dlsymlist;
|
||||
"
|
||||
case $host in
|
||||
- *cygwin* | *mingw* | *cegcc* )
|
||||
+ *cygwin* | *msys* | *mingw* | *cegcc* )
|
||||
$ECHO >> "$output_objdir/$my_dlsyms" "\
|
||||
/* DATA imports from DLLs on WIN32 con't be const, because
|
||||
runtime relocations are performed -- see ld's documentation
|
||||
@@ -2513,7 +2513,7 @@
|
||||
# Transform the symbol file into the correct name.
|
||||
symfileobj="$output_objdir/${my_outputname}S.$objext"
|
||||
case $host in
|
||||
- *cygwin* | *mingw* | *cegcc* )
|
||||
+ *cygwin* | *msys* | *mingw* | *cegcc* )
|
||||
if test -f "$output_objdir/$my_outputname.def"; then
|
||||
compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
|
||||
finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
|
||||
@@ -2991,7 +2991,7 @@
|
||||
func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
|
||||
$SED -e "$lt_sed_naive_backslashify"`
|
||||
;;
|
||||
- *cygwin* )
|
||||
+ *cygwin* | *msys* )
|
||||
func_to_host_path_tmp1=`cygpath -w "$1"`
|
||||
func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
|
||||
$SED -e "$lt_sed_naive_backslashify"`
|
||||
@@ -3070,7 +3070,7 @@
|
||||
func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
|
||||
$SED -e "$lt_sed_naive_backslashify"`
|
||||
;;
|
||||
- *cygwin* )
|
||||
+ *cygwin* | *msys* )
|
||||
func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
|
||||
func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
|
||||
$SED -e "$lt_sed_naive_backslashify"`
|
||||
@@ -3385,7 +3385,7 @@
|
||||
{
|
||||
EOF
|
||||
case "$host" in
|
||||
- *mingw* | *cygwin* )
|
||||
+ *mingw* | *cygwin* | *msys* )
|
||||
# make stdout use "unix" line endings
|
||||
echo " setmode(1,_O_BINARY);"
|
||||
;;
|
||||
@@ -4153,7 +4153,7 @@
|
||||
{
|
||||
$opt_debug
|
||||
case $host in
|
||||
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
|
||||
+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
|
||||
# It is impossible to link a dll without this setting, and
|
||||
# we shouldn't force the makefile maintainer to figure out
|
||||
# which system we are compiling for in order to pass an extra
|
||||
@@ -4622,7 +4622,7 @@
|
||||
;;
|
||||
esac
|
||||
case $host in
|
||||
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
|
||||
+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
|
||||
testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
|
||||
case :$dllsearchpath: in
|
||||
*":$dir:"*) ;;
|
||||
@@ -4642,7 +4642,7 @@
|
||||
-l*)
|
||||
if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
|
||||
case $host in
|
||||
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
|
||||
+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
|
||||
# These systems don't actually have a C or math library (as such)
|
||||
continue
|
||||
;;
|
||||
@@ -4719,7 +4719,7 @@
|
||||
|
||||
-no-install)
|
||||
case $host in
|
||||
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
|
||||
+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
|
||||
# The PATH hackery in wrapper scripts is required on Windows
|
||||
# and Darwin in order for the loader to find any dlls it needs.
|
||||
func_warning "\`-no-install' is ignored for $host"
|
||||
@@ -5676,7 +5676,7 @@
|
||||
if test -n "$library_names" &&
|
||||
{ test "$use_static_libs" = no || test -z "$old_library"; }; then
|
||||
case $host in
|
||||
- *cygwin* | *mingw* | *cegcc*)
|
||||
+ *cygwin* | *msys* | *mingw* | *cegcc*)
|
||||
# No point in relinking DLLs because paths are not encoded
|
||||
notinst_deplibs="$notinst_deplibs $lib"
|
||||
need_relink=no
|
||||
@@ -5746,7 +5746,7 @@
|
||||
elif test -n "$soname_spec"; then
|
||||
# bleh windows
|
||||
case $host in
|
||||
- *cygwin* | mingw* | *cegcc*)
|
||||
+ *cygwin* | *msys* | mingw* | *cegcc*)
|
||||
func_arith $current - $age
|
||||
major=$func_arith_result
|
||||
versuffix="-$major"
|
||||
@@ -6596,7 +6596,7 @@
|
||||
if test "$build_libtool_libs" = yes; then
|
||||
if test -n "$rpath"; then
|
||||
case $host in
|
||||
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
|
||||
+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
|
||||
# these systems don't actually have a c library (as such)!
|
||||
;;
|
||||
*-*-rhapsody* | *-*-darwin1.[012])
|
||||
@@ -7095,7 +7095,7 @@
|
||||
|
||||
orig_export_symbols=
|
||||
case $host_os in
|
||||
- cygwin* | mingw* | cegcc*)
|
||||
+ cygwin* | msys* | mingw* | cegcc*)
|
||||
if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
|
||||
# exporting using user supplied symfile
|
||||
if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
|
||||
@@ -7607,7 +7607,7 @@
|
||||
|
||||
prog)
|
||||
case $host in
|
||||
- *cygwin*) func_stripname '' '.exe' "$output"
|
||||
+ *cygwin* | *msys*) func_stripname '' '.exe' "$output"
|
||||
output=$func_stripname_result.exe;;
|
||||
esac
|
||||
test -n "$vinfo" && \
|
||||
@@ -7720,7 +7720,7 @@
|
||||
esac
|
||||
fi
|
||||
case $host in
|
||||
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
|
||||
+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
|
||||
testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
|
||||
case :$dllsearchpath: in
|
||||
*":$libdir:"*) ;;
|
||||
@@ -7794,7 +7794,7 @@
|
||||
|
||||
wrappers_required=yes
|
||||
case $host in
|
||||
- *cygwin* | *mingw* )
|
||||
+ *cygwin* | *msys* | *mingw* )
|
||||
if test "$build_libtool_libs" != yes; then
|
||||
wrappers_required=no
|
||||
fi
|
||||
@@ -7937,7 +7937,7 @@
|
||||
esac
|
||||
# test for cygwin because mv fails w/o .exe extensions
|
||||
case $host in
|
||||
- *cygwin*)
|
||||
+ *cygwin* | *msys*)
|
||||
exeext=.exe
|
||||
func_stripname '' '.exe' "$outputname"
|
||||
outputname=$func_stripname_result ;;
|
||||
@@ -8243,7 +8243,7 @@
|
||||
# place dlname in correct position for cygwin
|
||||
tdlname=$dlname
|
||||
case $host,$output,$installed,$module,$dlname in
|
||||
- *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
|
||||
+ *cygwin*,*lai,yes,no,*.dll | *msys*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
|
||||
esac
|
||||
$ECHO > $output "\
|
||||
# $outputname - a libtool library file
|
||||
diff -Naur libunistring-0.9.3-orig/configure libunistring-0.9.3/configure
|
||||
--- libunistring-0.9.3-orig/configure 2013-05-02 05:28:36.595703100 +0000
|
||||
+++ libunistring-0.9.3/configure 2013-05-02 06:07:55.945312500 +0000
|
||||
@@ -5401,7 +5401,7 @@
|
||||
else
|
||||
case "$host_os" in
|
||||
osf*) gl_use_threads=no ;;
|
||||
- cygwin*)
|
||||
+ cygwin* | msys*)
|
||||
case `uname -r` in
|
||||
1.[0-5].*) gl_use_threads=no ;;
|
||||
*) gl_use_threads=yes ;;
|
||||
@@ -6427,7 +6427,7 @@
|
||||
|
||||
|
||||
case "$host_os" in
|
||||
- mingw* | cygwin*)
|
||||
+ mingw* | cygwin* | msys*)
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for auto-import of symbols" >&5
|
||||
$as_echo_n "checking for auto-import of symbols... " >&6; }
|
||||
if test "${gl_cv_ld_autoimport+set}" = set; then :
|
||||
@@ -7012,7 +7012,7 @@
|
||||
lt_cv_sys_max_cmd_len=-1;
|
||||
;;
|
||||
|
||||
- cygwin* | mingw* | cegcc*)
|
||||
+ cygwin* | msys* | mingw* | cegcc*)
|
||||
# On Win9x/ME, this test blows up -- it succeeds, but takes
|
||||
# about 5 minutes as the teststring grows exponentially.
|
||||
# Worse, since 9x/ME are not pre-emptively multitasking,
|
||||
@@ -7346,7 +7346,7 @@
|
||||
lt_cv_file_magic_test_file=/shlib/libc.so
|
||||
;;
|
||||
|
||||
-cygwin*)
|
||||
+cygwin* | msys*)
|
||||
# func_win32_libid is a shell function defined in ltmain.sh
|
||||
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
|
||||
lt_cv_file_magic_cmd='func_win32_libid'
|
||||
@@ -7909,7 +7909,7 @@
|
||||
aix*)
|
||||
symcode='[BCDT]'
|
||||
;;
|
||||
-cygwin* | mingw* | pw32* | cegcc*)
|
||||
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
||||
symcode='[ABCDGISTW]'
|
||||
;;
|
||||
hpux*)
|
||||
@@ -8934,7 +8934,7 @@
|
||||
enable_win32_dll=yes
|
||||
|
||||
case $host in
|
||||
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
|
||||
+*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-cegcc*)
|
||||
if test -n "$ac_tool_prefix"; then
|
||||
# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
|
||||
set dummy ${ac_tool_prefix}as; ac_word=$2
|
||||
@@ -9800,7 +9800,7 @@
|
||||
# PIC is the default for these OSes.
|
||||
;;
|
||||
|
||||
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
||||
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
||||
# This hack is so that the source file can tell whether it is being
|
||||
# built for inclusion in a dll (and should export symbols for example).
|
||||
# Although the cygwin gcc ignores -fPIC, still need this for old-style
|
||||
@@ -9869,7 +9869,7 @@
|
||||
fi
|
||||
;;
|
||||
|
||||
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
||||
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
||||
# This hack is so that the source file can tell whether it is being
|
||||
# built for inclusion in a dll (and should export symbols for example).
|
||||
lt_prog_compiler_pic='-DDLL_EXPORT'
|
||||
@@ -10331,7 +10331,7 @@
|
||||
extract_expsyms_cmds=
|
||||
|
||||
case $host_os in
|
||||
- cygwin* | mingw* | pw32* | cegcc*)
|
||||
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
||||
# FIXME: the MSVC++ port hasn't been tested in a loooong time
|
||||
# When not using gcc, we currently assume that we are using
|
||||
# Microsoft Visual C++.
|
||||
@@ -10418,7 +10418,7 @@
|
||||
fi
|
||||
;;
|
||||
|
||||
- cygwin* | mingw* | pw32* | cegcc*)
|
||||
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
||||
# _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
|
||||
# as there is no search path for DLLs.
|
||||
hardcode_libdir_flag_spec='-L$libdir'
|
||||
@@ -10831,7 +10831,7 @@
|
||||
export_dynamic_flag_spec=-rdynamic
|
||||
;;
|
||||
|
||||
- cygwin* | mingw* | pw32* | cegcc*)
|
||||
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
||||
# When not using gcc, we currently assume that we are using
|
||||
# Microsoft Visual C++.
|
||||
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
||||
@@ -11674,14 +11674,14 @@
|
||||
# libtool to hard-code these into programs
|
||||
;;
|
||||
|
||||
-cygwin* | mingw* | pw32* | cegcc*)
|
||||
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
||||
version_type=windows
|
||||
shrext_cmds=".dll"
|
||||
need_version=no
|
||||
need_lib_prefix=no
|
||||
|
||||
case $GCC,$host_os in
|
||||
- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
|
||||
+ yes,cygwin* | yes,msys* | yes,mingw* | yes,pw32* | yes,cegcc*)
|
||||
library_names_spec='$libname.dll.a'
|
||||
# DLL is installed to $(libdir)/../bin by postinstall_cmds
|
||||
postinstall_cmds='base_file=`basename \${file}`~
|
||||
@@ -11704,6 +11704,11 @@
|
||||
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
||||
sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
|
||||
;;
|
||||
+ msys*)
|
||||
+ # MSYS DLLs use 'msys-' prefix rather than 'lib'
|
||||
+ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
||||
+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
|
||||
+ ;;
|
||||
mingw* | cegcc*)
|
||||
# MinGW DLLs use traditional 'lib' prefix
|
||||
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
||||
@@ -12327,7 +12332,7 @@
|
||||
lt_cv_dlopen_libs=
|
||||
;;
|
||||
|
||||
- cygwin*)
|
||||
+ cygwin* | msys*)
|
||||
lt_cv_dlopen="dlopen"
|
||||
lt_cv_dlopen_libs=
|
||||
;;
|
||||
@@ -18787,7 +18792,7 @@
|
||||
openbsd*) gl_cv_func_printf_directive_ls="guessing no";;
|
||||
irix*) gl_cv_func_printf_directive_ls="guessing no";;
|
||||
solaris*) gl_cv_func_printf_directive_ls="guessing no";;
|
||||
- cygwin*) gl_cv_func_printf_directive_ls="guessing no";;
|
||||
+ cygwin* | msys*) gl_cv_func_printf_directive_ls="guessing no";;
|
||||
beos* | haiku*) gl_cv_func_printf_directive_ls="guessing no";;
|
||||
*) gl_cv_func_printf_directive_ls="guessing yes";;
|
||||
esac
|
||||
@@ -18870,7 +18875,7 @@
|
||||
if test "$cross_compiling" = yes; then :
|
||||
|
||||
case "$host_os" in
|
||||
- cygwin*) gl_cv_func_printf_flag_grouping="guessing no";;
|
||||
+ cygwin* | msys*) gl_cv_func_printf_flag_grouping="guessing no";;
|
||||
netbsd*) gl_cv_func_printf_flag_grouping="guessing no";;
|
||||
mingw* | pw*) gl_cv_func_printf_flag_grouping="guessing no";;
|
||||
*) gl_cv_func_printf_flag_grouping="guessing yes";;
|
||||
@@ -32087,13 +32092,13 @@
|
||||
|
||||
case "$host_os" in
|
||||
# Guess no on Solaris <= 9 and Cygwin.
|
||||
- solaris2.[1-9] | solaris2.[1-9].* | cygwin*)
|
||||
+ solaris2.[1-9] | solaris2.[1-9].* | cygwin* | msys*)
|
||||
gl_cv_func_wctob_works="guessing no" ;;
|
||||
# Guess yes otherwise.
|
||||
*) gl_cv_func_wctob_works="guessing yes" ;;
|
||||
esac
|
||||
case "$host_os" in
|
||||
- cygwin*)
|
||||
+ cygwin* | msys*)
|
||||
if test "$cross_compiling" = yes; then :
|
||||
:
|
||||
else
|
||||
@@ -32695,7 +32700,7 @@
|
||||
aix*)
|
||||
symcode='[BCDT]'
|
||||
;;
|
||||
-cygwin* | mingw* | pw32*)
|
||||
+cygwin* | msys* | mingw* | pw32*)
|
||||
symcode='[ABCDGISTW]'
|
||||
;;
|
||||
hpux*) # Its linker distinguishes data from code symbols
|
||||
diff -Naur libunistring-0.9.3-orig/gnulib-m4/printf.m4 libunistring-0.9.3/gnulib-m4/printf.m4
|
||||
--- libunistring-0.9.3-orig/gnulib-m4/printf.m4 2010-01-01 10:02:01.000000000 +0000
|
||||
+++ libunistring-0.9.3/gnulib-m4/printf.m4 2013-05-02 06:14:41.176757800 +0000
|
||||
@@ -694,7 +694,7 @@
|
||||
openbsd*) gl_cv_func_printf_directive_ls="guessing no";;
|
||||
irix*) gl_cv_func_printf_directive_ls="guessing no";;
|
||||
solaris*) gl_cv_func_printf_directive_ls="guessing no";;
|
||||
- cygwin*) gl_cv_func_printf_directive_ls="guessing no";;
|
||||
+ cygwin* | msys*) gl_cv_func_printf_directive_ls="guessing no";;
|
||||
beos* | haiku*) gl_cv_func_printf_directive_ls="guessing no";;
|
||||
*) gl_cv_func_printf_directive_ls="guessing yes";;
|
||||
esac
|
||||
@@ -765,7 +765,7 @@
|
||||
[
|
||||
changequote(,)dnl
|
||||
case "$host_os" in
|
||||
- cygwin*) gl_cv_func_printf_flag_grouping="guessing no";;
|
||||
+ cygwin* | msys*) gl_cv_func_printf_flag_grouping="guessing no";;
|
||||
netbsd*) gl_cv_func_printf_flag_grouping="guessing no";;
|
||||
mingw* | pw*) gl_cv_func_printf_flag_grouping="guessing no";;
|
||||
*) gl_cv_func_printf_flag_grouping="guessing yes";;
|
||||
@@ -1318,7 +1318,7 @@
|
||||
darwin[1-6].*) gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
|
||||
darwin*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
|
||||
# Guess yes on Cygwin.
|
||||
- cygwin*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
|
||||
+ cygwin* | msys*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
|
||||
# Guess yes on Solaris >= 2.6.
|
||||
solaris2.[0-5]*) gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
|
||||
solaris*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
|
||||
diff -Naur libunistring-0.9.3-orig/gnulib-m4/threadlib.m4 libunistring-0.9.3/gnulib-m4/threadlib.m4
|
||||
--- libunistring-0.9.3-orig/gnulib-m4/threadlib.m4 2010-05-02 11:22:12.000000000 +0000
|
||||
+++ libunistring-0.9.3/gnulib-m4/threadlib.m4 2013-05-02 06:15:44.551757800 +0000
|
||||
@@ -61,7 +61,7 @@
|
||||
dnl bugs that lead to endless loops or crashes. See
|
||||
dnl <http://cygwin.com/ml/cygwin/2009-08/msg00283.html>.
|
||||
osf*) gl_use_threads=no ;;
|
||||
- cygwin*)
|
||||
+ cygwin* | msys*)
|
||||
case `uname -r` in
|
||||
1.[0-5].*) gl_use_threads=no ;;
|
||||
*) gl_use_threads=yes ;;
|
||||
diff -Naur libunistring-0.9.3-orig/gnulib-m4/wctob.m4 libunistring-0.9.3/gnulib-m4/wctob.m4
|
||||
--- libunistring-0.9.3-orig/gnulib-m4/wctob.m4 2010-05-02 11:22:12.000000000 +0000
|
||||
+++ libunistring-0.9.3/gnulib-m4/wctob.m4 2013-05-02 06:16:04.458007800 +0000
|
||||
@@ -30,14 +30,14 @@
|
||||
changequote(,)dnl
|
||||
case "$host_os" in
|
||||
# Guess no on Solaris <= 9 and Cygwin.
|
||||
- solaris2.[1-9] | solaris2.[1-9].* | cygwin*)
|
||||
+ solaris2.[1-9] | solaris2.[1-9].* | cygwin* | msys*)
|
||||
gl_cv_func_wctob_works="guessing no" ;;
|
||||
# Guess yes otherwise.
|
||||
*) gl_cv_func_wctob_works="guessing yes" ;;
|
||||
esac
|
||||
changequote([,])dnl
|
||||
case "$host_os" in
|
||||
- cygwin*)
|
||||
+ cygwin* | msys*)
|
||||
AC_TRY_RUN([
|
||||
#include <locale.h>
|
||||
#include <wchar.h>
|
||||
diff -Naur libunistring-0.9.3-orig/lib/Makefile.gnulib libunistring-0.9.3/lib/Makefile.gnulib
|
||||
--- libunistring-0.9.3-orig/lib/Makefile.gnulib 2010-05-02 21:26:54.000000000 +0000
|
||||
+++ libunistring-0.9.3/lib/Makefile.gnulib 2013-05-02 06:16:31.587890600 +0000
|
||||
@@ -362,7 +362,7 @@
|
||||
case '$(host_os)' in \
|
||||
darwin[56]*) \
|
||||
need_charset_alias=true ;; \
|
||||
- darwin* | cygwin* | mingw* | pw32* | cegcc*) \
|
||||
+ darwin* | cygwin* | msys* | mingw* | pw32* | cegcc*) \
|
||||
need_charset_alias=false ;; \
|
||||
*) \
|
||||
need_charset_alias=true ;; \
|
||||
diff -Naur libunistring-0.9.3-orig/lib/Makefile.in libunistring-0.9.3/lib/Makefile.in
|
||||
--- libunistring-0.9.3-orig/lib/Makefile.in 2010-05-02 21:28:19.000000000 +0000
|
||||
+++ libunistring-0.9.3/lib/Makefile.in 2013-05-02 06:16:50.478515600 +0000
|
||||
@@ -3895,7 +3895,7 @@
|
||||
case '$(host_os)' in \
|
||||
darwin[56]*) \
|
||||
need_charset_alias=true ;; \
|
||||
- darwin* | cygwin* | mingw* | pw32* | cegcc*) \
|
||||
+ darwin* | cygwin* | msys* | mingw* | pw32* | cegcc*) \
|
||||
need_charset_alias=false ;; \
|
||||
*) \
|
||||
need_charset_alias=true ;; \
|
||||
diff -Naur libunistring-0.9.3-orig/m4/libtool.m4 libunistring-0.9.3/m4/libtool.m4
|
||||
--- libunistring-0.9.3-orig/m4/libtool.m4 2009-04-24 02:09:25.000000000 +0000
|
||||
+++ libunistring-0.9.3/m4/libtool.m4 2013-05-02 06:19:24.461914000 +0000
|
||||
@@ -1516,7 +1516,7 @@
|
||||
lt_cv_sys_max_cmd_len=-1;
|
||||
;;
|
||||
|
||||
- cygwin* | mingw* | cegcc*)
|
||||
+ cygwin* | msys* | mingw* | cegcc*)
|
||||
# On Win9x/ME, this test blows up -- it succeeds, but takes
|
||||
# about 5 minutes as the teststring grows exponentially.
|
||||
# Worse, since 9x/ME are not pre-emptively multitasking,
|
||||
@@ -1743,7 +1743,7 @@
|
||||
lt_cv_dlopen_libs=
|
||||
;;
|
||||
|
||||
- cygwin*)
|
||||
+ cygwin* | msys*)
|
||||
lt_cv_dlopen="dlopen"
|
||||
lt_cv_dlopen_libs=
|
||||
;;
|
||||
@@ -2200,14 +2200,14 @@
|
||||
# libtool to hard-code these into programs
|
||||
;;
|
||||
|
||||
-cygwin* | mingw* | pw32* | cegcc*)
|
||||
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
||||
version_type=windows
|
||||
shrext_cmds=".dll"
|
||||
need_version=no
|
||||
need_lib_prefix=no
|
||||
|
||||
case $GCC,$host_os in
|
||||
- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
|
||||
+ yes,cygwin* | yes,msys* | yes,mingw* | yes,pw32* | yes,cegcc*)
|
||||
library_names_spec='$libname.dll.a'
|
||||
# DLL is installed to $(libdir)/../bin by postinstall_cmds
|
||||
postinstall_cmds='base_file=`basename \${file}`~
|
||||
@@ -2230,6 +2230,11 @@
|
||||
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
|
||||
sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
|
||||
;;
|
||||
+ msys*)
|
||||
+ # MSYS DLLs use 'msys-' prefix rather than 'lib'
|
||||
+ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
|
||||
+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
|
||||
+ ;;
|
||||
mingw* | cegcc*)
|
||||
# MinGW DLLs use traditional 'lib' prefix
|
||||
soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
|
||||
@@ -2989,7 +2994,7 @@
|
||||
lt_cv_file_magic_test_file=/shlib/libc.so
|
||||
;;
|
||||
|
||||
-cygwin*)
|
||||
+cygwin* | msys*)
|
||||
# func_win32_libid is a shell function defined in ltmain.sh
|
||||
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
|
||||
lt_cv_file_magic_cmd='func_win32_libid'
|
||||
@@ -3271,7 +3276,7 @@
|
||||
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
||||
LIBM=
|
||||
case $host in
|
||||
-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
|
||||
+*-*-beos* | *-*-cygwin* | *-*-msys* | *-*-pw32* | *-*-darwin*)
|
||||
# These system don't have libm, or don't need it
|
||||
;;
|
||||
*-ncr-sysv4.3*)
|
||||
@@ -3340,7 +3345,7 @@
|
||||
aix*)
|
||||
symcode='[[BCDT]]'
|
||||
;;
|
||||
-cygwin* | mingw* | pw32* | cegcc*)
|
||||
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
||||
symcode='[[ABCDGISTW]]'
|
||||
;;
|
||||
hpux*)
|
||||
@@ -3586,7 +3591,7 @@
|
||||
beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
|
||||
# PIC is the default for these OSes.
|
||||
;;
|
||||
- mingw* | cygwin* | os2* | pw32* | cegcc*)
|
||||
+ mingw* | cygwin* | msys* | os2* | pw32* | cegcc*)
|
||||
# This hack is so that the source file can tell whether it is being
|
||||
# built for inclusion in a dll (and should export symbols for example).
|
||||
# Although the cygwin gcc ignores -fPIC, still need this for old-style
|
||||
@@ -3893,7 +3898,7 @@
|
||||
# PIC is the default for these OSes.
|
||||
;;
|
||||
|
||||
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
||||
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
||||
# This hack is so that the source file can tell whether it is being
|
||||
# built for inclusion in a dll (and should export symbols for example).
|
||||
# Although the cygwin gcc ignores -fPIC, still need this for old-style
|
||||
@@ -3963,7 +3968,7 @@
|
||||
fi
|
||||
;;
|
||||
|
||||
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
||||
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
||||
# This hack is so that the source file can tell whether it is being
|
||||
# built for inclusion in a dll (and should export symbols for example).
|
||||
m4_if([$1], [GCJ], [],
|
||||
@@ -4194,7 +4199,7 @@
|
||||
pw32*)
|
||||
_LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
|
||||
;;
|
||||
- cygwin* | mingw* | cegcc*)
|
||||
+ cygwin* | msys* | mingw* | cegcc*)
|
||||
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
|
||||
;;
|
||||
*)
|
||||
@@ -4246,7 +4251,7 @@
|
||||
extract_expsyms_cmds=
|
||||
|
||||
case $host_os in
|
||||
- cygwin* | mingw* | pw32* | cegcc*)
|
||||
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
||||
# FIXME: the MSVC++ port hasn't been tested in a loooong time
|
||||
# When not using gcc, we currently assume that we are using
|
||||
# Microsoft Visual C++.
|
||||
@@ -4333,7 +4338,7 @@
|
||||
fi
|
||||
;;
|
||||
|
||||
- cygwin* | mingw* | pw32* | cegcc*)
|
||||
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
||||
# _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
|
||||
# as there is no search path for DLLs.
|
||||
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
|
||||
@@ -4688,7 +4693,7 @@
|
||||
_LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
|
||||
;;
|
||||
|
||||
- cygwin* | mingw* | pw32* | cegcc*)
|
||||
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
||||
# When not using gcc, we currently assume that we are using
|
||||
# Microsoft Visual C++.
|
||||
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
||||
@@ -5636,7 +5641,7 @@
|
||||
esac
|
||||
;;
|
||||
|
||||
- cygwin* | mingw* | pw32* | cegcc*)
|
||||
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
||||
# _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
|
||||
# as there is no search path for DLLs.
|
||||
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
|
||||
diff -Naur libunistring-0.9.3-orig/m4/ltoptions.m4 libunistring-0.9.3/m4/ltoptions.m4
|
||||
--- libunistring-0.9.3-orig/m4/ltoptions.m4 2008-09-07 09:49:48.000000000 +0000
|
||||
+++ libunistring-0.9.3/m4/ltoptions.m4 2013-05-02 06:19:40.680664000 +0000
|
||||
@@ -125,7 +125,7 @@
|
||||
[enable_win32_dll=yes
|
||||
|
||||
case $host in
|
||||
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
|
||||
+*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-cegcc*)
|
||||
AC_CHECK_TOOL(AS, as, false)
|
||||
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
|
||||
AC_CHECK_TOOL(OBJDUMP, objdump, false)
|
||||
22
libunistring/libunistring.install
Normal file
22
libunistring/libunistring.install
Normal file
@@ -0,0 +1,22 @@
|
||||
infodir=usr/share/info
|
||||
filelist=(libunistring.info)
|
||||
|
||||
post_install() {
|
||||
[ -x usr/bin/install-info ] || return 0
|
||||
for file in ${filelist[@]}; do
|
||||
install-info $infodir/$file.gz $infodir/dir 2> /dev/null
|
||||
done
|
||||
}
|
||||
|
||||
post_upgrade() {
|
||||
post_install $1
|
||||
}
|
||||
|
||||
pre_remove() {
|
||||
[ -x usr/bin/install-info ] || return 0
|
||||
for file in ${filelist[@]}; do
|
||||
install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
|
||||
done
|
||||
}
|
||||
|
||||
# vim:set ts=2 sw=2 et:
|
||||
Reference in New Issue
Block a user