Mercurial > mxe-octave

changeset 5201:3307ec11073e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
skip libgomp dependency if using native gcc * librsb.mk, sox.mk, suitesparse.mk, sundials-27-ida.mk, sundials-ida.mk: Only add libgomp to package dependency list if not using native gcc.
author John W. Eaton <jwe@octave.org>
date Thu, 07 Nov 2019 09:05:57 -0500
parents 950fa89a5550
children 5e610d91fea7
files src/librsb.mk src/sox.mk src/suitesparse.mk src/sundials-27-ida.mk src/sundials-ida.mk
diffstat 5 files changed, 20 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/librsb.mk	Mon Nov 04 08:34:37 2019 -0500
+++ b/src/librsb.mk	Thu Nov 07 09:05:57 2019 -0500
@@ -8,7 +8,10 @@
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$($(PKG)_FILE)
-$(PKG)_DEPS     := libgomp
+$(PKG)_DEPS     :=
+ifeq ($(USE_SYSTEM_GCC),no)
+  $(PKG)_DEPS += libgomp
+endif
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'https://sourceforge.net/projects/librsb/files/' | \
--- a/src/sox.mk	Mon Nov 04 08:34:37 2019 -0500
+++ b/src/sox.mk	Thu Nov 07 09:05:57 2019 -0500
@@ -9,7 +9,10 @@
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_DEPS     := ffmpeg flac lame libgomp libmad libsndfile vorbis
+$(PKG)_DEPS     := ffmpeg flac lame libmad libsndfile vorbis
+ifeq ($(USE_SYSTEM_GCC),no)
+  $(PKG)_DEPS += libgomp
+endif
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://sourceforge.net/projects/sox/files/sox/' | \
--- a/src/suitesparse.mk	Mon Nov 04 08:34:37 2019 -0500
+++ b/src/suitesparse.mk	Thu Nov 07 09:05:57 2019 -0500
@@ -8,7 +8,10 @@
 $(PKG)_FILE     := SuiteSparse-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://faculty.cse.tamu.edu/davis/SuiteSparse/$($(PKG)_FILE)
 $(PKG)_URL_2    := https://distfiles.macports.org/SuiteSparse/$($(PKG)_FILE)
-$(PKG)_DEPS     := blas lapack libgomp
+$(PKG)_DEPS     := blas lapack
+ifeq ($(USE_SYSTEM_GCC),no)
+  $(PKG)_DEPS += libgomp
+endif
 
 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
   $(PKG)_DESTDIR :=
--- a/src/sundials-27-ida.mk	Mon Nov 04 08:34:37 2019 -0500
+++ b/src/sundials-27-ida.mk	Thu Nov 07 09:05:57 2019 -0500
@@ -9,7 +9,10 @@
 $(PKG)_SUBDIR   := sundials-$($(PKG)_VERSION)
 $(PKG)_FILE     := sundials-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://computation.llnl.gov/projects/sundials/download/$($(PKG)_FILE)
-$(PKG)_DEPS     := lapack libgomp suitesparse
+$(PKG)_DEPS     := lapack suitesparse
+ifeq ($(USE_SYSTEM_GCC),no)
+  $(PKG)_DEPS += libgomp
+endif
 
 define $(PKG)_UPDATE
     echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
--- a/src/sundials-ida.mk	Mon Nov 04 08:34:37 2019 -0500
+++ b/src/sundials-ida.mk	Thu Nov 07 09:05:57 2019 -0500
@@ -8,7 +8,10 @@
 $(PKG)_SUBDIR   := sundials-$($(PKG)_VERSION)
 $(PKG)_FILE     := sundials-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://computation.llnl.gov/projects/sundials/download/$($(PKG)_FILE)
-$(PKG)_DEPS     := lapack libgomp suitesparse
+$(PKG)_DEPS     := lapack suitesparse
+ifeq ($(USE_SYSTEM_GCC),no)
+  $(PKG)_DEPS += libgomp
+endif
 
 define $(PKG)_UPDATE
     echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;