[vlc-commits] [Git][videolan/vlc][master] 2 commits: contrib: gettext: do not build any binary tools

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
381cc2fe by Steve Lhomme at 2025-09-18T12:39:38+00:00
contrib: gettext: do not build any binary tools

We don't use cross-compiled binaries. The binaries should come from extras/tools.

- - - - -
777a8a09 by Steve Lhomme at 2025-09-18T12:39:38+00:00
contrib: gettext: avoid doing RECONF on a gnulib based project

- - - - -


1 changed file:

- contrib/src/gettext/rules.mak


Changes:

=====================================
contrib/src/gettext/rules.mak
=====================================
@@ -18,11 +18,11 @@ gettext: gettext-$(GETTEXT_VERSION).tar.xz .sum-gettext
 	$(call update_autoconfig,build-aux)
 	$(call update_autoconfig,libtextstyle/build-aux)
 	# disable useless gettext-runtime targets
-	sed -i.orig -e 's,doc ,,' $(UNPACK_DIR)/gettext-runtime/Makefile.am
-	sed -i.orig -e 's,intl-java intl-csharp intl-d intl-modula2 ,,' $(UNPACK_DIR)/gettext-runtime/Makefile.am
-	sed -i.orig -e 's, tests,,' $(UNPACK_DIR)/gettext-runtime/Makefile.am
+	sed -i.orig -e 's,doc ,,g' $(UNPACK_DIR)/gettext-runtime/Makefile.in
+	sed -i.orig -e 's,intl-java intl-csharp intl-d intl-modula2 ,,g' $(UNPACK_DIR)/gettext-runtime/Makefile.in
+	sed -i.orig -e 's, tests,,g' $(UNPACK_DIR)/gettext-runtime/Makefile.in
 	# disable useless gettext-tools configure
-	sed -i.orig -e 's,gettext-runtime libtextstyle gettext-tools,gettext-runtime libtextstyle,' $(UNPACK_DIR)/configure.ac
+	sed -i.orig -e 's,gettext-runtime libtextstyle gettext-tools,gettext-runtime libtextstyle,g' $(UNPACK_DIR)/configure
 	$(MOVE)
 
 DEPS_gettext = iconv $(DEPS_iconv) libxml2 $(DEPS_libxml2)
@@ -56,9 +56,8 @@ GETTEXT_CONF += --with-libxml2-prefix=$(PREFIX)
 endif
 
 .gettext: gettext
-	$(RECONF)
 	$(MAKEBUILDDIR)
 	$(MAKECONFIGURE) $(GETTEXT_CONF)
-	+$(MAKEBUILD) -C gettext-runtime
-	+$(MAKEBUILD) -C gettext-runtime install
+	+$(MAKEBUILD) -C gettext-runtime bin_PROGRAMS=
+	+$(MAKEBUILD) -C gettext-runtime bin_PROGRAMS= install
 	touch $@



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/5f3c01fc06d6b5cec2bc14178e6fafa35039ed4a...777a8a09171d50706c391d0911a52a2a1f24fe54

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/5f3c01fc06d6b5cec2bc14178e6fafa35039ed4a...777a8a09171d50706c391d0911a52a2a1f24fe54
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance