pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

libv4l: SSP build fix from Robert Swindells



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Wed Aug 12 01:55:57 2020 +0200
Changeset:	51191a4768f3581dc9abe566fe613a09057460ff

Modified Files:
	libv4l/Makefile
Removed Files:
	libv4l/TODO

Log Message:
libv4l: SSP build fix from Robert Swindells

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=51191a4768f3581dc9abe566fe613a09057460ff

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 libv4l/Makefile |  3 ++-
 libv4l/TODO     | 13 -------------
 2 files changed, 2 insertions(+), 14 deletions(-)

diffs:
diff --git a/libv4l/Makefile b/libv4l/Makefile
index 1bc05971c9..b1bf5af599 100644
--- a/libv4l/Makefile
+++ b/libv4l/Makefile
@@ -14,6 +14,7 @@ LICENSE=	gnu-gpl-v2
 
 USE_GCC_RUNTIME=	yes
 GNU_CONFIGURE=		yes
+FORTIFY_SUPPORTED=	no
 
 USE_TOOLS+=	gmake
 USE_LIBTOOL=	yes
@@ -39,7 +40,7 @@ pre-configure:
 	${MKDIR} ${BUILDLINK_DIR}/include/sys
 	cp ${FILESDIR}/videoio.h ${BUILDLINK_DIR}/include/sys
 
-.elif !exists(/usr/include/linux/videodev.h)
+.elif ${OPSYS} == "Linux" && !exists(/usr/include/linux/videodev.h)
 pre-configure:
 	${MKDIR} ${BUILDLINK_DIR}/include/linux
 	cp ${FILESDIR}/videodev.h ${BUILDLINK_DIR}/include/linux
diff --git a/libv4l/TODO b/libv4l/TODO
deleted file mode 100644
index 065aeedebb..0000000000
--- a/libv4l/TODO
+++ /dev/null
@@ -1,13 +0,0 @@
-Fix:
-
-v4l1compat.c:115:23: error: redefinition of 'read'
- LIBV4L_PUBLIC ssize_t read(int fd, void *buffer, size_t n)
-                       ^~~~
-In file included from /usr/include/ssp/stdio.h:34,
-                 from /usr/include/stdio.h:602,
-                 from ../../lib/include/libv4l1.h:26,
-                 from v4l1compat.c:31:
-/usr/include/ssp/unistd.h:39:1: note: previous definition of 'read' was here
- __ssp_redirect0(ssize_t, read, (int __fd, void *__buf, size_t __len), \
- ^~~~~~~~~~~~~~~
-


Home | Main Index | Thread Index | Old Index