Mercurial > mxe-octave
changeset 5749:3960e6022e88
libbiosig: Fix build with compiler installed on system (bug #10058).
* src/libbiosig.mk: Pass LDFLAGS and CFLAGS to configure and make for native
builds.
* src/libbiosig-1-mingw-install.patch: Make unversioned library a symlink to
the versioned library instead of vice versa.
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Fri, 23 Apr 2021 19:08:25 +0200 |
| parents | 399c7b225e13 |
| children | 16372b488670 |
| files | src/libbiosig-1-mingw-install.patch src/libbiosig.mk |
| diffstat | 2 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/libbiosig-1-mingw-install.patch Thu Apr 22 18:57:15 2021 +0200 +++ b/src/libbiosig-1-mingw-install.patch Fri Apr 23 19:08:25 2021 +0200 @@ -1,5 +1,5 @@ diff --git "a/biosig4c++/Makefile.in" "b/biosig4c++/Makefile.in" -index c05e4d1..5da0565 100644 +index c05e4d1..8fd7aad 100644 --- "a/biosig4c++/Makefile.in" +++ "b/biosig4c++/Makefile.in" @@ -139,6 +139,7 @@ endif @@ -39,10 +39,10 @@ - (cd $(DESTDIR)$(libdir) && ln -sf libbiosig$(FULLDLEXT) libbiosig${SONAMEVERSION}.$(DLEXT)) +install_libbiosig.$(DLEXT): libbiosig.$(DLEXT) + install -d $(DESTDIR)$(DLDIR)/pkgconfig/ -+ install libbiosig.$(DLEXT) $(DESTDIR)$(DLDIR) ++ install libbiosig.$(DLEXT) $(DESTDIR)$(DLDIR)/libbiosig$(FULLDLEXT) ifneq (Darwin,$(shell uname)) - cd $(DESTDIR)$(libdir) && ln -sf libbiosig$(FULLDLEXT) libbiosig.$(DLEXT) -+ cd $(DESTDIR)$(DLDIR) && ln -sf libbiosig.$(DLEXT) libbiosig$(FULLDLEXT) ++ cd $(DESTDIR)$(DLDIR) && ln -sf libbiosig$(FULLDLEXT) libbiosig.$(DLEXT) endif -ldconfig
--- a/src/libbiosig.mk Thu Apr 22 18:57:15 2021 +0200 +++ b/src/libbiosig.mk Fri Apr 23 19:08:25 2021 +0200 @@ -23,7 +23,10 @@ ac_cv_func_malloc_0_nonnull=yes \ ac_cv_func_realloc_0_nonnull=yes else - $(PKG)_MAKE_FLAGS := LDLIBS='-liconv -lm -ltinyxml' + $(PKG)_MAKE_FLAGS := \ + LDLIBS='-liconv -lm -ltinyxml' \ + LDFLAGS=$(MXE_LDFLAGS) \ + CFLAGS=$(MXE_CFLAGS) endif @@ -37,6 +40,8 @@ RANLIB='$(MXE_RANLIB)' \ AR='$(MXE_AR)' \ ARFLAGS=rcs \ + LDFLAGS=$(MXE_LDFLAGS) \ + CFLAGS=$(MXE_CFLAGS) \ LIBTOOL=$(LIBTOOL) \ PKG_CONFIG='$(MXE_PKG_CONFIG)' \ PKG_CONFIG_PATH='$(HOST_LIBDIR)/pkgconfig'