From 08709d125b99a05ee48fa1ebfc364c35ffbaf874 Mon Sep 17 00:00:00 2001 From: Lauri Tirkkonen Date: Mon, 4 Nov 2019 15:46:05 +0200 Subject: [PATCH] pcre: put 64-bit bins in usr/bin needed for correct output from pcre-config --- components/library/pcre/Makefile | 3 +++ components/library/pcre/pcre.p5m | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/components/library/pcre/Makefile b/components/library/pcre/Makefile index ce736f790..fb6213930 100644 --- a/components/library/pcre/Makefile +++ b/components/library/pcre/Makefile @@ -64,6 +64,9 @@ LDFLAGS += -L$(CONFIGURE_LIBDIR.$(BITS)) -R$(CONFIGURE_LIBDIR.$(BITS)) LINTFLAGS+= -I. $(studio_XBITS) $(CPP_LARGEFILES) +CONFIGURE_BINDIR.64 = $(CONFIGURE_PREFIX)/bin +CONFIGURE_BINDIR.32 = $(CONFIGURE_PREFIX)/bin/$(MACH32) + CONFIGURE_ENV+= "CPP=$(CC) $(CPPFLAGS) $(CFLAGS) -E" CONFIGURE_ENV+= "CXXCPP=$(CXX) $(CPPFLAGS) $(CXXFLAGS) -E" CONFIGURE_ENV+= "CXXLDFLAGS=$(LDFLAGS)" diff --git a/components/library/pcre/pcre.p5m b/components/library/pcre/pcre.p5m index 93057ad21..5e349d47f 100644 --- a/components/library/pcre/pcre.p5m +++ b/components/library/pcre/pcre.p5m @@ -25,9 +25,9 @@ license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)' file pcre_internal.h path=usr/include/pcre/pcre_internal.h file ucp.h path=usr/include/pcre/ucp.h -file path=usr/bin/$(MACH64)/pcre-config -file path=usr/bin/$(MACH64)/pcregrep -file path=usr/bin/$(MACH64)/pcretest +file path=usr/bin/$(MACH32)/pcre-config +file path=usr/bin/$(MACH32)/pcregrep +file path=usr/bin/$(MACH32)/pcretest file path=usr/bin/pcre-config file path=usr/bin/pcregrep file path=usr/bin/pcretest -- 2.11.4.GIT