Bump Buildroot Version to buildroot 2019_02_6
This commit is contained in:
@@ -0,0 +1,63 @@
|
||||
From 77ac8fcb78e3085577cd4eb5c4ac7746a5444f13 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Fri, 17 May 2019 15:48:35 +0200
|
||||
Subject: [PATCH] Add --disable-documentation option
|
||||
|
||||
This option allows the user to disable man pages which can be useful if
|
||||
podman is not available
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://github.com/LudovicRousseau/PCSC/pull/60]
|
||||
---
|
||||
configure.ac | 7 +++++++
|
||||
src/spy/Makefile.am | 2 ++
|
||||
2 files changed, 9 insertions(+)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 0fa5168..7d20c6e 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -144,6 +144,12 @@ esac
|
||||
AC_DEFINE_UNQUOTED(PCSC_ARCH, "$PCSC_ARCH", [PC/SC target architecture])
|
||||
PCSCLITE_FEATURES="${PCSCLITE_FEATURES} $PCSC_ARCH $host"
|
||||
|
||||
+# --disable-documentation
|
||||
+AC_ARG_ENABLE(documentation,
|
||||
+ AS_HELP_STRING([--disable-documentation],[do not build documentation]),
|
||||
+ [ enable_doc="${enableval}" ], [ enable_doc="yes" ] )
|
||||
+AM_CONDITIONAL(ENABLE_DOC, test "$enable_doc" != "no")
|
||||
+
|
||||
# See if socket() is found from libsocket
|
||||
AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"])
|
||||
|
||||
@@ -446,6 +452,7 @@ use libsystemd: ${use_libsystemd}
|
||||
systemd unit directory: ${with_systemdsystemunitdir}
|
||||
serial config dir.: ${confdir_exp}
|
||||
filter: ${use_filter}
|
||||
+documentation: ${enable_doc}
|
||||
|
||||
PCSCLITE_FEATURES: ${PCSCLITE_FEATURES}
|
||||
|
||||
diff --git a/src/spy/Makefile.am b/src/spy/Makefile.am
|
||||
index 3c3daee..0a83371 100644
|
||||
--- a/src/spy/Makefile.am
|
||||
+++ b/src/spy/Makefile.am
|
||||
@@ -6,6 +6,7 @@ dist_bin_SCRIPTS = pcsc-spy
|
||||
libpcscspy_la_SOURCES = \
|
||||
libpcscspy.c
|
||||
|
||||
+if ENABLE_DOC
|
||||
man_MANS = pcsc-spy.1
|
||||
|
||||
pcsc-spy.1: pcsc-spy.pod
|
||||
@@ -13,6 +14,7 @@ pcsc-spy.1: pcsc-spy.pod
|
||||
--center="PC/SC lite" \
|
||||
--release="$(PACKAGE_NAME) $(PACKAGE_VERSION)" \
|
||||
$(srcdir)/pcsc-spy.pod > $@
|
||||
+endif
|
||||
|
||||
EXTRA_DIST = install_spy.sh uninstall_spy.sh pcsc-spy.pod
|
||||
CLEANFILES = pcsc-spy.1
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
configure.ac: explicitly add pthread cflags/libs in the libusb test
|
||||
|
||||
If libusb-config does not exist, LIBUSB_CFLAGS and PTHREAD_CFLAGS will be
|
||||
empty, and the test for libusb will be performed without additional flags.
|
||||
However, when libusb needs threads, some extra flags are needed (depending
|
||||
on the platform), like -pthreads, -lpthread, etc. Without these flags, the
|
||||
test for libusb_init() will fail to link correctly, and pcsc-lite will fail
|
||||
detecting libusb.
|
||||
|
||||
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
|
||||
|
||||
Upstream-status: will be submitted
|
||||
|
||||
---
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -254,8 +254,8 @@ if test "x$use_libusb" != xno ; then
|
||||
saved_CPPFLAGS="$CPPFLAGS"
|
||||
saved_LIBS="$LIBS"
|
||||
|
||||
- CPPFLAGS="$CPPFLAGS $LIBUSB_CFLAGS"
|
||||
- LIBS="$LDFLAGS $LIBUSB_LIBS"
|
||||
+ CPPFLAGS="$CPPFLAGS $LIBUSB_CFLAGS $PTHREAD_CFLAGS"
|
||||
+ LIBS="$LDFLAGS $LIBUSB_LIBS $PTHREAD_LIBS"
|
||||
|
||||
AC_CHECK_HEADERS(libusb.h, [],
|
||||
[ AC_MSG_ERROR([libusb.h not found, use ./configure LIBUSB_CFLAGS=...]) ])
|
||||
@@ -1,3 +1,4 @@
|
||||
# Locally calculated
|
||||
sha256 5a27262586eff39cfd5c19aadc8891dd71c0818d3d629539bd631b958be689c9 pcsc-lite-1.8.23.tar.bz2
|
||||
sha256 2ce8f52bc5afa74f223121955e4e6328c432b16044ea535acd550435dda2b5db COPYING
|
||||
sha256 d76d79edc31cf76e782b9f697420d3defbcc91778c3c650658086a1b748e8792 pcsc-lite-1.8.25.tar.bz2
|
||||
sha256 40d4358bb8dc8d30f5365ae6d999b6f820bbc051b292912482f2e4d0ebd837e1 COPYING
|
||||
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 GPL-3.0.txt
|
||||
|
||||
@@ -4,13 +4,13 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
PCSC_LITE_VERSION = 1.8.23
|
||||
PCSC_LITE_VERSION = 1.8.25
|
||||
PCSC_LITE_SOURCE = pcsc-lite-$(PCSC_LITE_VERSION).tar.bz2
|
||||
PCSC_LITE_SITE = https://pcsclite.apdu.fr/files
|
||||
PCSC_LITE_INSTALL_STAGING = YES
|
||||
PCSC_LITE_DEPENDENCIES = host-pkgconf
|
||||
PCSC_LITE_LICENSE = BSD-3-Clause
|
||||
PCSC_LITE_LICENSE_FILES = COPYING
|
||||
PCSC_LITE_LICENSE = BSD-2-Clause (auth), BSD-3-Clause, GPL-3.0+ (demo, spy, tests), ISC (simclist)
|
||||
PCSC_LITE_LICENSE_FILES = COPYING GPL-3.0.txt
|
||||
PCSC_LITE_AUTORECONF = YES
|
||||
|
||||
# - libudev and libusb are optional
|
||||
|
||||
Reference in New Issue
Block a user