Mercurial > mxe-octave

changeset 3021:6ea3d6ad4f44

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update for build static compile option * src/blas.mk: if BUILD_STATIC, install the static library. * src/bzip2.mk: if BUILD_STATIC, install teh static library
author John Donoghue <john.donoghue@ieee.org>
date Sat, 08 Jun 2013 10:43:11 -0400
parents 41800279e33a
children a542328fc284
files src/blas.mk src/bzip2.mk
diffstat 2 files changed, 9 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/blas.mk	Sat Jun 08 09:59:45 2013 -0400
+++ b/src/blas.mk	Sat Jun 08 10:43:11 2013 -0400
@@ -26,4 +26,9 @@
     if [ $(BUILD_SHARED) = yes ]; then \
       $(MAKE_SHARED_FROM_STATIC) --ar '$(MXE_AR)' --ld '$(MXE_F77)' '$(1)/libblas.a' --install '$(INSTALL)' --libdir '$(HOST_LIBDIR)' --bindir '$(HOST_BINDIR)'; \
     fi
+
+    if [ $(BUILD_STATIC) = yes ]; then \
+      $(INSTALL) -d '$(HOST_LIBDIR)'; \
+      $(INSTALL) '$(1)/libblas.a' '$(HOST_LIBDIR)/'; \
+    fi
 endef
--- a/src/bzip2.mk	Sat Jun 08 09:59:45 2013 -0400
+++ b/src/bzip2.mk	Sat Jun 08 10:43:11 2013 -0400
@@ -31,6 +31,10 @@
     if [ $(BUILD_SHARED) = yes ]; then \
       $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(1)/libbz2.a' --install '$(INSTALL)' --libdir '$(HOST_LIBDIR)' --bindir '$(HOST_BINDIR)'; \
     fi
+
+    if [ $(BUILD_STATIC) = yes ]; then \
+      $(INSTALL) '$(1)/libbz2.a' '$(HOST_LIBDIR)/'; \
+    fi
 endef
 else
 define $(PKG)_BUILD