Mercurial > mxe-octave
changeset 3441:be097438c96f
make native gnu-linux builds work for pkg-config and libgomp
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 22 Jan 2014 05:05:01 -0500 |
parents | e24ccde182f2 |
children | ebe73c541a16 |
files | Makefile.in src/libgomp.mk src/pkg-config.mk src/transfig-1-configure.patch |
diffstat | 3 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.in Wed Jan 22 01:12:43 2014 -0500 +++ b/Makefile.in Wed Jan 22 05:05:01 2014 -0500 @@ -323,8 +323,10 @@ NOTEPAD_BASE_DIR := $(TOP_DIR)/notepad++ endif -else ifneq ($(MXE_SYSTEM),msvc) +else ifeq ($(MXE_SYSTEM),msvc) MXE_WINDOWS_BUILD := yes +else + MXE_WINDOWS_BUILD := no MXE_CPPFLAGS := '-I$(HOST_INCDIR)' ifeq ($(MXE_USE_LIB64_DIRECTORY),yes) MXE_LDFLAGS := '-L$(HOST_LIBDIR) -L$(HOST_LIB64DIR)'
--- a/src/libgomp.mk Wed Jan 22 01:12:43 2014 -0500 +++ b/src/libgomp.mk Wed Jan 22 05:05:01 2014 -0500 @@ -15,7 +15,7 @@ endef ifeq ($(MXE_WINDOWS_BUILD),yes) - $(PKG)_SYSDEP_CONFIGURE_OPTIONS = LIBS='-lws2_32' + $(PKG)_SYSDEP_CONFIGURE_OPTIONS := LIBS='-lws2_32' endif define $(PKG)_BUILD
--- a/src/pkg-config.mk Wed Jan 22 01:12:43 2014 -0500 +++ b/src/pkg-config.mk Wed Jan 22 05:05:01 2014 -0500 @@ -25,9 +25,10 @@ cd '$(1).build' && '$(1)/configure' \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --with-internal-glib \ + --with-libiconv=gnu \ $($(PKG)_CONFIG_OPTS) \ --with-pc_path='$(HOST_LIBDIR)/pkgconfig' \ --prefix='$(HOST_PREFIX)' - $(MAKE) -C '$(1).build' -j '$(JOBS)' + $(MAKE) -C '$(1).build' V=1 -j 1 $(MAKE) -C '$(1).build' -j 1 install DESTDIR='$(3)' endef