cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

opensc: fix the build on gcc archs by overriding `-Werror'

Browse Source 
Backported from a pull request made to upstream, allowing port supplied
flags to be on top priority. Safety REVISION bump advised by kn@.

OK kn@ kmos@
This commit is contained in:
cwen 2020-02-08 10:36:01 +00:00
parent ae32938dbe
commit e75953c747
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
security/opensc/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.54 2020/01/30 07:15:08 kn Exp $
# $OpenBSD: Makefile,v 1.55 2020/02/08 10:36:01 cwen Exp $
COMMENT= set of libraries and utilities to access smart cards
V= 0.20.0
REVISION = 0
DISTNAME= opensc-${V}
SUBST_VARS += V
@ -44,6 +45,9 @@ FAKE_FLAGS= mandir="${PREFIX}/man/" \
AUTOCONF_VERSION = 2.69
AUTOMAKE_VERSION = 1.15
# Allow building with base-gcc
CFLAGS += -Wno-error
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/lib/pkgconfig
${SUBST_CMD} -c -m ${NONBINMODE} -o ${BINOWN} -g ${BINGRP} \

15
security/opensc/patches/patch-configure_ac
View File

@ -1,10 +1,11 @@
$OpenBSD: patch-configure_ac,v 1.10 2020/01/30 07:15:08 kn Exp $
$OpenBSD: patch-configure_ac,v 1.11 2020/02/08 10:36:01 cwen Exp $
Fix version string
libdl is not required on OpenBSD
Remove -Werror so it builds with gcc
Put port supplied CFLAGS on top priority so it builds with gcc by
supplying `-Wno-error' (upstreamed, can be removed for opensc > 0.20.0)
Index: configure.ac
--- configure.ac.orig
@ -61,3 +62,13 @@ Index: configure.ac
AM_CONDITIONAL([ENABLE_FUZZING], [test "${enable_fuzzing}" = "yes"])
AM_CONDITIONAL([ENABLE_SHARED], [test "${enable_shared}" = "yes"])
AS_IF([test "${enable_shared}" = "yes"], [AC_DEFINE([ENABLE_SHARED], [1], [Enable shared libraries])])
@@ -1071,7 +1045,8 @@ if test "${enable_pedantic}" = "yes"; then
CFLAGS="${CFLAGS} -pedantic"
fi
if test "${enable_strict}" = "yes"; then
- CFLAGS="${CFLAGS} -Wall -Wextra -Wno-unused-parameter -Werror"
+ # XXX This can be removed with opensc > 0.20.0 (upstreamed)
+ CFLAGS="-Wall -Wextra -Wno-unused-parameter -Werror ${CFLAGS}"
fi
AC_CONFIG_FILES([