gettext: disable install, docs targets, libasprintf, threads
This fixes issues reported by David Edelsohn <dje.gcc@gmail.com>, and by
Eric Gallager <egallager@gcc.gnu.org>.
ChangeLog:
* Makefile.def (gettext): Disable (via missing)
{install-,}{pdf,html,info,dvi} and TAGS targets. Set no_install
to true. Add --disable-threads --disable-libasprintf. Drop the
lib_path (as there are no shared libs).
* Makefile.in: Regenerate.
This commit is contained in:
Arsen Arsenović
Arsen Arsenović
parent
eb6c2bcb67
commit
36cb7be477
2 changed files with 40 additions and 175 deletions
13
Makefile.def
13
Makefile.def
|
|
@ -80,8 +80,17 @@ host_modules= { module= gettext; bootstrap=true; no_install=true;
|
|||
// need it in some configuratons, which is determined via nontrivial tests.
|
||||
// Always enabling pic seems to make sense for something tied to
|
||||
// user-facing output.
|
||||
extra_configure_flags='--disable-shared --disable-java --disable-csharp --with-pic';
|
||||
lib_path=intl/.libs; };
|
||||
extra_configure_flags='--disable-shared --disable-threads --disable-java --disable-csharp --with-pic --disable-libasprintf';
|
||||
missing= pdf;
|
||||
missing= html;
|
||||
missing= info;
|
||||
missing= dvi;
|
||||
missing= install-pdf;
|
||||
missing= install-html;
|
||||
missing= install-info;
|
||||
missing= install-dvi;
|
||||
missing= TAGS;
|
||||
no_install= true; };
|
||||
host_modules= { module= tcl;
|
||||
missing=mostlyclean; };
|
||||
host_modules= { module= itcl; };
|
||||
|
|
|
|||
202
Makefile.in
202
Makefile.in
|
|
@ -768,7 +768,7 @@ TARGET_LIB_PATH_libatomic = $$r/$(TARGET_SUBDIR)/libatomic/.libs:
|
|||
|
||||
# This is the list of directories that may be needed in RPATH_ENVVAR
|
||||
# so that programs built for the host machine work.
|
||||
HOST_LIB_PATH = $(HOST_LIB_PATH_gmp)$(HOST_LIB_PATH_mpfr)$(HOST_LIB_PATH_mpc)$(HOST_LIB_PATH_isl)$(HOST_LIB_PATH_gettext)
|
||||
HOST_LIB_PATH = $(HOST_LIB_PATH_gmp)$(HOST_LIB_PATH_mpfr)$(HOST_LIB_PATH_mpc)$(HOST_LIB_PATH_isl)
|
||||
|
||||
# Define HOST_LIB_PATH_gcc here, for the sake of TARGET_LIB_PATH, ouch
|
||||
@if gcc
|
||||
|
|
@ -796,11 +796,6 @@ HOST_LIB_PATH_isl = \
|
|||
$$r/$(HOST_SUBDIR)/isl/.libs:$$r/$(HOST_SUBDIR)/prev-isl/.libs:
|
||||
@endif isl
|
||||
|
||||
@if gettext
|
||||
HOST_LIB_PATH_gettext = \
|
||||
$$r/$(HOST_SUBDIR)/gettext/intl/.libs:$$r/$(HOST_SUBDIR)/prev-gettext/intl/.libs:
|
||||
@endif gettext
|
||||
|
||||
|
||||
CXX_FOR_TARGET_FLAG_TO_PASS = \
|
||||
"CXX_FOR_TARGET=$(CXX_FOR_TARGET)"
|
||||
|
|
@ -19827,7 +19822,7 @@ configure-gettext:
|
|||
$$s/$$module_srcdir/configure \
|
||||
--srcdir=$${topdir}/$$module_srcdir \
|
||||
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
|
||||
--target=${target_alias} --disable-shared --disable-java --disable-csharp --with-pic \
|
||||
--target=${target_alias} --disable-shared --disable-threads --disable-java --disable-csharp --with-pic --disable-libasprintf \
|
||||
|| exit 1
|
||||
@endif gettext
|
||||
|
||||
|
|
@ -19863,7 +19858,7 @@ configure-stage1-gettext:
|
|||
--target=${target_alias} \
|
||||
\
|
||||
$(STAGE1_CONFIGURE_FLAGS) \
|
||||
--disable-shared --disable-java --disable-csharp --with-pic
|
||||
--disable-shared --disable-threads --disable-java --disable-csharp --with-pic --disable-libasprintf
|
||||
@endif gettext-bootstrap
|
||||
|
||||
.PHONY: configure-stage2-gettext maybe-configure-stage2-gettext
|
||||
|
|
@ -19897,7 +19892,7 @@ configure-stage2-gettext:
|
|||
--target=${target_alias} \
|
||||
--with-build-libsubdir=$(HOST_SUBDIR) \
|
||||
$(STAGE2_CONFIGURE_FLAGS) \
|
||||
--disable-shared --disable-java --disable-csharp --with-pic
|
||||
--disable-shared --disable-threads --disable-java --disable-csharp --with-pic --disable-libasprintf
|
||||
@endif gettext-bootstrap
|
||||
|
||||
.PHONY: configure-stage3-gettext maybe-configure-stage3-gettext
|
||||
|
|
@ -19931,7 +19926,7 @@ configure-stage3-gettext:
|
|||
--target=${target_alias} \
|
||||
--with-build-libsubdir=$(HOST_SUBDIR) \
|
||||
$(STAGE3_CONFIGURE_FLAGS) \
|
||||
--disable-shared --disable-java --disable-csharp --with-pic
|
||||
--disable-shared --disable-threads --disable-java --disable-csharp --with-pic --disable-libasprintf
|
||||
@endif gettext-bootstrap
|
||||
|
||||
.PHONY: configure-stage4-gettext maybe-configure-stage4-gettext
|
||||
|
|
@ -19965,7 +19960,7 @@ configure-stage4-gettext:
|
|||
--target=${target_alias} \
|
||||
--with-build-libsubdir=$(HOST_SUBDIR) \
|
||||
$(STAGE4_CONFIGURE_FLAGS) \
|
||||
--disable-shared --disable-java --disable-csharp --with-pic
|
||||
--disable-shared --disable-threads --disable-java --disable-csharp --with-pic --disable-libasprintf
|
||||
@endif gettext-bootstrap
|
||||
|
||||
.PHONY: configure-stageprofile-gettext maybe-configure-stageprofile-gettext
|
||||
|
|
@ -19999,7 +19994,7 @@ configure-stageprofile-gettext:
|
|||
--target=${target_alias} \
|
||||
--with-build-libsubdir=$(HOST_SUBDIR) \
|
||||
$(STAGEprofile_CONFIGURE_FLAGS) \
|
||||
--disable-shared --disable-java --disable-csharp --with-pic
|
||||
--disable-shared --disable-threads --disable-java --disable-csharp --with-pic --disable-libasprintf
|
||||
@endif gettext-bootstrap
|
||||
|
||||
.PHONY: configure-stagetrain-gettext maybe-configure-stagetrain-gettext
|
||||
|
|
@ -20033,7 +20028,7 @@ configure-stagetrain-gettext:
|
|||
--target=${target_alias} \
|
||||
--with-build-libsubdir=$(HOST_SUBDIR) \
|
||||
$(STAGEtrain_CONFIGURE_FLAGS) \
|
||||
--disable-shared --disable-java --disable-csharp --with-pic
|
||||
--disable-shared --disable-threads --disable-java --disable-csharp --with-pic --disable-libasprintf
|
||||
@endif gettext-bootstrap
|
||||
|
||||
.PHONY: configure-stagefeedback-gettext maybe-configure-stagefeedback-gettext
|
||||
|
|
@ -20067,7 +20062,7 @@ configure-stagefeedback-gettext:
|
|||
--target=${target_alias} \
|
||||
--with-build-libsubdir=$(HOST_SUBDIR) \
|
||||
$(STAGEfeedback_CONFIGURE_FLAGS) \
|
||||
--disable-shared --disable-java --disable-csharp --with-pic
|
||||
--disable-shared --disable-threads --disable-java --disable-csharp --with-pic --disable-libasprintf
|
||||
@endif gettext-bootstrap
|
||||
|
||||
.PHONY: configure-stageautoprofile-gettext maybe-configure-stageautoprofile-gettext
|
||||
|
|
@ -20101,7 +20096,7 @@ configure-stageautoprofile-gettext:
|
|||
--target=${target_alias} \
|
||||
--with-build-libsubdir=$(HOST_SUBDIR) \
|
||||
$(STAGEautoprofile_CONFIGURE_FLAGS) \
|
||||
--disable-shared --disable-java --disable-csharp --with-pic
|
||||
--disable-shared --disable-threads --disable-java --disable-csharp --with-pic --disable-libasprintf
|
||||
@endif gettext-bootstrap
|
||||
|
||||
.PHONY: configure-stageautofeedback-gettext maybe-configure-stageautofeedback-gettext
|
||||
|
|
@ -20135,7 +20130,7 @@ configure-stageautofeedback-gettext:
|
|||
--target=${target_alias} \
|
||||
--with-build-libsubdir=$(HOST_SUBDIR) \
|
||||
$(STAGEautofeedback_CONFIGURE_FLAGS) \
|
||||
--disable-shared --disable-java --disable-csharp --with-pic
|
||||
--disable-shared --disable-threads --disable-java --disable-csharp --with-pic --disable-libasprintf
|
||||
@endif gettext-bootstrap
|
||||
|
||||
|
||||
|
|
@ -20592,23 +20587,8 @@ maybe-info-gettext:
|
|||
@if gettext
|
||||
maybe-info-gettext: info-gettext
|
||||
|
||||
info-gettext: \
|
||||
configure-gettext
|
||||
@[ -f ./gettext/Makefile ] || exit 0; \
|
||||
r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
$(HOST_EXPORTS) \
|
||||
for flag in $(EXTRA_HOST_FLAGS) ; do \
|
||||
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
|
||||
done; \
|
||||
echo "Doing info in gettext"; \
|
||||
(cd $(HOST_SUBDIR)/gettext && \
|
||||
$(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
|
||||
"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
|
||||
"RANLIB=$${RANLIB}" \
|
||||
"DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
|
||||
info) \
|
||||
|| exit 1
|
||||
# gettext doesn't support info.
|
||||
info-gettext:
|
||||
|
||||
@endif gettext
|
||||
|
||||
|
|
@ -20617,23 +20597,8 @@ maybe-dvi-gettext:
|
|||
@if gettext
|
||||
maybe-dvi-gettext: dvi-gettext
|
||||
|
||||
dvi-gettext: \
|
||||
configure-gettext
|
||||
@[ -f ./gettext/Makefile ] || exit 0; \
|
||||
r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
$(HOST_EXPORTS) \
|
||||
for flag in $(EXTRA_HOST_FLAGS) ; do \
|
||||
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
|
||||
done; \
|
||||
echo "Doing dvi in gettext"; \
|
||||
(cd $(HOST_SUBDIR)/gettext && \
|
||||
$(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
|
||||
"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
|
||||
"RANLIB=$${RANLIB}" \
|
||||
"DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
|
||||
dvi) \
|
||||
|| exit 1
|
||||
# gettext doesn't support dvi.
|
||||
dvi-gettext:
|
||||
|
||||
@endif gettext
|
||||
|
||||
|
|
@ -20642,23 +20607,8 @@ maybe-pdf-gettext:
|
|||
@if gettext
|
||||
maybe-pdf-gettext: pdf-gettext
|
||||
|
||||
pdf-gettext: \
|
||||
configure-gettext
|
||||
@[ -f ./gettext/Makefile ] || exit 0; \
|
||||
r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
$(HOST_EXPORTS) \
|
||||
for flag in $(EXTRA_HOST_FLAGS) ; do \
|
||||
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
|
||||
done; \
|
||||
echo "Doing pdf in gettext"; \
|
||||
(cd $(HOST_SUBDIR)/gettext && \
|
||||
$(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
|
||||
"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
|
||||
"RANLIB=$${RANLIB}" \
|
||||
"DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
|
||||
pdf) \
|
||||
|| exit 1
|
||||
# gettext doesn't support pdf.
|
||||
pdf-gettext:
|
||||
|
||||
@endif gettext
|
||||
|
||||
|
|
@ -20667,23 +20617,8 @@ maybe-html-gettext:
|
|||
@if gettext
|
||||
maybe-html-gettext: html-gettext
|
||||
|
||||
html-gettext: \
|
||||
configure-gettext
|
||||
@[ -f ./gettext/Makefile ] || exit 0; \
|
||||
r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
$(HOST_EXPORTS) \
|
||||
for flag in $(EXTRA_HOST_FLAGS) ; do \
|
||||
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
|
||||
done; \
|
||||
echo "Doing html in gettext"; \
|
||||
(cd $(HOST_SUBDIR)/gettext && \
|
||||
$(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
|
||||
"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
|
||||
"RANLIB=$${RANLIB}" \
|
||||
"DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
|
||||
html) \
|
||||
|| exit 1
|
||||
# gettext doesn't support html.
|
||||
html-gettext:
|
||||
|
||||
@endif gettext
|
||||
|
||||
|
|
@ -20692,23 +20627,8 @@ maybe-TAGS-gettext:
|
|||
@if gettext
|
||||
maybe-TAGS-gettext: TAGS-gettext
|
||||
|
||||
TAGS-gettext: \
|
||||
configure-gettext
|
||||
@[ -f ./gettext/Makefile ] || exit 0; \
|
||||
r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
$(HOST_EXPORTS) \
|
||||
for flag in $(EXTRA_HOST_FLAGS) ; do \
|
||||
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
|
||||
done; \
|
||||
echo "Doing TAGS in gettext"; \
|
||||
(cd $(HOST_SUBDIR)/gettext && \
|
||||
$(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
|
||||
"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
|
||||
"RANLIB=$${RANLIB}" \
|
||||
"DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
|
||||
TAGS) \
|
||||
|| exit 1
|
||||
# gettext doesn't support TAGS.
|
||||
TAGS-gettext:
|
||||
|
||||
@endif gettext
|
||||
|
||||
|
|
@ -20717,24 +20637,8 @@ maybe-install-info-gettext:
|
|||
@if gettext
|
||||
maybe-install-info-gettext: install-info-gettext
|
||||
|
||||
install-info-gettext: \
|
||||
configure-gettext \
|
||||
info-gettext
|
||||
@[ -f ./gettext/Makefile ] || exit 0; \
|
||||
r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
$(HOST_EXPORTS) \
|
||||
for flag in $(EXTRA_HOST_FLAGS) ; do \
|
||||
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
|
||||
done; \
|
||||
echo "Doing install-info in gettext"; \
|
||||
(cd $(HOST_SUBDIR)/gettext && \
|
||||
$(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
|
||||
"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
|
||||
"RANLIB=$${RANLIB}" \
|
||||
"DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
|
||||
install-info) \
|
||||
|| exit 1
|
||||
# gettext doesn't support install-info.
|
||||
install-info-gettext:
|
||||
|
||||
@endif gettext
|
||||
|
||||
|
|
@ -20743,24 +20647,8 @@ maybe-install-dvi-gettext:
|
|||
@if gettext
|
||||
maybe-install-dvi-gettext: install-dvi-gettext
|
||||
|
||||
install-dvi-gettext: \
|
||||
configure-gettext \
|
||||
dvi-gettext
|
||||
@[ -f ./gettext/Makefile ] || exit 0; \
|
||||
r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
$(HOST_EXPORTS) \
|
||||
for flag in $(EXTRA_HOST_FLAGS) ; do \
|
||||
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
|
||||
done; \
|
||||
echo "Doing install-dvi in gettext"; \
|
||||
(cd $(HOST_SUBDIR)/gettext && \
|
||||
$(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
|
||||
"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
|
||||
"RANLIB=$${RANLIB}" \
|
||||
"DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
|
||||
install-dvi) \
|
||||
|| exit 1
|
||||
# gettext doesn't support install-dvi.
|
||||
install-dvi-gettext:
|
||||
|
||||
@endif gettext
|
||||
|
||||
|
|
@ -20769,24 +20657,8 @@ maybe-install-pdf-gettext:
|
|||
@if gettext
|
||||
maybe-install-pdf-gettext: install-pdf-gettext
|
||||
|
||||
install-pdf-gettext: \
|
||||
configure-gettext \
|
||||
pdf-gettext
|
||||
@[ -f ./gettext/Makefile ] || exit 0; \
|
||||
r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
$(HOST_EXPORTS) \
|
||||
for flag in $(EXTRA_HOST_FLAGS) ; do \
|
||||
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
|
||||
done; \
|
||||
echo "Doing install-pdf in gettext"; \
|
||||
(cd $(HOST_SUBDIR)/gettext && \
|
||||
$(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
|
||||
"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
|
||||
"RANLIB=$${RANLIB}" \
|
||||
"DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
|
||||
install-pdf) \
|
||||
|| exit 1
|
||||
# gettext doesn't support install-pdf.
|
||||
install-pdf-gettext:
|
||||
|
||||
@endif gettext
|
||||
|
||||
|
|
@ -20795,24 +20667,8 @@ maybe-install-html-gettext:
|
|||
@if gettext
|
||||
maybe-install-html-gettext: install-html-gettext
|
||||
|
||||
install-html-gettext: \
|
||||
configure-gettext \
|
||||
html-gettext
|
||||
@[ -f ./gettext/Makefile ] || exit 0; \
|
||||
r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
$(HOST_EXPORTS) \
|
||||
for flag in $(EXTRA_HOST_FLAGS) ; do \
|
||||
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
|
||||
done; \
|
||||
echo "Doing install-html in gettext"; \
|
||||
(cd $(HOST_SUBDIR)/gettext && \
|
||||
$(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
|
||||
"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
|
||||
"RANLIB=$${RANLIB}" \
|
||||
"DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
|
||||
install-html) \
|
||||
|| exit 1
|
||||
# gettext doesn't support install-html.
|
||||
install-html-gettext:
|
||||
|
||||
@endif gettext
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue