Mercurial > mxe-octave

changeset 2876:c766e4afd493

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Delete installed .la files. Install .dll and .dll.a files with mode 755.
author John W. Eaton <jwe@octave.org>
date Wed, 28 Nov 2012 19:42:55 -0500
parents f423f81f414e
children 5d6a0103c1fc
files src/arpack.mk src/blas.mk src/curl.mk src/glpk.mk src/graphicsmagick.mk src/libgcrypt.mk src/libgpg_error.mk src/libssh2.mk src/ncurses.mk src/pdcurses.mk src/qrupdate.mk src/suitesparse.mk src/zlib.mk
diffstat 13 files changed, 33 insertions(+), 32 deletions(-) [+]
line wrap: on
line diff
--- a/src/arpack.mk	Wed Nov 28 18:08:18 2012 -0500
+++ b/src/arpack.mk	Wed Nov 28 19:42:55 2012 -0500
@@ -26,8 +26,9 @@
     if [ $(BUILD_SHARED) = yes ]; then \
       $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gfortran' '$(PREFIX)/$(TARGET)/lib/libarpack.a'; \
       $(INSTALL) -d '$(PREFIX)/$(TARGET)/bin'; \
-      $(INSTALL) -m644 '$(PREFIX)/$(TARGET)/lib/libarpack.dll.a' '$(PREFIX)/$(TARGET)/lib/libarpack.dll.a'; \
-      $(INSTALL) -m644 '$(PREFIX)/$(TARGET)/lib/libarpack.dll' '$(PREFIX)/$(TARGET)/bin/libarpack.dll'; \
+      $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libarpack.dll.a' '$(PREFIX)/$(TARGET)/lib/libarpack.dll.a'; \
+      $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libarpack.dll' '$(PREFIX)/$(TARGET)/bin/libarpack.dll'; \
       rm -f '$(PREFIX)/$(TARGET)/lib/libarpack.dll'; \
+      rm -f '$(PREFIX)/$(TARGET)/lib/libarpack.la'; \
     fi
 endef
--- a/src/blas.mk	Wed Nov 28 18:08:18 2012 -0500
+++ b/src/blas.mk	Wed Nov 28 19:42:55 2012 -0500
@@ -26,7 +26,7 @@
     $(INSTALL) -m644 '$(1)/libblas.a' '$(PREFIX)/$(TARGET)/lib/'
     if [ $(BUILD_SHARED) = yes ]; then \
       $(INSTALL) -d '$(PREFIX)/$(TARGET)/bin'; \
-      $(INSTALL) -m644 '$(1)/libblas.dll.a' '$(PREFIX)/$(TARGET)/lib/libblas.dll.a'; \
-      $(INSTALL) -m644 '$(1)/libblas.dll' '$(PREFIX)/$(TARGET)/bin/libblas.dll'; \
+      $(INSTALL) -m755 '$(1)/libblas.dll.a' '$(PREFIX)/$(TARGET)/lib/libblas.dll.a'; \
+      $(INSTALL) -m755 '$(1)/libblas.dll' '$(PREFIX)/$(TARGET)/bin/libblas.dll'; \
     fi
 endef
--- a/src/curl.mk	Wed Nov 28 18:08:18 2012 -0500
+++ b/src/curl.mk	Wed Nov 28 19:42:55 2012 -0500
@@ -36,8 +36,8 @@
     if [ "$(BUILD_SHARED)" = yes ]; then \
       $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(PREFIX)/$(TARGET)/lib/libcurl.a' -lssh2; \
       $(INSTALL) -d '$(PREFIX)/$(TARGET)/bin/'; \
-      $(INSTALL) -m644 '$(PREFIX)/$(TARGET)/lib/libcurl.dll.a' '$(PREFIX)/$(TARGET)/lib/libcurl.dll.a'; \
-      $(INSTALL) -m644 '$(PREFIX)/$(TARGET)/lib/libcurl.dll' '$(PREFIX)/$(TARGET)/bin/libcurl.dll'; \
+      $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libcurl.dll.a' '$(PREFIX)/$(TARGET)/lib/libcurl.dll.a'; \
+      $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libcurl.dll' '$(PREFIX)/$(TARGET)/bin/libcurl.dll'; \
       rm -f '$(PREFIX)/$(TARGET)/lib/libcurl.dll'; \
     fi
 endef
--- a/src/glpk.mk	Wed Nov 28 18:08:18 2012 -0500
+++ b/src/glpk.mk	Wed Nov 28 19:42:55 2012 -0500
@@ -27,8 +27,8 @@
     if [ $(BUILD_SHARED) = yes ]; then \
       $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(PREFIX)/$(TARGET)/lib/libglpk.a'; \
       $(INSTALL) -d '$(PREFIX)/$(TARGET)/bin'; \
-      $(INSTALL) -m644 '$(PREFIX)/$(TARGET)/lib/libglpk.dll.a' '$(PREFIX)/$(TARGET)/lib/libglpk.dll.a'; \
-      $(INSTALL) -m644 '$(PREFIX)/$(TARGET)/lib/libglpk.dll' '$(PREFIX)/$(TARGET)/bin/libglpk.dll'; \
+      $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libglpk.dll.a' '$(PREFIX)/$(TARGET)/lib/libglpk.dll.a'; \
+      $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libglpk.dll' '$(PREFIX)/$(TARGET)/bin/libglpk.dll'; \
       rm -f '$(PREFIX)/$(TARGET)/lib/libglpk.dll'; \
     fi
 endef
--- a/src/graphicsmagick.mk	Wed Nov 28 18:08:18 2012 -0500
+++ b/src/graphicsmagick.mk	Wed Nov 28 19:42:55 2012 -0500
@@ -52,20 +52,20 @@
       $(INSTALL) -d '$(PREFIX)/$(TARGET)/bin'; \
  \
       $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(PREFIX)/$(TARGET)/lib/libGraphicsMagick.a' -ljpeg -ljasper -llzma -ltiff -llcms -lpng -lfreetype -lxml2 -lm; \
-      $(INSTALL) -m644 '$(PREFIX)/$(TARGET)/lib/libGraphicsMagick.dll.a' '$(PREFIX)/$(TARGET)/lib/libGraphicsMagick.dll.a'; \
-      $(INSTALL) -m644 '$(PREFIX)/$(TARGET)/lib/libGraphicsMagick.dll' '$(PREFIX)/$(TARGET)/bin/libGraphicsMagick.dll'; \
+      $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libGraphicsMagick.dll.a' '$(PREFIX)/$(TARGET)/lib/libGraphicsMagick.dll.a'; \
+      $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libGraphicsMagick.dll' '$(PREFIX)/$(TARGET)/bin/libGraphicsMagick.dll'; \
       rm -f '$(PREFIX)/$(TARGET)/lib/libGraphicsMagick.dll'; \
       rm -f '$(PREFIX)/$(TARGET)/lib/libGraphicsMagick.la'; \
  \
       $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-g++' '$(PREFIX)/$(TARGET)/lib/libGraphicsMagick++.a' -lGraphicsMagick -ljpeg -ljasper -llzma -ltiff -llcms -lpng -lfreetype -lxml2 -lm; \
-      $(INSTALL) -m644 '$(PREFIX)/$(TARGET)/lib/libGraphicsMagick++.dll.a' '$(PREFIX)/$(TARGET)/lib/libGraphicsMagick++.dll.a'; \
-      $(INSTALL) -m644 '$(PREFIX)/$(TARGET)/lib/libGraphicsMagick++.dll' '$(PREFIX)/$(TARGET)/bin/libGraphicsMagick++.dll'; \
+      $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libGraphicsMagick++.dll.a' '$(PREFIX)/$(TARGET)/lib/libGraphicsMagick++.dll.a'; \
+      $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libGraphicsMagick++.dll' '$(PREFIX)/$(TARGET)/bin/libGraphicsMagick++.dll'; \
       rm -f '$(PREFIX)/$(TARGET)/lib/libGraphicsMagick++.dll'; \
       rm -f '$(PREFIX)/$(TARGET)/lib/libGraphicsMagick++.la'; \
  \
       $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(PREFIX)/$(TARGET)/lib/libGraphicsMagickWand.a' -lGraphicsMagick -ljpeg -ljasper -llzma -ltiff -llcms -lpng -lfreetype -lxml2 -lm; \
-      $(INSTALL) -m644 '$(PREFIX)/$(TARGET)/lib/libGraphicsMagickWand.dll.a' '$(PREFIX)/$(TARGET)/lib/libGraphicsMagickWand.dll.a'; \
-      $(INSTALL) -m644 '$(PREFIX)/$(TARGET)/lib/libGraphicsMagickWand.dll' '$(PREFIX)/$(TARGET)/bin/libGraphicsMagickWand.dll'; \
+      $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libGraphicsMagickWand.dll.a' '$(PREFIX)/$(TARGET)/lib/libGraphicsMagickWand.dll.a'; \
+      $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libGraphicsMagickWand.dll' '$(PREFIX)/$(TARGET)/bin/libGraphicsMagickWand.dll'; \
       rm -f '$(PREFIX)/$(TARGET)/lib/libGraphicsMagickWand.dll'; \
       rm -f '$(PREFIX)/$(TARGET)/lib/libGraphicsMagickWand.la'; \
     fi
--- a/src/libgcrypt.mk	Wed Nov 28 18:08:18 2012 -0500
+++ b/src/libgcrypt.mk	Wed Nov 28 19:42:55 2012 -0500
@@ -34,8 +34,8 @@
     if [ "$(BUILD_SHARED)" = yes ]; then \
       $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(PREFIX)/$(TARGET)/lib/libgcrypt.a'; \
       $(INSTALL) -d '$(PREFIX)/$(TARGET)/bin/'; \
-      $(INSTALL) -m644 '$(PREFIX)/$(TARGET)/lib/libgcrypt.dll.a' '$(PREFIX)/$(TARGET)/lib/libgcrypt.dll.a'; \
-      $(INSTALL) -m644 '$(PREFIX)/$(TARGET)/lib/libgcrypt.dll' '$(PREFIX)/$(TARGET)/bin/libgcrypt.dll'; \
+      $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libgcrypt.dll.a' '$(PREFIX)/$(TARGET)/lib/libgcrypt.dll.a'; \
+      $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libgcrypt.dll' '$(PREFIX)/$(TARGET)/bin/libgcrypt.dll'; \
       rm -f '$(PREFIX)/$(TARGET)/lib/libgcrypt.dll'; \
     fi
 endef
--- a/src/libgpg_error.mk	Wed Nov 28 18:08:18 2012 -0500
+++ b/src/libgpg_error.mk	Wed Nov 28 19:42:55 2012 -0500
@@ -28,8 +28,8 @@
     if [ "$(BUILD_SHARED)" = yes ]; then \
       $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(PREFIX)/$(TARGET)/lib/libgpg-error.a'; \
       $(INSTALL) -d '$(PREFIX)/$(TARGET)/bin/'; \
-      $(INSTALL) -m644 '$(PREFIX)/$(TARGET)/lib/libgpg-error.dll.a' '$(PREFIX)/$(TARGET)/lib/libgpg-error.dll.a'; \
-      $(INSTALL) -m644 '$(PREFIX)/$(TARGET)/lib/libgpg-error.dll' '$(PREFIX)/$(TARGET)/bin/libgpg-error.dll'; \
+      $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libgpg-error.dll.a' '$(PREFIX)/$(TARGET)/lib/libgpg-error.dll.a'; \
+      $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libgpg-error.dll' '$(PREFIX)/$(TARGET)/bin/libgpg-error.dll'; \
       rm -f '$(PREFIX)/$(TARGET)/lib/libgpg-error.dll'; \
     fi
 endef
--- a/src/libssh2.mk	Wed Nov 28 18:08:18 2012 -0500
+++ b/src/libssh2.mk	Wed Nov 28 19:42:55 2012 -0500
@@ -35,8 +35,8 @@
     if [ "$(BUILD_SHARED)" = yes ]; then \
       $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(PREFIX)/$(TARGET)/lib/libssh2.a' -lgcrypt; \
       $(INSTALL) -d '$(PREFIX)/$(TARGET)/bin/'; \
-      $(INSTALL) -m644 '$(PREFIX)/$(TARGET)/lib/libssh2.dll.a' '$(PREFIX)/$(TARGET)/lib/libssh2.dll.a'; \
-      $(INSTALL) -m644 '$(PREFIX)/$(TARGET)/lib/libssh2.dll' '$(PREFIX)/$(TARGET)/bin/libssh2.dll'; \
+      $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libssh2.dll.a' '$(PREFIX)/$(TARGET)/lib/libssh2.dll.a'; \
+      $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libssh2.dll' '$(PREFIX)/$(TARGET)/bin/libssh2.dll'; \
       rm -f '$(PREFIX)/$(TARGET)/lib/libssh2.dll'; \
     fi
 endef
--- a/src/ncurses.mk	Wed Nov 28 18:08:18 2012 -0500
+++ b/src/ncurses.mk	Wed Nov 28 19:42:55 2012 -0500
@@ -38,7 +38,7 @@
     if [ "$(BUILD_SHARED)" = yes ]; then \
       $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(1)/lib/libncurses.a'; \
       $(INSTALL) -d '$(PREFIX)/$(TARGET)/bin/'; \
-      $(INSTALL) -m644 '$(1)/lib/libncurses.dll.a' '$(PREFIX)/$(TARGET)/lib/libncurses.dll.a'; \
-      $(INSTALL) -m644 '$(1)/lib/libncurses.dll' '$(PREFIX)/$(TARGET)/bin/libncurses.dll'; \
+      $(INSTALL) -m755 '$(1)/lib/libncurses.dll.a' '$(PREFIX)/$(TARGET)/lib/libncurses.dll.a'; \
+      $(INSTALL) -m755 '$(1)/lib/libncurses.dll' '$(PREFIX)/$(TARGET)/bin/libncurses.dll'; \
     fi
 endef
--- a/src/pdcurses.mk	Wed Nov 28 18:08:18 2012 -0500
+++ b/src/pdcurses.mk	Wed Nov 28 19:42:55 2012 -0500
@@ -37,9 +37,9 @@
     $(INSTALL) -m644 '$(1)/panel.a'    '$(PREFIX)/$(TARGET)/lib/libpanel.a'
     if [ "$(BUILD_SHARED)" = yes ]; then \
       $(INSTALL) -d '$(PREFIX)/$(TARGET)/bin/'; \
-      $(INSTALL) -m644 '$(1)/libcurses.dll.a' '$(PREFIX)/$(TARGET)/lib/libcurses.dll.a'; \
-      $(INSTALL) -m644 '$(1)/panel.dll.a'    '$(PREFIX)/$(TARGET)/lib/libpanel.dll.a'; \
-      $(INSTALL) -m644 '$(1)/libcurses.dll' '$(PREFIX)/$(TARGET)/bin/libcurses.dll'; \
-      $(INSTALL) -m644 '$(1)/panel.dll'    '$(PREFIX)/$(TARGET)/bin/libpanel.dll'; \
+      $(INSTALL) -m755 '$(1)/libcurses.dll.a' '$(PREFIX)/$(TARGET)/lib/libcurses.dll.a'; \
+      $(INSTALL) -m755 '$(1)/panel.dll.a'    '$(PREFIX)/$(TARGET)/lib/libpanel.dll.a'; \
+      $(INSTALL) -m755 '$(1)/libcurses.dll' '$(PREFIX)/$(TARGET)/bin/libcurses.dll'; \
+      $(INSTALL) -m755 '$(1)/panel.dll'    '$(PREFIX)/$(TARGET)/bin/libpanel.dll'; \
     fi
 endef
--- a/src/qrupdate.mk	Wed Nov 28 18:08:18 2012 -0500
+++ b/src/qrupdate.mk	Wed Nov 28 19:42:55 2012 -0500
@@ -20,7 +20,7 @@
     if [ $(BUILD_SHARED) = yes ]; then \
       $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gfortran' '$(1)/libqrupdate.a' -llapack -lblas; \
       $(INSTALL) -d '$(PREFIX)/$(TARGET)/bin'; \
-      $(INSTALL) -m644 '$(1)/libqrupdate.dll.a' '$(PREFIX)/$(TARGET)/lib/libqrupdate.dll.a'; \
-      $(INSTALL) -m644 '$(1)/libqrupdate.dll' '$(PREFIX)/$(TARGET)/bin/libqrupdate.dll'; \
+      $(INSTALL) -m755 '$(1)/libqrupdate.dll.a' '$(PREFIX)/$(TARGET)/lib/libqrupdate.dll.a'; \
+      $(INSTALL) -m755 '$(1)/libqrupdate.dll' '$(PREFIX)/$(TARGET)/bin/libqrupdate.dll'; \
     fi
 endef
--- a/src/suitesparse.mk	Wed Nov 28 18:08:18 2012 -0500
+++ b/src/suitesparse.mk	Wed Nov 28 19:42:55 2012 -0500
@@ -46,8 +46,8 @@
         esac; \
         $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-g++' $$f $$deplibs; \
         $(INSTALL) -d '$(PREFIX)/$(TARGET)/bin'; \
-        $(INSTALL) -m644 $$dir/$$lib.dll.a '$(PREFIX)/$(TARGET)/lib/'; \
-        $(INSTALL) -m644 $$dir/$$lib.dll '$(PREFIX)/$(TARGET)/bin/'; \
+        $(INSTALL) -m755 $$dir/$$lib.dll.a '$(PREFIX)/$(TARGET)/lib/'; \
+        $(INSTALL) -m755 $$dir/$$lib.dll '$(PREFIX)/$(TARGET)/bin/'; \
       fi; \
       $(INSTALL) -m644 $$f '$(PREFIX)/$(TARGET)/lib/'; \
     done
--- a/src/zlib.mk	Wed Nov 28 18:08:18 2012 -0500
+++ b/src/zlib.mk	Wed Nov 28 19:42:55 2012 -0500
@@ -26,7 +26,7 @@
     if [ "$(BUILD_SHARED)" = yes ]; then \
       $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(1)/libz.a'; \
       $(INSTALL) -d '$(PREFIX)/$(TARGET)/bin/'; \
-      $(INSTALL) -m644 '$(1)/libz.dll.a' '$(PREFIX)/$(TARGET)/lib/libz.dll.a'; \
-      $(INSTALL) -m644 '$(1)/libz.dll' '$(PREFIX)/$(TARGET)/bin/libz.dll'; \
+      $(INSTALL) -m755 '$(1)/libz.dll.a' '$(PREFIX)/$(TARGET)/lib/libz.dll.a'; \
+      $(INSTALL) -m755 '$(1)/libz.dll' '$(PREFIX)/$(TARGET)/bin/libz.dll'; \
     fi
 endef