Mercurial > mxe-octave
changeset 3175:f283b410a60f
[MSVC] remove -lm from pkgconfig files of FFTW and Pango
| author | Michael Goffioul <michael.goffioul@gmail.com> |
|---|---|
| date | Thu, 25 Jul 2013 15:43:35 -0400 |
| parents | 6e323510f5b5 |
| children | 0fc090129214 |
| files | src/fftw.mk src/msvc-pango-1.patch |
| diffstat | 2 files changed, 17 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/fftw.mk Wed Jul 24 21:19:58 2013 -0400 +++ b/src/fftw.mk Thu Jul 25 15:43:35 2013 -0400 @@ -25,6 +25,9 @@ endef define $(PKG)_BUILD + if [ $(MXE_SYSTEM) = msvc ]; then \ + $(SED) -i -e 's,-lm\>,,' '$(1)/fftw.pc.in'; \ + fi cd '$(1)' && ./configure \ F77=$(MXE_F77) \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
--- a/src/msvc-pango-1.patch Wed Jul 24 21:19:58 2013 -0400 +++ b/src/msvc-pango-1.patch Thu Jul 25 15:43:35 2013 -0400 @@ -1,6 +1,18 @@ +diff -ur pango-1.34.1-orig/configure pango-1.34.1/configure +--- pango-1.34.1-orig/configure 2013-05-13 11:34:47 -0400 ++++ pango-1.34.1/configure 2013-07-25 09:47:14 -0400 +@@ -19745,7 +19745,7 @@ + PKGCONFIG_CAIRO_REQUIRES= + + if test $enable_explicit_deps = yes ; then +- PKGCONFIG_MATH_LIBS=-lm ++ PKGCONFIG_MATH_LIBS= + + X_LIBS="$X_LIBS $X_EXTRA_LIBS" + diff -ur pango-1.34.1-orig/pango/Makefile.in pango-1.34.1/pango/Makefile.in --- pango-1.34.1-orig/pango/Makefile.in 2013-05-13 11:34:50 -0400 -+++ pango-1.34.1/pango/Makefile.in 2013-07-22 22:18:27 -0400 ++++ pango-1.34.1/pango/Makefile.in 2013-07-25 09:46:13 -0400 @@ -80,7 +80,7 @@ POST_UNINSTALL = : build_triplet = @build@ @@ -46,7 +58,7 @@ @HAVE_XFT_TRUE@am__append_35 = libpangoxft-$(PANGO_API_VERSION).la diff -ur pango-1.34.1-orig/pango-view/viewer-cairo.c pango-1.34.1/pango-view/viewer-cairo.c --- pango-1.34.1-orig/pango-view/viewer-cairo.c 2012-08-24 15:08:22 -0400 -+++ pango-1.34.1/pango-view/viewer-cairo.c 2013-07-22 22:21:37 -0400 ++++ pango-1.34.1/pango-view/viewer-cairo.c 2013-07-25 09:46:13 -0400 @@ -76,7 +76,9 @@ #endif /* HAVE_XFT */ #endif /* HAVE_CAIRO_XLIB */