[vlc-commits] [Git][videolan/vlc][3.0.x] 4 commits: contrib: gettext: disable building native tools

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC


Commits:
ce362903 by Steve Lhomme at 2025-10-14T06:47:51+00:00
contrib: gettext: disable building native tools

We only need the runtime part to compile/link with.
The native tools are in the system or in extras/tools.

Similar to 031aff1c30a635c83578b30a90e52e37aa9f5c8a

- - - - -
29f765a5 by Steve Lhomme at 2025-10-14T06:47:51+00:00
contrib: gettext: use MAKEBUILD macros

- - - - -
53cb37cc by Steve Lhomme at 2025-10-14T06:47:51+00:00
contrib: gettext: do not build any binary tools

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

(cherry picked from commit 381cc2fe7777460d896c60580fc1dc111600c7ff)

- - - - -
922f6d11 by Steve Lhomme at 2025-10-14T06:47:51+00:00
contrib: gettext: only explicitly disable faccessat usage

The other calls were used for native tools that we don't build.

- - - - -


1 changed file:

- contrib/src/gettext/rules.mak


Changes:

=====================================
contrib/src/gettext/rules.mak
=====================================
@@ -69,30 +69,15 @@ ifdef HAVE_MACOSX
 # using headers (which would make them unavailable with
 # -Werror=partial-availability), so we need to manually mark them unavailable.
 # These are unavailable in macOS 10.7.
-GETTEXT_CONF += \
-    ac_cv_func_clock_gettime=no \
-    ac_cv_func_faccessat=no \
-    ac_cv_func_fdopendir=no \
-    ac_cv_func_futimens=no \
-    ac_cv_func_memset_s=no \
-    ac_cv_func_openat=no \
-    ac_cv_func_utimensat=no
+
+# macOS 10.10
+GETTEXT_CONF += ac_cv_func_faccessat=no
+
 endif
 
 .gettext: gettext
-	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(GETTEXT_CONF)
-	$(MAKE) -C $< -C gettext-runtime
-ifndef HAVE_ANDROID
-	# build libgettextpo first so we can use its textstyle.h and unistd.h (fsync)
-	$(MAKE) -C $< -C gettext-tools -C libgettextpo
-	cd $< && cp gettext-tools/libgettextpo/textstyle.h gettext-tools/src/textstyle.h
-	cd $< && cp gettext-tools/libgettextpo/unistd.h    gettext-tools/src/unistd.h
-	$(MAKE) -C $< -C gettext-tools
-	$(MAKE) -C $< -C gettext-tools install
-else
-	# Android 32bits does not have localeconv
-	$(MAKE) -C $< -C gettext-tools/misc install
-	$(MAKE) -C $< -C gettext-tools/m4 install
-endif
-	cd $< && $(MAKE) -C gettext-runtime install
+	$(MAKEBUILDDIR)
+	$(MAKECONFIGURE) $(GETTEXT_CONF)
+	+$(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/ee9412bc0feaa5351736830ef7683a6ac8512d41...922f6d11598b6bbfc6d8c71cb844801e1644b781

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/ee9412bc0feaa5351736830ef7683a6ac8512d41...922f6d11598b6bbfc6d8c71cb844801e1644b781
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance