upstream-mirrors/gnulib
1
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/gnulib.git synced 2026-05-13 15:13:36 +00:00
Code Activity

tests: Fix link errors on Solaris, when libunistring-optional is in use.

Browse Source 
* modules/wcwidth (Link): New section.
* modules/wcswidth (Link): New section.
* modules/mbchar (Link): New section.
* modules/mbfile (Link): Link against libunistring.
* modules/mbiter (Link): Likewise.
* modules/mbuiter (Link): Likewise.
* modules/mbmemcasecmp (Link): Likewise.
* modules/mbscasecmp (Link): Likewise.
* modules/mbscasestr (Link): Likewise.
* modules/mbschr (Link): Likewise.
* modules/mbscspn (Link): Likewise.
* modules/mbslen (Link): Likewise.
* modules/mbsncasecmp (Link): Likewise.
* modules/mbsnlen (Link): Likewise.
* modules/mbspbrk (Link): Likewise.
* modules/mbspcasecmp (Link): Likewise.
* modules/mbsrchr (Link): Likewise.
* modules/mbssep (Link): Likewise.
* modules/mbsspn (Link): Likewise.
* modules/mbsstr (Link): Likewise.
* modules/mbstok_r (Link): Likewise.
* modules/mbswidth (Link): Likewise.
* modules/exclude (Link): Likewise.
* modules/propername (Link): Likewise.
* modules/regex-quote (Link): Likewise.
* modules/trim (Link): Likewise.
* modules/mbmemcasecmp-tests (Makefile.am): Link the test program
against libunistring.
* modules/mbscasecmp-tests (Makefile.am): Likewise.
* modules/mbscasestr-tests (Makefile.am): Likewise.
* modules/mbschr-tests (Makefile.am): Likewise.
* modules/mbscspn-tests (Makefile.am): Likewise.
* modules/mbsncasecmp-tests (Makefile.am): Likewise.
* modules/mbspbrk-tests (Makefile.am): Likewise.
* modules/mbspcasecmp-tests (Makefile.am): Likewise.
* modules/mbsrchr-tests (Makefile.am): Likewise.
* modules/mbsspn-tests (Makefile.am): Likewise.
* modules/mbsstr-tests (Makefile.am): Likewise.
* modules/exclude-tests (Makefile.am): Likewise.
* modules/regex-quote-tests (Makefile.am): Likewise.
This commit is contained in:
Bruno Haible
2021-01-04 03:48:24 +01:00
parent c69b297647
commit 40aa5e037f
40 changed files with 94 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
ChangeLog
View File

@@ -1,3 +1,47 @@
2021-01-03 Bruno Haible <bruno@clisp.org>
tests: Fix link errors on Solaris, when libunistring-optional is in use.
* modules/wcwidth (Link): New section.
* modules/wcswidth (Link): New section.
* modules/mbchar (Link): New section.
* modules/mbfile (Link): Link against libunistring.
* modules/mbiter (Link): Likewise.
* modules/mbuiter (Link): Likewise.
* modules/mbmemcasecmp (Link): Likewise.
* modules/mbscasecmp (Link): Likewise.
* modules/mbscasestr (Link): Likewise.
* modules/mbschr (Link): Likewise.
* modules/mbscspn (Link): Likewise.
* modules/mbslen (Link): Likewise.
* modules/mbsncasecmp (Link): Likewise.
* modules/mbsnlen (Link): Likewise.
* modules/mbspbrk (Link): Likewise.
* modules/mbspcasecmp (Link): Likewise.
* modules/mbsrchr (Link): Likewise.
* modules/mbssep (Link): Likewise.
* modules/mbsspn (Link): Likewise.
* modules/mbsstr (Link): Likewise.
* modules/mbstok_r (Link): Likewise.
* modules/mbswidth (Link): Likewise.
* modules/exclude (Link): Likewise.
* modules/propername (Link): Likewise.
* modules/regex-quote (Link): Likewise.
* modules/trim (Link): Likewise.
* modules/mbmemcasecmp-tests (Makefile.am): Link the test program
against libunistring.
* modules/mbscasecmp-tests (Makefile.am): Likewise.
* modules/mbscasestr-tests (Makefile.am): Likewise.
* modules/mbschr-tests (Makefile.am): Likewise.
* modules/mbscspn-tests (Makefile.am): Likewise.
* modules/mbsncasecmp-tests (Makefile.am): Likewise.
* modules/mbspbrk-tests (Makefile.am): Likewise.
* modules/mbspcasecmp-tests (Makefile.am): Likewise.
* modules/mbsrchr-tests (Makefile.am): Likewise.
* modules/mbsspn-tests (Makefile.am): Likewise.
* modules/mbsstr-tests (Makefile.am): Likewise.
* modules/exclude-tests (Makefile.am): Likewise.
* modules/regex-quote-tests (Makefile.am): Likewise.
2021-01-03 Bruno Haible <bruno@clisp.org>
c32ispunct tests: Avoid test failures on FreeBSD.

1
modules/exclude
View File

@@ -26,6 +26,7 @@ Include:
"exclude.h"
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(LIB_MBRTOWC)
License:

2
modules/exclude-tests
View File

@@ -26,4 +26,4 @@ TESTS += \
test-exclude8.sh
check_PROGRAMS += test-exclude
test_exclude_LDADD = $(LDADD) @LIBINTL@ $(LIB_MBRTOWC) $(LIBTHREAD)
test_exclude_LDADD = $(LDADD) $(LIBUNISTRING) @LIBINTL@ $(LIB_MBRTOWC) $(LIBTHREAD)

3
modules/mbchar
View File

@@ -27,6 +27,9 @@ lib_SOURCES += mbchar.c
Include:
"mbchar.h"
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
License:
LGPLv2+

1
modules/mbfile
View File

@@ -25,6 +25,7 @@ Include:
"mbfile.h"
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(LIB_MBRTOWC)
License:

1
modules/mbiter
View File

@@ -25,6 +25,7 @@ Include:
"mbiter.h"
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(LIB_MBRTOWC)
License:

1
modules/mbmemcasecmp
View File

@@ -17,6 +17,7 @@ Include:
"mbmemcasecmp.h"
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(LIB_MBRTOWC)
License:

2
modules/mbmemcasecmp-tests
View File

@@ -25,4 +25,4 @@ TESTS_ENVIRONMENT += \
LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
LOCALE_TR_UTF8='@LOCALE_TR_UTF8@'
check_PROGRAMS += test-mbmemcasecmp
test_mbmemcasecmp_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
test_mbmemcasecmp_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC)

1
modules/mbscasecmp
View File

@@ -18,6 +18,7 @@ Include:
<string.h>
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(LIB_MBRTOWC)
License:

2
modules/mbscasecmp-tests
View File

@@ -15,4 +15,4 @@ Makefile.am:
TESTS += test-mbscasecmp.sh
TESTS_ENVIRONMENT += LOCALE_TR_UTF8='@LOCALE_TR_UTF8@'
check_PROGRAMS += test-mbscasecmp
test_mbscasecmp_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
test_mbscasecmp_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC)

1
modules/mbscasestr
View File

@@ -23,6 +23,7 @@ Include:
<string.h>
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(LIB_MBRTOWC)
License:

8
modules/mbscasestr-tests
View File

@@ -24,7 +24,7 @@ Makefile.am:
TESTS += test-mbscasestr1 test-mbscasestr2.sh test-mbscasestr3.sh test-mbscasestr4.sh
TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_TR_UTF8='@LOCALE_TR_UTF8@' LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-mbscasestr1 test-mbscasestr2 test-mbscasestr3 test-mbscasestr4
test_mbscasestr1_LDADD = $(LDADD) $(LIB_MBRTOWC)
test_mbscasestr2_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
test_mbscasestr3_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
test_mbscasestr4_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
test_mbscasestr1_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_MBRTOWC)
test_mbscasestr2_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
test_mbscasestr3_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
test_mbscasestr4_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC)

1
modules/mbschr
View File

@@ -18,6 +18,7 @@ Include:
<string.h>
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(LIB_MBRTOWC)
License:

2
modules/mbschr-tests
View File

@@ -15,4 +15,4 @@ Makefile.am:
TESTS += test-mbschr.sh
TESTS_ENVIRONMENT += LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-mbschr
test_mbschr_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
test_mbschr_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC)

1
modules/mbscspn
View File

@@ -20,6 +20,7 @@ Include:
<string.h>
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(LIB_MBRTOWC)
License:

2
modules/mbscspn-tests
View File

@@ -15,4 +15,4 @@ Makefile.am:
TESTS += test-mbscspn.sh
TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
check_PROGRAMS += test-mbscspn
test_mbscspn_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
test_mbscspn_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC)

1
modules/mbslen
View File

@@ -20,6 +20,7 @@ Include:
<string.h>
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(LIB_MBRTOWC)
License:

1
modules/mbsncasecmp
View File

@@ -18,6 +18,7 @@ Include:
<string.h>
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(LIB_MBRTOWC)
License:

2
modules/mbsncasecmp-tests
View File

@@ -15,4 +15,4 @@ Makefile.am:
TESTS += test-mbsncasecmp.sh
TESTS_ENVIRONMENT += LOCALE_TR_UTF8='@LOCALE_TR_UTF8@'
check_PROGRAMS += test-mbsncasecmp
test_mbsncasecmp_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
test_mbsncasecmp_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC)

1
modules/mbsnlen
View File

@@ -18,6 +18,7 @@ Include:
<string.h>
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(LIB_MBRTOWC)
License:

1
modules/mbspbrk
View File

@@ -20,6 +20,7 @@ Include:
<string.h>
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(LIB_MBRTOWC)
License:

2
modules/mbspbrk-tests
View File

@@ -15,4 +15,4 @@ Makefile.am:
TESTS += test-mbspbrk.sh
TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
check_PROGRAMS += test-mbspbrk
test_mbspbrk_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
test_mbspbrk_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC)

1
modules/mbspcasecmp
View File

@@ -18,6 +18,7 @@ Include:
<string.h>
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(LIB_MBRTOWC)
License:

2
modules/mbspcasecmp-tests
View File

@@ -15,4 +15,4 @@ Makefile.am:
TESTS += test-mbspcasecmp.sh
TESTS_ENVIRONMENT += LOCALE_TR_UTF8='@LOCALE_TR_UTF8@'
check_PROGRAMS += test-mbspcasecmp
test_mbspcasecmp_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
test_mbspcasecmp_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC)

1
modules/mbsrchr
View File

@@ -18,6 +18,7 @@ Include:
<string.h>
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(LIB_MBRTOWC)
License:

2
modules/mbsrchr-tests
View File

@@ -15,4 +15,4 @@ Makefile.am:
TESTS += test-mbsrchr.sh
TESTS_ENVIRONMENT += LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-mbsrchr
test_mbsrchr_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
test_mbsrchr_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC)

1
modules/mbssep
View File

@@ -20,6 +20,7 @@ Include:
<string.h>
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(LIB_MBRTOWC)
License:

1
modules/mbsspn
View File

@@ -19,6 +19,7 @@ Include:
<string.h>
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(LIB_MBRTOWC)
License:

2
modules/mbsspn-tests
View File

@@ -15,4 +15,4 @@ Makefile.am:
TESTS += test-mbsspn.sh
TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
check_PROGRAMS += test-mbsspn
test_mbsspn_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
test_mbsspn_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC)

1
modules/mbsstr
View File

@@ -23,6 +23,7 @@ Include:
<string.h>
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(LIB_MBRTOWC)
License:

6
modules/mbsstr-tests
View File

@@ -20,6 +20,6 @@ Makefile.am:
TESTS += test-mbsstr1 test-mbsstr2.sh test-mbsstr3.sh
TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_ZH_CN='@LOCALE_ZH_CN@'
check_PROGRAMS += test-mbsstr1 test-mbsstr2 test-mbsstr3
test_mbsstr1_LDADD = $(LDADD) $(LIB_MBRTOWC)
test_mbsstr2_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
test_mbsstr3_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
test_mbsstr1_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_MBRTOWC)
test_mbsstr2_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC)
test_mbsstr3_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(LIB_MBRTOWC)

1
modules/mbstok_r
View File

@@ -21,6 +21,7 @@ Include:
<string.h>
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(LIB_MBRTOWC)
License:

1
modules/mbswidth
View File

@@ -26,6 +26,7 @@ Include:
"mbswidth.h"
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(LIB_MBRTOWC)
License:

1
modules/mbuiter
View File

@@ -26,6 +26,7 @@ Include:
"mbuiter.h"
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(LIB_MBRTOWC)
License:

1
modules/propername
View File

@@ -36,6 +36,7 @@ Include:
"propername.h"
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(LIB_MBRTOWC)
License:

1
modules/regex-quote
View File

@@ -20,6 +20,7 @@ Include:
"regex-quote.h"
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(LIB_MBRTOWC)
License:

2
modules/regex-quote-tests
View File

@@ -11,4 +11,4 @@ configure.ac:
Makefile.am:
TESTS += test-regex-quote
check_PROGRAMS += test-regex-quote
test_regex_quote_LDADD = $(LDADD) $(LIBINTL) $(LIB_MBRTOWC) $(LIBTHREAD)
test_regex_quote_LDADD = $(LDADD) $(LIBUNISTRING) $(LIBINTL) $(LIB_MBRTOWC) $(LIBTHREAD)

1
modules/trim
View File

@@ -21,6 +21,7 @@ Include:
"trim.h"
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
$(LIB_MBRTOWC)
License:

3
modules/wcswidth
View File

@@ -23,6 +23,9 @@ Makefile.am:
Include:
<wchar.h>
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
License:
LGPL

3
modules/wcwidth
View File

@@ -28,6 +28,9 @@ Makefile.am:
Include:
<wchar.h>
Link:
$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
License:
LGPLv2+