Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC-QT
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Chandrakant Jena
VLC-QT
Commits
942e2802
Commit
942e2802
authored
2 years ago
by
Steve Lhomme
Browse files
Options
Downloads
Patches
Plain Diff
contrib: aribb25: disable executables via the make call
We're closer to upstream.
parent
7d914896
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
contrib/src/aribb25/0001-add-an-option-not-to-build-the-b25-sample-code.patch
+0
-44
0 additions, 44 deletions
...0001-add-an-option-not-to-build-the-b25-sample-code.patch
contrib/src/aribb25/rules.mak
+3
-6
3 additions, 6 deletions
contrib/src/aribb25/rules.mak
with
3 additions
and
50 deletions
contrib/src/aribb25/0001-add-an-option-not-to-build-the-b25-sample-code.patch
deleted
100644 → 0
+
0
−
44
View file @
7d914896
From 3d18150434e374d1e7f3b2ff9973ff24c993dc36 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@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
This diff is collapsed.
Click to expand it.
contrib/src/aribb25/rules.mak
+
3
−
6
View file @
942e2802
...
...
@@ -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
$@
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment