Fix http: URL in 'configure'

[thirdparty/glibc.git] / iconv / Makefile

diff --git a/iconv/Makefile b/iconv/Makefile
index c245ff727f007f9a15adb1d332b0fb9d9f4bd1ea..b7a8f5e0d45b82547a2145f0f41dea5fd84b463e 100644 (file)
--- a/iconv/Makefile
+++ b/iconv/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1997,1998,2000,2001,2002,2003 Free Software Foundation, Inc.
+# Copyright (C) 1997-2019 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -12,9 +12,8 @@
 # Lesser General Public License for more details.
 
 # You should have received a copy of the GNU Lesser General Public
-# License along with the GNU C Library; if not, write to the Free
-# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
+# License along with the GNU C Library; if not, see
+# <https://www.gnu.org/licenses/>.
 
 #
 #      Makefile for iconv.
@@ -27,49 +26,58 @@ headers             = iconv.h gconv.h
 routines       = iconv_open iconv iconv_close \
                  gconv_open gconv gconv_close gconv_db gconv_conf \
                  gconv_builtin gconv_simple gconv_trans gconv_cache
-ifeq ($(elf),yes)
 routines       += gconv_dl
-else
-CFLAGS-gconv_db.c = -DSTATIC_GCONV
-CFLAGS-gconv_cache.c = -DSTATIC_GCONV
-CFLAGS-gconv_simple.c = -DSTATIC_GCONV
-endif
 
 vpath %.c ../locale/programs ../intl
 
 iconv_prog-modules = iconv_charmap charmap charmap-dir linereader \
-                    dummy-repertoire simple-hash xstrdup xmalloc
+                    dummy-repertoire simple-hash xstrdup xmalloc \
+                    record-status
 iconvconfig-modules = strtab xmalloc hash-string
 extra-objs        = $(iconv_prog-modules:=.o) $(iconvconfig-modules:=.o)
-CFLAGS-iconv_prog.c = -I../locale/programs
-CFLAGS-iconv_charmap.c = -I../locale/programs
-CFLAGS-dummy-repertoire.c = -I../locale/programs
-CFLAGS-charmap.c = -DCHARMAP_PATH='"$(i18ndir)/charmaps"' \
+CFLAGS-iconv_prog.c += -I../locale/programs
+CFLAGS-iconv_charmap.c += -I../locale/programs
+CFLAGS-dummy-repertoire.c += -I../locale/programs
+CFLAGS-charmap.c += -DCHARMAP_PATH='"$(i18ndir)/charmaps"' \
                   -DDEFAULT_CHARMAP=null_pointer -DNEED_NULL_POINTER
-CFLAGS-linereader.c = -DNO_TRANSLITERATION
-CFLAGS-simple-hash.c = -I../locale
-
-tests  = tst-iconv1 tst-iconv2 tst-iconv3 tst-iconv5
+CFLAGS-linereader.c += -DNO_TRANSLITERATION
+CFLAGS-simple-hash.c += -I../locale
 
-distribute     = gconv_builtin.h gconv_int.h loop.c skeleton.c iconv_prog.h \
-                 iconv_charmap.c dummy-repertoire.c gconv_charset.h strtab.c \
-                 iconvconfig.h
+tests  = tst-iconv1 tst-iconv2 tst-iconv3 tst-iconv4 tst-iconv5 tst-iconv6 \
+         tst-iconv7 tst-iconv-mt
 
 others         = iconv_prog iconvconfig
-install-others = $(inst_bindir)/iconv
+install-others-programs        = $(inst_bindir)/iconv
 install-sbin   = iconvconfig
 
 CFLAGS-gconv_cache.c += -DGCONV_DIR='"$(gconvdir)"'
-CFLAGS-gconv_conf.c = -DGCONV_PATH='"$(gconvdir)"'
-CFLAGS-iconvconfig.c = -DGCONV_PATH='"$(gconvdir)"' -DGCONV_DIR='"$(gconvdir)"'
+CFLAGS-gconv_conf.c += -DGCONV_PATH='"$(gconvdir)"'
+CFLAGS-iconvconfig.c += -DGCONV_PATH='"$(gconvdir)"' -DGCONV_DIR='"$(gconvdir)"'
+
+# Set libof-* for each routine.
+cpp-srcs-left := $(iconv_prog-modules) $(iconvconfig-modules)
+lib := iconvprogs
+include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left))
+
+ifeq ($(run-built-tests),yes)
+xtests-special += $(objpfx)test-iconvconfig.out
+endif
 
-CPPFLAGS-iconv_prog = -DNOT_IN_libc
-CPPFLAGS-iconv_charmap = -DNOT_IN_libc
-CPPFLAGS-iconvconfig = -DNOT_IN_libc
-CPPFLAGS-linereader = -DNOT_IN_libc
-CPPFLAGS-strtab = -DNOT_IN_libc
-CPPFLAGS-charmap = -DNOT_IN_libc
-CPPFLAGS-charmap-dir = -DNOT_IN_libc
+# Make a copy of the file because gconv module names are constructed
+# relative to the path of the configuration file.
+$(objpfx)gconv-modules: test-gconv-modules
+       cp $< $@
+
+$(objpfx)tst-iconv-mt: $(shared-thread-library)
+
+ifeq (yes,$(build-shared))
+tests += tst-gconv-init-failure
+modules-names += tst-gconv-init-failure-mod
+modules-names-tests += tst-gconv-init-failure-mod
+$(objpfx)tst-gconv-init-failure-mod.so: $(libsupport)
+$(objpfx)tst-gconv-init-failure.out: \
+ $(objpfx)gconv-modules $(objpfx)tst-gconv-init-failure-mod.so
+endif
 
 include ../Rules
 
@@ -78,3 +86,12 @@ $(inst_bindir)/iconv: $(objpfx)iconv_prog $(+force)
 
 $(objpfx)iconv_prog: $(iconv_prog-modules:%=$(objpfx)%.o)
 $(objpfx)iconvconfig: $(iconvconfig-modules:%=$(objpfx)%.o)
+
+$(objpfx)test-iconvconfig.out: /dev/null $(objpfx)iconvconfig
+       (set -e; \
+        tmp=$(objpfx)gconv-modules.cache.$$$$; \
+        rm -f $$tmp; \
+        $(make-test-out) --output=$$tmp --nostdlib $(inst_gconvdir); \
+        cmp $$tmp $(inst_gconvdir)/gconv-modules.cache; \
+        rm -f $$tmp) > $@; \
+       $(evaluate-test)