Mercurial > mxe-octave

changeset 3088:79d8d9ae6d78

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[MSVC] enable PCRE compilation
author Michael Goffioul <michael.goffioul@gmail.com>
date Mon, 24 Jun 2013 22:48:07 -0400
parents 3663f6300abf
children a2d273624ad7
files src/pcre.mk
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/pcre.mk	Mon Jun 24 22:10:13 2013 -0400
+++ b/src/pcre.mk	Mon Jun 24 22:48:07 2013 -0400
@@ -17,8 +17,9 @@
 endef
 
 define $(PKG)_BUILD
-    $(SED) -i 's,__declspec(dllimport),,' '$(1)/pcre.h.in'
-    $(SED) -i 's,__declspec(dllimport),,' '$(1)/pcreposix.h'
+    $(if $(filter-out msvc,$(MXE_SYSTEM)),
+        $(SED) -i 's|__declspec(dllimport)||' '$(1)/pcre.h.in'
+        $(SED) -i 's|__declspec(dllimport)||' '$(1)/pcreposix.h')
     cd '$(1)' && ./configure \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
@@ -29,7 +30,7 @@
         --disable-cpp \
         --disable-pcregrep-libz \
         --disable-pcregrep-libbz2 \
-        --disable-pcretest-libreadline
+        --disable-pcretest-libreadline && $(CONFIGURE_POST_HOOK)
     rm -f '$(HOST_PREFIX)'/share/man/man3/pcre16*.3
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
     $(INSTALL) -m755 $(HOST_BINDIR)/pcre-config $(BUILD_TOOLS_PREFIX)/bin/pcre-config