[oe-commits] org.oe.dev libpcre-native: Fix linking issues when the build system doesn't have pcre installed

[rpurdie commit]

libpcre-native: Fix linking issues when the build system doesn't have pcre installed

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 47cf4379c3d6fc30e93d54988dcc1fd1d03396fd
ViewMTN: http://monotone.openembedded.org/revision/info/47cf4379c3d6fc30e93d54988dcc1fd1d03396fd
Files:
1
packages/libpcre/files
packages/libpcre/files/native-rpath-link.patch
packages/libpcre/libpcre-native_4.4.bb
Diffs:

#
# mt diff -rf52d7d3a273a02c7b40d7541a780ac5e72a1236c -r47cf4379c3d6fc30e93d54988dcc1fd1d03396fd
#
#
#
# add_dir "packages/libpcre/files"
# 
# add_file "packages/libpcre/files/native-rpath-link.patch"
#  content [c4ece8ea84d5dbb6fecc3f49a01df9fc42dc0184]
# 
# patch "packages/libpcre/libpcre-native_4.4.bb"
#  from [668b260f9be79e217b0fafda0fd3477908bdd4bb]
#    to [ed1f69edae4a3f980279b01f41cff189d07002d0]
#
============================================================
--- packages/libpcre/files/native-rpath-link.patch	c4ece8ea84d5dbb6fecc3f49a01df9fc42dc0184
+++ packages/libpcre/files/native-rpath-link.patch	c4ece8ea84d5dbb6fecc3f49a01df9fc42dc0184
@@ -0,0 +1,19 @@
+Index: pcre-4.4/Makefile.in
+===================================================================
+--- pcre-4.4.orig/Makefile.in	2003-08-21 11:43:07.000000000 +0100
++++ pcre-4.4/Makefile.in	2008-03-19 10:34:08.000000000 +0000
+@@ -107,12 +107,12 @@
+ 
+ libpcre.la:     $(OBJ)
+ 		-rm -f libpcre.la
+-		$(LINKLIB) -rpath $(LIBDIR) -version-info \
++		$(LINKLIB) -rpath $(LIBDIR) -L$(LIBDIR) -version-info \
+ 		'$(PCRELIBVERSION)' -o libpcre.la $(LOBJ)
+ 
+ libpcreposix.la: pcreposix. at OBJEXT@
+ 		-rm -f libpcreposix.la
+-		$(LINKLIB) -rpath $(LIBDIR) libpcre.la -version-info \
++		$(LINKLIB) -rpath $(LIBDIR) -L$(LIBDIR) libpcre.la -version-info \
+ 		'$(PCREPOSIXLIBVERSION)' -o libpcreposix.la pcreposix.lo
+ 
+ pcre. at OBJEXT@:  $(top_srcdir)/chartables.c $(top_srcdir)/pcre.c \
============================================================
--- packages/libpcre/libpcre-native_4.4.bb	668b260f9be79e217b0fafda0fd3477908bdd4bb
+++ packages/libpcre/libpcre-native_4.4.bb	ed1f69edae4a3f980279b01f41cff189d07002d0
@@ -6,3 +6,14 @@ PROVIDES = ""
 # NOTE: multiple providers are available (libpcre, libpcre-native);
 # NOTE: consider defining PREFERRED_PROVIDER_pcre
 PROVIDES = ""
+
+SRC_URI += "file://native-rpath-link.patch;patch=1"
+
+do_compile () {
+	# The generation of dftables can lead to timestamp problems with ccache
+	# because the generated config.h seems newer.  It is sufficient to ensure that the
+	# attempt to build dftables inside make will actually work (foo_FOR_BUILD is
+	# only used for this).
+	oe_runmake CC_FOR_BUILD="${BUILD_CC}" CFLAGS_FOR_BUILD="-DLINK_SIZE=2 -I${S}/include" LINK_FOR_BUILD="${BUILD_CC}"
+}
+