Mercurial > mxe-octave

changeset 3006:dabfd7db980c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use cp for ln on mingw native builds
author John W. Eaton <jwe@octave.org>
date Thu, 30 May 2013 13:28:23 -0400
parents c154d525c70e
children 229ab69bba2d
files Makefile src/apr-util.mk src/apr.mk src/bzip2.mk src/cblas.mk src/fltk.mk src/gdal.mk src/glib.mk src/gsoap.mk src/libgcrypt.mk src/libgpg_error.mk src/llvm.mk src/ocaml-core.mk src/ocaml-flexdll.mk src/postgresql.mk src/qt.mk src/sdl.mk src/xvidcore.mk
diffstat 18 files changed, 34 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Thu May 30 13:17:57 2013 -0400
+++ b/Makefile	Thu May 30 13:28:23 2013 -0400
@@ -144,6 +144,17 @@
   MXE_LDFLAGS := '-L$(MXE_LIBDIR)'
 endif
 
+LN := ln
+LN_S := $(LN) -s
+LN_SF := $(LN_S) -f
+ifeq ($(MXE_SYSTEM),mingw)
+  ifeq ($(MXE_NATIVE_BUILD),yes)
+    LN := cp
+    LN_S := $(LN)
+    LN_SF := $(LN_S)
+  endif
+endif
+
 OCTAVE_FORGE_BASE_URL := 'http://sourceforge.net/projects/octave/files/Octave Forge Packages/Individual Package Releases'
 OCTAVE_FORGE_PACKAGES := $(addprefix of-,miscellaneous struct optim specfun general signal communications image io statistics control)
 
--- a/src/apr-util.mk	Thu May 30 13:17:57 2013 -0400
+++ b/src/apr-util.mk	Thu May 30 13:28:23 2013 -0400
@@ -28,5 +28,5 @@
         --with-apr='$(PREFIX)/$(TARGET)' \
         CFLAGS=-D_WIN32_WINNT=0x0500
     $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS=
-    ln -sf '$(PREFIX)/$(TARGET)/bin/apu-1-config' '$(PREFIX)/bin/$(TARGET)-apu-1-config'
+    $(LN_SF) '$(PREFIX)/$(TARGET)/bin/apu-1-config' '$(PREFIX)/bin/$(TARGET)-apu-1-config'
 endef
--- a/src/apr.mk	Thu May 30 13:17:57 2013 -0400
+++ b/src/apr.mk	Thu May 30 13:28:23 2013 -0400
@@ -28,5 +28,5 @@
         ac_cv_sizeof_ssize_t=4 \
         CFLAGS=-D_WIN32_WINNT=0x0500
     $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS=
-    ln -sf '$(PREFIX)/$(TARGET)/bin/apr-1-config' '$(PREFIX)/bin/$(TARGET)-apr-1-config'
+    $(LN_SF) '$(PREFIX)/$(TARGET)/bin/apr-1-config' '$(PREFIX)/bin/$(TARGET)-apr-1-config'
 endef
--- a/src/bzip2.mk	Thu May 30 13:17:57 2013 -0400
+++ b/src/bzip2.mk	Thu May 30 13:28:23 2013 -0400
@@ -44,7 +44,7 @@
     $(INSTALL) -d '$(MXE_LIBDIR)'
     $(INSTALL) -m755 '$(1)/libbz2.so.1.0.6' '$(MXE_LIBDIR)/'
     rm -f '$(MXE_LIBDIR)/libbz2.so.1.0'
-    ln -s libbz2.so.1.0.6 '$(MXE_LIBDIR)/libbz2.so.1.0'
+    $(LN_SF) libbz2.so.1.0.6 '$(MXE_LIBDIR)/libbz2.so.1.0'
     $(INSTALL) -d '$(MXE_INCDIR)'
     $(INSTALL) -m644 '$(1)/bzlib.h' '$(MXE_INCDIR)/'
 endef
--- a/src/cblas.mk	Thu May 30 13:17:57 2013 -0400
+++ b/src/cblas.mk	Thu May 30 13:28:23 2013 -0400
@@ -20,7 +20,7 @@
     $(SED) -i 's,FC =.*,FC = $(TARGET)-gfortran,g' '$(1)/Makefile.MINGW32'
     $(SED) -i 's, make , $(MAKE) ,g'               '$(1)/Makefile'
     rm '$(1)/Makefile.in'
-    ln -sf '$(1)/Makefile.MINGW32' '$(1)/Makefile.in'
+    $(LN_SF) '$(1)/Makefile.MINGW32' '$(1)/Makefile.in'
     mkdir '$(1)/MINGW32'
     $(MAKE) -C '$(1)' -j '$(JOBS)' alllib
     cd '$(1)' && $(TARGET)-ar cr libcblas.a src/*.o
--- a/src/fltk.mk	Thu May 30 13:17:57 2013 -0400
+++ b/src/fltk.mk	Thu May 30 13:28:23 2013 -0400
@@ -35,5 +35,5 @@
     # enable exceptions, because disabling them doesn't make any sense on PCs
     $(SED) -i 's,-fno-exceptions,,' '$(1)/makeinclude'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install DIRS=src LIBCOMMAND='$(MXE_AR) cr'
-    ln -sf '$(MXE_BINDIR)/fltk-config' '$(PREFIX)/bin/$(TARGET)-fltk-config'
+    $(LN_SF) '$(MXE_BINDIR)/fltk-config' '$(PREFIX)/bin/$(TARGET)-fltk-config'
 endef
--- a/src/gdal.mk	Thu May 30 13:17:57 2013 -0400
+++ b/src/gdal.mk	Thu May 30 13:28:23 2013 -0400
@@ -82,5 +82,5 @@
     $(MAKE) -C '$(1)/alg'   -j 1 install
     $(MAKE) -C '$(1)/ogr'   -j 1 install OGR_ENABLED=
     $(MAKE) -C '$(1)/apps'  -j 1 install BIN_LIST=
-    ln -sf '$(PREFIX)/$(TARGET)/bin/gdal-config' '$(PREFIX)/bin/$(TARGET)-gdal-config'
+    $(LN_SF) '$(PREFIX)/$(TARGET)/bin/gdal-config' '$(PREFIX)/bin/$(TARGET)-gdal-config'
 endef
--- a/src/glib.mk	Thu May 30 13:17:57 2013 -0400
+++ b/src/glib.mk	Thu May 30 13:28:23 2013 -0400
@@ -53,9 +53,9 @@
 endef
 
 define $(PKG)_SYMLINK
-    ln -sf `which glib-genmarshal`        '$(PREFIX)/$(TARGET)/bin/'
-    ln -sf `which glib-compile-schemas`   '$(PREFIX)/$(TARGET)/bin/'
-    ln -sf `which glib-compile-resources` '$(PREFIX)/$(TARGET)/bin/'
+    $(LN_SF) `which glib-genmarshal`        '$(PREFIX)/$(TARGET)/bin/'
+    $(LN_SF) `which glib-compile-schemas`   '$(PREFIX)/$(TARGET)/bin/'
+    $(LN_SF) `which glib-compile-resources` '$(PREFIX)/$(TARGET)/bin/'
 endef
 
 define $(PKG)_BUILD
--- a/src/gsoap.mk	Thu May 30 13:17:57 2013 -0400
+++ b/src/gsoap.mk	Thu May 30 13:28:23 2013 -0400
@@ -46,7 +46,7 @@
         CPPFLAGS='-DWITH_NTLM'
 
     # Building for mingw requires native soapcpp2
-    ln -sf '$(PREFIX)/bin/$(TARGET)-soapcpp2' '$(1)/gsoap/src/soapcpp2'
+    $(LN_SF) '$(PREFIX)/bin/$(TARGET)-soapcpp2' '$(1)/gsoap/src/soapcpp2'
 
     # Work around parallel build problem
     $(MAKE) -C '$(1)'/gsoap/src -j '$(JOBS)' soapcpp2_yacc.h AR='$(TARGET)-ar'
--- a/src/libgcrypt.mk	Thu May 30 13:17:57 2013 -0400
+++ b/src/libgcrypt.mk	Thu May 30 13:28:23 2013 -0400
@@ -24,5 +24,5 @@
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(PREFIX)/$(TARGET)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
-    ln -sf '$(PREFIX)/$(TARGET)/bin/libgcrypt-config' '$(PREFIX)/bin/$(TARGET)-libgcrypt-config'
+    $(LN_SF) '$(PREFIX)/$(TARGET)/bin/libgcrypt-config' '$(PREFIX)/bin/$(TARGET)-libgcrypt-config'
 endef
--- a/src/libgpg_error.mk	Thu May 30 13:17:57 2013 -0400
+++ b/src/libgpg_error.mk	Thu May 30 13:28:23 2013 -0400
@@ -26,5 +26,5 @@
         --disable-languages
     $(MAKE) -C '$(1)/src' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
     $(MAKE) -C '$(1)/src' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
-    ln -sf '$(PREFIX)/$(TARGET)/bin/gpg-error-config' '$(PREFIX)/bin/$(TARGET)-gpg-error-config'
+    $(LN_SF) '$(PREFIX)/$(TARGET)/bin/gpg-error-config' '$(PREFIX)/bin/$(TARGET)-gpg-error-config'
 endef
--- a/src/llvm.mk	Thu May 30 13:17:57 2013 -0400
+++ b/src/llvm.mk	Thu May 30 13:28:23 2013 -0400
@@ -26,5 +26,5 @@
     $(MAKE) -C '$(1)/build' -j $(JOBS) llvm-tblgen
     $(MAKE) -C '$(1)/build' -j $(JOBS) intrinsics_gen
     $(MAKE) -C '$(1)/build' -j $(JOBS) install
-    ln -sf '$(PREFIX)/$(TARGET)/bin/llvm-config' '$(PREFIX)/bin/$(TARGET)-llvm-config'
+    $(LN_SF) '$(PREFIX)/$(TARGET)/bin/llvm-config' '$(PREFIX)/bin/$(TARGET)-llvm-config'
 endef
--- a/src/ocaml-core.mk	Thu May 30 13:17:57 2013 -0400
+++ b/src/ocaml-core.mk	Thu May 30 13:28:23 2013 -0400
@@ -80,7 +80,7 @@
 			 $(1)/otherlibs/win32graph \
 			 $(1)/otherlibs/bigarray \
 			 $(1)/otherlibs/systhreads; do \
-				 ln -sf Makefile.nt $$d/Makefile; \
+				 $(LN_SF) Makefile.nt $$d/Makefile; \
 	done
 	# Now clean the temporary files from the previous build.  This
 	# will also cause asmcomp/arch.ml (etc) to be linked to the 32 bit
--- a/src/ocaml-flexdll.mk	Thu May 30 13:17:57 2013 -0400
+++ b/src/ocaml-flexdll.mk	Thu May 30 13:28:23 2013 -0400
@@ -30,7 +30,7 @@
 		flexdll_initer_mingw.o \
 		'$(PREFIX)/$(TARGET)/lib/ocaml/flexdll'
 	# create flexdll scripts
-	cd '$(PREFIX)/bin' && ln -sf '$(PREFIX)/$(TARGET)/lib/ocaml/flexdll/flexlink'
+	cd '$(PREFIX)/bin' && $(LN_SF) '$(PREFIX)/$(TARGET)/lib/ocaml/flexdll/flexlink'
 	(echo '#!/bin/sh'; \
 	 echo 'exec flexlink -I $(PREFIX)/$(TARGET)/lib -chain mingw -nocygpath "$$@"') \
 			> '$(PREFIX)/bin/$(TARGET)-flexlink'
--- a/src/postgresql.mk	Thu May 30 13:17:57 2013 -0400
+++ b/src/postgresql.mk	Thu May 30 13:28:23 2013 -0400
@@ -81,5 +81,5 @@
         --with-system-tzdata=/dev/null
     $(MAKE) -C '$(1).native'/src/port          -j '$(JOBS)'
     $(MAKE) -C '$(1).native'/src/bin/pg_config -j '$(JOBS)' install
-    ln -sf '$(PREFIX)/$(TARGET)/bin/pg_config' '$(PREFIX)/bin/$(TARGET)-pg_config'
+    $(LN_SF) '$(PREFIX)/$(TARGET)/bin/pg_config' '$(PREFIX)/bin/$(TARGET)-pg_config'
 endef
--- a/src/qt.mk	Thu May 30 13:17:57 2013 -0400
+++ b/src/qt.mk	Thu May 30 13:28:23 2013 -0400
@@ -87,10 +87,10 @@
 
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install
-    ln -fs '$(MXE_BINDIR)/moc' '$(PREFIX)/bin/$(TARGET)-moc'
-    ln -fs '$(MXE_BINDIR)/rcc' '$(PREFIX)/bin/$(TARGET)-roc'
-    ln -fs '$(MXE_BINDIR)/uic' '$(PREFIX)/bin/$(TARGET)-uic'
-    ln -fs '$(MXE_BINDIR)/qmake' '$(PREFIX)/bin/$(TARGET)-qmake'
+    $(LN_SF) '$(MXE_BINDIR)/moc' '$(PREFIX)/bin/$(TARGET)-moc'
+    $(LN_SF) '$(MXE_BINDIR)/rcc' '$(PREFIX)/bin/$(TARGET)-roc'
+    $(LN_SF) '$(MXE_BINDIR)/uic' '$(PREFIX)/bin/$(TARGET)-uic'
+    $(LN_SF) '$(MXE_BINDIR)/qmake' '$(PREFIX)/bin/$(TARGET)-qmake'
 
     # cd '$(1)/tools/assistant' && '$(1)/bin/qmake' assistant.pro
     # $(MAKE) -C '$(1)/tools/assistant' -j '$(JOBS)' install
@@ -104,7 +104,7 @@
 
     # lrelease (from linguist) needed by octave for GUI build
     $(MAKE) -C '$(1)/tools/linguist/lrelease' -j '$(JOBS)' install
-    ln -fs '$(MXE_BINDIR)/lrelease' '$(PREFIX)/bin/$(TARGET)-lrelease'
+    $(LN_SF) '$(MXE_BINDIR)/lrelease' '$(PREFIX)/bin/$(TARGET)-lrelease'
 
     # mkdir            '$(1)/test-qt'
     # cd               '$(1)/test-qt' && '$(TARGET)-qmake' '$(PWD)/$(2).pro'
--- a/src/sdl.mk	Thu May 30 13:17:57 2013 -0400
+++ b/src/sdl.mk	Thu May 30 13:28:23 2013 -0400
@@ -27,7 +27,7 @@
         --disable-stdio-redirect
     $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
     $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
-    ln -sf '$(PREFIX)/$(TARGET)/bin/sdl-config' '$(PREFIX)/bin/$(TARGET)-sdl-config'
+    $(LN_SF) '$(PREFIX)/$(TARGET)/bin/sdl-config' '$(PREFIX)/bin/$(TARGET)-sdl-config'
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
--- a/src/xvidcore.mk	Thu May 30 13:17:57 2013 -0400
+++ b/src/xvidcore.mk	Thu May 30 13:28:23 2013 -0400
@@ -26,5 +26,5 @@
     $(INSTALL) -m644 '$(1)/../../src/xvid.h' '$(PREFIX)/$(TARGET)/include/'
     $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib'
     $(INSTALL) -m644 '$(1)/build/xvidcore.a' '$(PREFIX)/$(TARGET)/lib/'
-    ln -sf '$(PREFIX)/$(TARGET)/lib/xvidcore.a' '$(PREFIX)/$(TARGET)/lib/libxvidcore.a'
+    $(LN_SF) '$(PREFIX)/$(TARGET)/lib/xvidcore.a' '$(PREFIX)/$(TARGET)/lib/libxvidcore.a'
 endef