Mercurial > mxe-octave

annotate src/of-strings-1-fixes.patch @ 3977:e114dbf6ba1e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dist-files.mk: include of-queueing.mk
author John W. Eaton <jwe@octave.org>
date Thu, 18 Jun 2015 18:34:19 -0400
parents 76247f439f51
children 00e61c4a5657
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3962
76247f439f51 of-strings: update to v1.2.0
John Donoghue
parents: 3902
diff changeset
1 diff -ur strings-1.2.0.orig/src/Makefile strings-1.2.0/src/Makefile
76247f439f51 of-strings: update to v1.2.0
John Donoghue
parents: 3902
diff changeset
2 --- strings-1.2.0.orig/src/Makefile 2015-06-08 13:43:45.551556353 -0400
76247f439f51 of-strings: update to v1.2.0
John Donoghue
parents: 3902
diff changeset
3 +++ strings-1.2.0/src/Makefile 2015-06-08 13:45:22.693478306 -0400
76247f439f51 of-strings: update to v1.2.0
John Donoghue
parents: 3902
diff changeset
4 @@ -1,11 +1,7 @@
76247f439f51 of-strings: update to v1.2.0
John Donoghue
parents: 3902
diff changeset
5 OCTAVE ?= octave
76247f439f51 of-strings: update to v1.2.0
John Donoghue
parents: 3902
diff changeset
6 MKOCTFILE ?= mkoctfile -Wall
3902
cc946e55afb3 of-strings: add to mxe
John Donoghue
parents:
diff changeset
7
3962
76247f439f51 of-strings: update to v1.2.0
John Donoghue
parents: 3902
diff changeset
8 -PCRE_SWITCHES := $(shell $(OCTAVE) \
76247f439f51 of-strings: update to v1.2.0
John Donoghue
parents: 3902
diff changeset
9 - --no-gui --no-init-file --no-site-file --silent --no-history \
76247f439f51 of-strings: update to v1.2.0
John Donoghue
parents: 3902
diff changeset
10 - --eval 'disp (octave_config_info ("PCRE_LIBS"));' \
76247f439f51 of-strings: update to v1.2.0
John Donoghue
parents: 3902
diff changeset
11 - --eval 'disp (octave_config_info ("PCRE_CPPFLAGS"));' \
76247f439f51 of-strings: update to v1.2.0
John Donoghue
parents: 3902
diff changeset
12 - )
76247f439f51 of-strings: update to v1.2.0
John Donoghue
parents: 3902
diff changeset
13 +PCRE_SWITCHES := $(shell pcre-config --libs)
3902
cc946e55afb3 of-strings: add to mxe
John Donoghue
parents:
diff changeset
14
3962
76247f439f51 of-strings: update to v1.2.0
John Donoghue
parents: 3902
diff changeset
15 pcregexp.oct: %.oct: %.cc
76247f439f51 of-strings: update to v1.2.0
John Donoghue
parents: 3902
diff changeset
16 $(MKOCTFILE) $(PCRE_SWITCHES) -o $@ $<