Mercurial > mxe-octave
changeset 3787:282bc5054a7f
(incompletely) attempt to make osmesa actually build for Windows
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sat, 14 Feb 2015 19:58:11 -0500 |
| parents | e515bc026d10 |
| children | f6d63f2a2de6 |
| files | dist-files.mk src/mingw-osmesa-1-pthreads.patch src/osmesa.mk |
| diffstat | 3 files changed, 28 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/dist-files.mk Thu Feb 12 13:46:07 2015 -0500 +++ b/dist-files.mk Sat Feb 14 19:58:11 2015 -0500 @@ -132,7 +132,6 @@ glibmm.mk \ glpk-1-fixes.patch \ glpk.mk \ - glproto.mk \ gmp.mk \ gnu-linux-ghostscript-configure.patch \ gnuplot-1-fixes.patch \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/mingw-osmesa-1-pthreads.patch Sat Feb 14 19:58:11 2015 -0500 @@ -0,0 +1,23 @@ +diff -u a/configure.ac b/configure.ac +--- a/configure.ac 2014-06-25 00:33:39.000000000 -0400 ++++ b/configure.ac 2015-02-14 19:03:49.113882994 -0500 +@@ -514,11 +514,17 @@ + AC_CHECK_FUNC([posix_memalign], [DEFINES="$DEFINES -DHAVE_POSIX_MEMALIGN"]) + + dnl Check for pthreads +-AX_PTHREAD ++case "$host_os" in ++ mingw*) ++ ;; ++ *) ++ AX_PTHREAD + dnl AX_PTHREADS leaves PTHREAD_LIBS empty for gcc and sets PTHREAD_CFLAGS + dnl to -pthread, which causes problems if we need -lpthread to appear in + dnl pkgconfig files. +-test -z "$PTHREAD_LIBS" && PTHREAD_LIBS="-lpthread" ++ test -z "$PTHREAD_LIBS" && PTHREAD_LIBS="-lpthread" ++ ;; ++esac + + dnl SELinux awareness. + AC_ARG_ENABLE([selinux],
--- a/src/osmesa.mk Thu Feb 12 13:46:07 2015 -0500 +++ b/src/osmesa.mk Sat Feb 14 19:58:11 2015 -0500 @@ -16,11 +16,13 @@ define $(PKG)_BUILD mkdir '$(1)/.build' - cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \ + cd '$(1)' && autoreconf + cd '$(1)/.build' && autoreconf && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ - --disable-dri --disable-egl --without-gallium-drivers \ - --enable-osmesa \ + --enable-osmesa --disable-dri --without-gallium-drivers --disable-egl \ && $(CONFIGURE_POST_HOOK) + + $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)' endef