Mercurial > mxe-octave

changeset 5437:ca9fbba3a9bb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/libsndfile.mk: disable docs, use DESTDIR, enable stacksmash in mingw
author John Donoghue <john.donoghue@ieee.org>
date Fri, 29 May 2020 15:14:45 -0400
parents 9b7ed61c1990
children 4ebe3efd8e98
files src/libsndfile.mk
diffstat 1 files changed, 11 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/libsndfile.mk	Fri May 29 15:14:43 2020 -0400
+++ b/src/libsndfile.mk	Fri May 29 15:14:45 2020 -0400
@@ -17,16 +17,24 @@
     head -1
 endef
 
+$(PKG)_EXTRA_CONFIGURE_OPTIONS :=
+ifneq ($(filter mingw msvc,$(MXE_SYSTEM)),)
+    $(PKG)_EXTRA_CONFIGURE_OPTIONS += --enable-stack-smash-protection
+endif
+
 define $(PKG)_BUILD
     cd '$(1)' && autoreconf -fi -IM4
     cd '$(1)' && ./configure \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
-	$(CONFIGURE_CPPFLAGS) \
+	$(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
         --enable-sqlite \
         --enable-external-libs \
         --disable-octave \
-        --disable-alsa
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install $(MXE_DISABLE_PROGS)  $(MXE_DISABLE_DOCS)
+        --disable-alsa \
+	--disable-full-suite \
+        $($(PKG)_EXTRA_CONFIGURE_OPTIONS)
+    $(MAKE) -C '$(1)' -j '$(JOBS)' $(MXE_DISABLE_PROGS)  $(MXE_DISABLE_DOCS)
+    $(MAKE) -C '$(1)' -j 1 install $(MXE_DISABLE_PROGS)  $(MXE_DISABLE_DOCS) DESTDIR='$(3)'
 endef