uodate to iec16022-0.3.1

patch away use of -Wl,--no-undefined, sadly this is broken with OpenBSD's
toolchain for functions in libc
This commit is contained in:
sthen 2022-06-11 09:34:24 +00:00
parent 636737caa5
commit b454abc552
9 changed files with 22 additions and 46 deletions

View File

@ -1,9 +1,8 @@
COMMENT= 2D barcodes / DataMatrix creation tool
V= 0.3.0
V= 0.3.1
DISTNAME= iec16022-$V
EXTRACT_SUFX= .tar.xz
REVISION= 2
SHARED_LIBS += iec16022 3.0 # unknown

View File

@ -1,2 +1,2 @@
SHA256 (iec16022-0.3.0.tar.xz) = 821kcq0TFb9ND5BbbOg6gRRo2Qcz51igDDFHuc2+M64=
SIZE (iec16022-0.3.0.tar.xz) = 247520
SHA256 (iec16022-0.3.1.tar.xz) = WoPbq0AjkGlTZ88epFYUDlH/aBccvANSzrpL4idxXgc=
SIZE (iec16022-0.3.1.tar.xz) = 258276

View File

@ -1,8 +1,9 @@
Index: Makefile.am
--- Makefile.am.orig
+++ Makefile.am
@@ -1,6 +1,4 @@
-AM_CFLAGS = -Bsymbolic -Wundef -Wall -Wno-switch -Wno-parentheses -Wpointer-arith -Wredundant-decls -Werror=format-security -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wdisabled-optimization -Wno-pointer-sign -Wdeclaration-after-statement -Werror-implicit-function-declaration -std=c99 -D_POSIX_C_SOURCE=200112 -D_ISOC99_SOURCE -Wl,--as-needed -Wl,--no-undefined -fno-asynchronous-unwind-tables
@@ -1,7 +1,5 @@
ACLOCAL_AMFLAGS = -I m4
-AM_CFLAGS = -Bsymbolic -Wundef -Wall -Wno-switch -Wno-parentheses -Wpointer-arith -Wredundant-decls -Werror=format-security -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wdisabled-optimization -Wno-pointer-sign -Wdeclaration-after-statement -Werror-implicit-function-declaration -std=c99 -D_POSIX_C_SOURCE=200112 -D_ISOC99_SOURCE -fno-asynchronous-unwind-tables
-
-image.lo: AM_CFLAGS += -Wno-unused-result
+AM_CFLAGS = -Bsymbolic -std=c99 -D_POSIX_C_SOURCE=200112 -D_ISOC99_SOURCE -fno-asynchronous-unwind-tables

View File

@ -1,5 +1,6 @@
--- autogen.sh.orig Thu Feb 11 11:41:55 2016
+++ autogen.sh Thu Feb 11 11:41:56 2016
Index: autogen.sh
--- autogen.sh.orig
+++ autogen.sh
@@ -7,4 +7,3 @@ autoheader
automake --add-missing
autoconf configure.ac > configure

View File

@ -0,0 +1,12 @@
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
@@ -48,7 +48,7 @@ AC_SEARCH_LIBS([poptGetContext], [popt], POPT_LIBS=-lp
# AC_CHECK_LIB([z], [main],,AC_MSG_ERROR([Missing library: zlib not found.]))
ac_orig_ldflags="$LDFLAGS"
-LDFLAGS="$LDFLAGS -Wl,--as-needed -Wl,--no-undefined"
+LDFLAGS="$LDFLAGS -Wl,--as-needed"
AC_LINK_IFELSE([AC_LANG_SOURCE([int main() { return 0; }])], [], [LDFLAGS="$ac_orig_ldflags"])
dnl Output the files

View File

@ -1,12 +0,0 @@
Don't use malloc.h header on OpenBSD.
--- iec16022.c.orig Wed Nov 19 23:09:44 2014
+++ iec16022.c Wed Nov 19 23:09:51 2014
@@ -29,7 +29,6 @@
#include <string.h>
#include <time.h>
#include <popt.h>
-#include <malloc.h>
#include "image.h"
#include "iec16022ecc200.h"
#include "config.h"

View File

@ -1,12 +0,0 @@
Don't use malloc.h header on OpenBSD.
--- iec16022ecc200.c.orig Thu Jun 25 21:42:24 2015
+++ iec16022ecc200.c Thu Feb 11 11:39:41 2016
@@ -28,7 +28,6 @@
#include <ctype.h>
#include <string.h>
#include <time.h>
-#include <malloc.h>
#include "reedsol.h"
#include "iec16022ecc200.h"

View File

@ -1,13 +0,0 @@
Replace the malloc.h header with stdlib.h.
--- image.c.orig Thu Jun 25 21:42:24 2015
+++ image.c Thu Feb 11 11:39:25 2016
@@ -19,7 +19,7 @@
*/
#include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
#include <string.h>
#include <ctype.h>
#ifdef _WIN32

View File

@ -3,7 +3,7 @@ include/iec16022/
include/iec16022/iec16022ecc200.h
include/iec16022/image.h
include/iec16022/reedsol.h
lib/libiec16022.a
@static-lib lib/libiec16022.a
lib/libiec16022.la
@lib lib/libiec16022.so.${LIBiec16022_VERSION}
lib/pkgconfig/libiec16022.pc