mxe-octave: src/libbiosig-1-gcc11.patch annotate

annotate src/libbiosig-1-gcc11.patch @ 6215:d18a5545df0d release

build-gettext: Don't build emacs bindings. * src/build-gettext.mk: The `emacs` installed on the build system might be incompatible with the STL built by build-gcc. We probably don't need the emacs bindings for the `gettext` build tool anyway. So skip building those bindings.

author	Markus Mützel <markus.muetzel@gmx.de>
date	Sat, 07 May 2022 12:01:10 +0200
parents	fbe6eb75e6d6
children

rev	line source
5833 d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	1 Change Makefile so that the values of environment variables are respected.
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	2
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	3 --- ./biosig4c++/Makefile.in.orig 2021-08-10 18:35:30.301801739 +0200
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	4 +++ ./biosig4c++/Makefile.in 2021-08-10 18:37:18.338795660 +0200
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	5 @@ -101,6 +101,9 @@ includedir = @includedir@
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	6 bindir = @bindir@
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	7 mandir = @mandir@
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	8
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	9 +CC ?= @CC@
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	10 +CXX ?= @CXX@
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	11 +
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	12 CFLAGS += -I$(includedir)
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	13 CXXFLAGS += $(CFLAGS)
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	14
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	15 @@ -108,7 +111,8 @@ CXXFLAGS += $(CFLAGS)
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	16 ifeq (,$(TARGET))
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	17 CC ?= gcc
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	18 CXX ?= g++
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	19 - AR := ar rcs
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	20 + ARFLAGS ?= rcs
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	21 + AR ?= ar
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	22 PKGCONF := pkg-config
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	23 SHAREDLIB = -shared
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	24 DLEXT = so
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	25 @@ -116,14 +120,16 @@ else ifeq (intel,$(TARGET))
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	26 CC := icc
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	27 CXX := icc
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	28 LD := xild
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	29 - AR := xiar crs
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	30 + ARFLAGS ?= crs
6129 fbe6eb75e6d6 libbiosig: Update to version 2.4.0 (patch #10189). Alois Schlögl <alois.schloegl@gmx.net> parents: 5833 diff changeset	31 + AR ?= xiar
5833 d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	32 else
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	33 PREFIX := $(subst /bin/,/,$(dir $(shell which $(TARGET)-gcc)))
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	34 - CC := $(TARGET)-gcc
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	35 - CXX := $(TARGET)-g++
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	36 + CC ?= $(TARGET)-gcc
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	37 + CXX ?= $(TARGET)-g++
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	38 LD := $(TARGET)-ld
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	39 - AR := $(TARGET)-ar rcs
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	40 - PKGCONF := $(TARGET)-pkg-config
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	41 + AR ?= $(TARGET)-ar
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	42 + ARFLAGS ?= rcs
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	43 + PKGCONF ?= $(TARGET)-pkg-config
6129 fbe6eb75e6d6 libbiosig: Update to version 2.4.0 (patch #10189). Alois Schlögl <alois.schloegl@gmx.net> parents: 5833 diff changeset	44 TARGETPLATFORM = windows
5833 d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	45 ifneq (,$(findstring mingw,$(TARGET)))
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	46 ## add gnulib's getlogin
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	47 @@ -136,6 +142,8 @@ else
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	48 endif
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	49 endif
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	50
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	51 +AR := $(AR) $(ARFLAGS)
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	52 +
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	53 SONAMEVERSION ?= 3
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	54
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	55 ### TODO: DLEXT does not work correctly on MXE/MINGW
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	56
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	57
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	58 `typeof` is a GNU extension. Use `decltype` which is part of C++11.
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	59 --- ./biosig4c++/t230/sopen_hl7aecg.cpp.orig 2021-08-02 18:59:57.000000000 +0200
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	60 +++ ./biosig4c++/t230/sopen_hl7aecg.cpp 2021-08-10 17:41:35.500597677 +0200
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	61 @@ -791,8 +791,8 @@ EXTERN_C int sopen_HL7aECG_read(HDRTYPE*
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	62
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	63 if ((N+3) > N_Event) {
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	64 N_Event = max(16,2*(N+2));
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	65 - hdr->EVENT.TYP = (typeof(hdr->EVENT.TYP)) realloc(hdr->EVENT.TYP,N_Eventsizeof(hdr->EVENT.TYP));
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	66 - hdr->EVENT.POS = (typeof(hdr->EVENT.POS)) realloc(hdr->EVENT.POS,N_Eventsizeof(hdr->EVENT.POS));
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	67 + hdr->EVENT.TYP = (decltype(hdr->EVENT.TYP)) realloc(hdr->EVENT.TYP,N_Eventsizeof(hdr->EVENT.TYP));
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	68 + hdr->EVENT.POS = (decltype(hdr->EVENT.POS)) realloc(hdr->EVENT.POS,N_Eventsizeof(hdr->EVENT.POS));
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	69 }
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	70
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	71 TiXmlHandle Boundary = Annotation.FirstChild("support").FirstChild("supportingROI").FirstChild("component").FirstChild("boundary").FirstChild("value");
d0e01250d146 libbiosig: Changes for compilation with gcc 11. Markus Mützel <markus.muetzel@gmx.de> parents: diff changeset	72

Mercurial > mxe-octave

annotate src/libbiosig-1-gcc11.patch @ 6215:d18a5545df0d release