view src/of-strings-1-fixes.patch @ 4128:253ac032547a

Fix more problems with libmng recipe (bug #47712). * src/libmng.mk: Remove unnecessary mkdir command in recipe. Call autoreconf with --force option because the libmng archive file ships with an out-of-date ltmain.sh which will not be replaced without --force.
author Rik <rik@octave.org>
date Wed, 20 Apr 2016 15:39:48 -0700
parents 76247f439f51
children 00e61c4a5657
line wrap: on
line source

diff -ur strings-1.2.0.orig/src/Makefile strings-1.2.0/src/Makefile
--- strings-1.2.0.orig/src/Makefile	2015-06-08 13:43:45.551556353 -0400
+++ strings-1.2.0/src/Makefile	2015-06-08 13:45:22.693478306 -0400
@@ -1,11 +1,7 @@
 OCTAVE ?= octave
 MKOCTFILE ?= mkoctfile -Wall
 
-PCRE_SWITCHES := $(shell $(OCTAVE) \
-	--no-gui --no-init-file --no-site-file --silent --no-history \
-	--eval 'disp (octave_config_info ("PCRE_LIBS"));' \
-	--eval 'disp (octave_config_info ("PCRE_CPPFLAGS"));' \
-	)
+PCRE_SWITCHES := $(shell pcre-config --libs)
 
 pcregexp.oct: %.oct: %.cc
 	$(MKOCTFILE) $(PCRE_SWITCHES) -o $@ $<