[vlc-commits] [Git][videolan/vlc][master] 5 commits: contrib: aribb25: disable executables via the make call
Steve Lhomme (@robUx4)
gitlab at videolan.org
Wed Nov 30 09:59:48 UTC 2022
Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
942e2802 by Steve Lhomme at 2022-11-30T08:36:58+00:00
contrib: aribb25: disable executables via the make call
We're closer to upstream.
- - - - -
708dc5ba by Steve Lhomme at 2022-11-30T08:36:58+00:00
contrib: gpg-error: disable executables via the make call
- - - - -
276f4676 by Steve Lhomme at 2022-11-30T08:36:58+00:00
contrib: mpg123: disable executables via the make call
We need to keep the reconf otherwise it doesn't know about emscripten..
- - - - -
38e96f27 by Steve Lhomme at 2022-11-30T08:36:58+00:00
contrib: sqlite: disable executables via the make call
We avoid a reconfiguration.
- - - - -
34f6c1bd by Steve Lhomme at 2022-11-30T08:36:58+00:00
contrib: asdcplib: disable executables via the make call
We don't need any of the executables. They take space in the final prebuilt
tarballs.
- - - - -
9 changed files:
- − contrib/src/aribb25/0001-add-an-option-not-to-build-the-b25-sample-code.patch
- contrib/src/aribb25/rules.mak
- contrib/src/asdcplib/rules.mak
- − contrib/src/gpg-error/no-executable.patch
- contrib/src/gpg-error/rules.mak
- − contrib/src/mpg123/no-programs.patch
- contrib/src/mpg123/rules.mak
- contrib/src/sqlite/rules.mak
- − contrib/src/sqlite/sqlite-no-shell.patch
Changes:
=====================================
contrib/src/aribb25/0001-add-an-option-not-to-build-the-b25-sample-code.patch deleted
=====================================
@@ -1,44 +0,0 @@
-From 3d18150434e374d1e7f3b2ff9973ff24c993dc36 Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4 at ycbcr.xyz>
-Date: Wed, 3 Jun 2020 11:34:26 +0200
-Subject: [PATCH] add an option not to build the b25 sample code
-
-Given it's built with -Werror it may fail in many cases.
----
- Makefile.am | 2 ++
- configure.ac | 5 +++++
- 2 files changed, 7 insertions(+)
-
-diff --git a/Makefile.am b/Makefile.am
-index 0cf8e51..dd9ddc8 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -17,7 +17,9 @@ pkginclude_HEADERS = src/arib_std_b25_error_code.h src/b_cas_card_error_code.h \
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = src/aribb25.pc
-
-+if BUILD_B25
- bin_PROGRAMS = b25
-+endif
- b25_SOURCES = src/td.c
- b25_CFLAGS = $(AM_CFLAGS) -Wall -Werror $(pcsclite_CFLAGS)
- b25_LDADD = libaribb25.la $(pcsclite_LIBS) $(PCSC_LIBS)
-diff --git a/configure.ac b/configure.ac
-index baa856e..292a748 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -82,6 +82,11 @@ AS_IF([test "$SYS" = mingw32],[
- ], [AC_MSG_ERROR([${pcsclite_PKG_ERRORS}.])])
- ])
-
-+AC_ARG_ENABLE([b25],
-+ AS_HELP_STRING([--disable-b25], [don't build the b25 sample app]))
-+AM_CONDITIONAL([BUILD_B25], [test "${enable_b25}" != "no"])
-+
-+
- AC_CONFIG_HEADERS([src/config.h])
- AC_CONFIG_FILES([Makefile src/aribb25.pc])
- AC_OUTPUT
---
-2.26.0.windows.1
-
=====================================
contrib/src/aribb25/rules.mak
=====================================
@@ -24,15 +24,12 @@ aribb25: aribb25-$(ARIBB25_VERSION).tar.gz .sum-aribb25
$(UNPACK)
$(APPLY) $(SRC)/aribb25/0001-fix-build-script.patch
$(APPLY) $(SRC)/aribb25/0002-fix-libs-include.patch
- $(APPLY) $(SRC)/aribb25/0001-add-an-option-not-to-build-the-b25-sample-code.patch
$(MOVE)
-ARIBB25_CONF := --disable-b25
-
.aribb25: aribb25
$(RECONF)
$(MAKEBUILDDIR)
- $(MAKECONFIGURE) $(ARIBB25_CONF)
- +$(MAKEBUILD)
- +$(MAKEBUILD) install
+ $(MAKECONFIGURE)
+ +$(MAKEBUILD) bin_PROGRAMS=
+ +$(MAKEBUILD) bin_PROGRAMS= install
touch $@
=====================================
contrib/src/asdcplib/rules.mak
=====================================
@@ -42,6 +42,6 @@ ASDCPLIB_CONF += CXXFLAGS="$(ASDCPLIB_CXXFLAGS)"
$(RECONF)
$(MAKEBUILDDIR)
$(MAKECONFIGURE) $(ASDCPLIB_CONF)
- +$(MAKEBUILD)
- +$(MAKEBUILD) install
+ +$(MAKEBUILD) bin_PROGRAMS=
+ +$(MAKEBUILD) bin_PROGRAMS= install
touch $@
=====================================
contrib/src/gpg-error/no-executable.patch deleted
=====================================
@@ -1,11 +0,0 @@
---- libgpg-error/src/Makefile.am.orig 2014-10-25 14:42:43.000000000 +0200
-+++ libgpg-error/src/Makefile.am 2015-05-05 16:59:40.887486960 +0200
-@@ -31,7 +31,7 @@
-
- localedir = $(datadir)/locale
-
--bin_PROGRAMS = gpg-error
-+bin_PROGRAMS =
-
- if HAVE_W32_SYSTEM
- noinst_PROGRAMS = gen-w32-lock-obj
=====================================
contrib/src/gpg-error/rules.mak
=====================================
@@ -20,7 +20,6 @@ ifdef HAVE_WINSTORE
endif
endif
$(APPLY) $(SRC)/gpg-error/missing-unistd-include.patch
- $(APPLY) $(SRC)/gpg-error/no-executable.patch
$(APPLY) $(SRC)/gpg-error/win32-unicode.patch
$(APPLY) $(SRC)/gpg-error/version-bump-gawk-5.patch
$(APPLY) $(SRC)/gpg-error/win32-extern-struct.patch
@@ -41,6 +40,6 @@ GPGERROR_CONF := \
$(RECONF)
cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(GPGERROR_CONF)
# pre_mkheader_cmds would delete our lock-obj-pub-native.h
- $(MAKE) -C $< pre_mkheader_cmds=true
- $(MAKE) -C $< pre_mkheader_cmds=true install
+ $(MAKE) -C $< pre_mkheader_cmds=true bin_PROGRAMS=
+ $(MAKE) -C $< pre_mkheader_cmds=true bin_PROGRAMS= install
touch $@
=====================================
contrib/src/mpg123/no-programs.patch deleted
=====================================
@@ -1,16 +0,0 @@
-diff -Naur mpg123/src/Makemodule.am mpg123.new/src/Makemodule.am
---- mpg123/src/Makemodule.am 2016-09-26 23:20:25.000000000 +0200
-+++ mpg123.new/src/Makemodule.am 2016-12-21 17:40:12.917251022 +0100
-@@ -4,12 +4,6 @@
- include src/libmpg123/Makemodule.am
- include src/libout123/Makemodule.am
-
--bin_PROGRAMS += \
-- src/mpg123 \
-- src/out123 \
-- src/mpg123-id3dump \
-- src/mpg123-strip
--
- src_mpg123_LDADD = \
- src/compat/libcompat.la \
- src/libmpg123/libmpg123.la \
=====================================
contrib/src/mpg123/rules.mak
=====================================
@@ -36,7 +36,6 @@ $(TARBALLS)/mpg123-$(MPG123_VERSION).tar.bz2:
mpg123: mpg123-$(MPG123_VERSION).tar.bz2 .sum-mpg123
$(UNPACK)
- $(APPLY) $(SRC)/mpg123/no-programs.patch
$(call pkg_static,"libmpg123.pc.in")
$(MOVE)
@@ -44,6 +43,6 @@ mpg123: mpg123-$(MPG123_VERSION).tar.bz2 .sum-mpg123
$(RECONF)
$(MAKEBUILDDIR)
$(MAKECONFIGURE) $(MPG123CONF)
- +$(MAKEBUILD)
- +$(MAKEBUILD) install
+ +$(MAKEBUILD) bin_PROGRAMS=
+ +$(MAKEBUILD) bin_PROGRAMS= install
touch $@
=====================================
contrib/src/sqlite/rules.mak
=====================================
@@ -9,7 +9,7 @@ ifeq ($(call need_pkg,"sqlite3 >= 3.33.0"),)
PKGS_FOUND += sqlite
endif
-SQLITE_CONF = --disable-readline --disable-shell
+SQLITE_CONF = --disable-readline
ifdef HAVE_WINSTORE
SQLITE_CONF += CFLAGS="$(CFLAGS) -DSQLITE_OS_WINRT=1"
@@ -22,14 +22,12 @@ $(TARBALLS)/sqlite-autoconf-$(SQLITE_VERSION).tar.gz:
sqlite: sqlite-autoconf-$(SQLITE_VERSION).tar.gz .sum-sqlite
$(UNPACK)
- $(APPLY) $(SRC)/sqlite/sqlite-no-shell.patch
$(call pkg_static, "sqlite3.pc.in")
$(MOVE)
.sqlite: sqlite
- $(RECONF)
$(MAKEBUILDDIR)
$(MAKECONFIGURE) $(SQLITE_CONF)
- +$(MAKEBUILD)
- +$(MAKEBUILD) install
+ +$(MAKEBUILD) bin_PROGRAMS=
+ +$(MAKEBUILD) bin_PROGRAMS= install
touch $@
=====================================
contrib/src/sqlite/sqlite-no-shell.patch deleted
=====================================
@@ -1,31 +0,0 @@
---- sqlite/configure.ac.noshell 2020-04-09 10:07:14.127078500 +0200
-+++ sqlite/configure.ac 2020-04-09 10:03:50.435193500 +0200
-@@ -203,6 +203,16 @@ fi
- AC_SUBST(EXTRA_SHELL_OBJ)
- #-----------------------------------------------------------------------
-
-+#-----------------------------------------------------------------------
-+# --disable-shell
-+#
-+AC_ARG_ENABLE(shell, [AS_HELP_STRING(
-+ [--enable-shell],
-+ [build the shell tool [default=yes]])],
-+ [], [enable_shell=yes])
-+AM_CONDITIONAL([BUILD_SHELL], [test x"$enable_shell" = "xyes"])
-+#-----------------------------------------------------------------------
-+
- AC_CHECK_FUNCS(posix_fallocate)
- AC_CHECK_HEADERS(zlib.h,[
- AC_SEARCH_LIBS(deflate,z,[BUILD_CFLAGS="$BUILD_CFLAGS -DSQLITE_HAVE_ZLIB"])
---- sqlite/Makefile.am.noshell 2020-04-09 10:07:10.055569100 +0200
-+++ sqlite/Makefile.am 2020-04-09 10:04:00.028577700 +0200
-@@ -4,7 +4,9 @@ lib_LTLIBRARIES = libsqlite3.la
- libsqlite3_la_SOURCES = sqlite3.c
- libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8
-
-+if BUILD_SHELL
- bin_PROGRAMS = sqlite3
-+endif
- sqlite3_SOURCES = shell.c sqlite3.h
- EXTRA_sqlite3_SOURCES = sqlite3.c
- sqlite3_LDADD = @EXTRA_SHELL_OBJ@ @READLINE_LIBS@
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/7d914896494b944ce3eb65371ccd3d83785a37e9...34f6c1bdb1624b7af31cee3ff40b7d786502048f
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/7d914896494b944ce3eb65371ccd3d83785a37e9...34f6c1bdb1624b7af31cee3ff40b7d786502048f
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
More information about the vlc-commits
mailing list