Mercurial > mxe-octave
view src/of-sockets-1-cross-fixes.patch @ 4545:0e56fe2d2ef5
Makefile.in: add update-build-tools target
* Makefile.in: add update-build-tools target
* src/build-autoconf.mk, src/build-automake.mk,
src/build-bison.mk, src/build-gawk.mk,
src/build-gcc.mk, src/build-gettext.mk,
src/build-gperf.mk, src/build-m4.mk,
src/build-texinfo.mk, src/build-libtool.mk
: update PKG_UPDATE for getting latest version from gnu.org
* src/build-cmake.mk, src/build-flex.mk,
src/build-lzip.mk, src/build-pkg-config.mk,
src/pkg-config.mk, src/build-scons.mk
: add implemented PKG_UPDATE macro
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Thu, 23 Nov 2017 12:05:29 -0500 |
parents | 9ceedf18871e |
children |
line wrap: on
line source
diff -ur octave-sockets-1.2.0.orig/src/Makefile octave-sockets-1.2.0/src/Makefile --- octave-sockets-1.2.0.orig/src/Makefile 2015-03-20 10:24:40.824141293 -0400 +++ octave-sockets-1.2.0/src/Makefile 2015-03-20 11:31:54.325799984 -0400 @@ -8,12 +8,15 @@ SRC := $(OCT:.oct=.cc) MKOCTFILE ?= mkoctfile -Wall +OCTAVE_CONFIG ?= octave-config OCTAVE ?= octave +CANONICAL_HOST_TYPE := $(shell $(OCTAVE_CONFIG) -p CANONICAL_HOST_TYPE)) + #The following is necessary to get the sockets package working in Windows. #It has been tried on Win7 and XP, in Octave 3.8.0 using mxe-octave (mingw) EXTRALIBS := -ifeq ($(OS),Windows_NT) +ifneq (,$(findstring mingw,$(CANONICAL_HOST_TYPE))) EXTRALIBS := -lws2_32 endif