diff --git a/common/shlibs b/common/shlibs index 13e60040d8..4c498743c2 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1228,3 +1228,4 @@ librumpnet.so.0 netbsd-rumpkernel-20130321_1 librumpkern_sys_linux.so.0 netbsd-rumpkernel-20130321_1 libdotconf.so.0 dotconf-1.3_1 libspeechd.so.2 speech-dispatcher-0.8_1 +libre2.so.0 re2-20130115_1 diff --git a/srcpkgs/re2-devel b/srcpkgs/re2-devel new file mode 120000 index 0000000000..99ea962b72 --- /dev/null +++ b/srcpkgs/re2-devel @@ -0,0 +1 @@ +re2/ \ No newline at end of file diff --git a/srcpkgs/re2/patches/re2-cross-compile.patch b/srcpkgs/re2/patches/re2-cross-compile.patch new file mode 100644 index 0000000000..c3ebe6aeb8 --- /dev/null +++ b/srcpkgs/re2/patches/re2-cross-compile.patch @@ -0,0 +1,31 @@ +--- Makefile.orig 2012-10-21 17:15:03.000000000 +0400 ++++ Makefile 2013-04-23 19:42:13.789582841 +0400 +@@ -9,13 +9,13 @@ + # CCPCRE=-I/usr/local/include -DUSEPCRE + # LDPCRE=-L/usr/local/lib -lpcre + +-CXX=g++ +-CXXFLAGS=-Wall -O3 -g -pthread # can override +-RE2_CXXFLAGS=-Wno-sign-compare -c -I. $(CCPCRE) # required +-LDFLAGS=-pthread +-AR=ar ++CXX?=g++ ++CXXFLAGS?=-Wall -O3 -g -pthread # can override ++RE2_CXXFLAGS?=-Wno-sign-compare -c -I. $(CCPCRE) # required ++LDFLAGS?=-pthread ++AR?=ar + ARFLAGS=rsc +-NM=nm ++NM?=nm + NMFLAGS=-p + + # Variables mandated by GNU, the arbiter of all good taste on the internet. +@@ -25,7 +25,7 @@ + bindir=$(exec_prefix)/bin + includedir=$(prefix)/include + libdir=$(exec_prefix)/lib +-INSTALL=install ++INSTALL?=install + INSTALL_PROGRAM=$(INSTALL) + INSTALL_DATA=$(INSTALL) -m 644 + diff --git a/srcpkgs/re2/patches/re2-symbols-r0.patch b/srcpkgs/re2/patches/re2-symbols-r0.patch new file mode 100644 index 0000000000..1fb9f2e35c --- /dev/null +++ b/srcpkgs/re2/patches/re2-symbols-r0.patch @@ -0,0 +1,10 @@ +--- libre2.symbols.orig 2012-11-07 04:45:57.000000000 +0100 ++++ libre2.symbols 2012-11-07 04:46:20.000000000 +0100 +@@ -10,6 +10,7 @@ + _ZlsRSoRKN3re211StringPieceE; + # re2::FilteredRE2* + _ZN3re211FilteredRE2*; ++ _ZNK3re211FilteredRE2*; + local: + *; + }; diff --git a/srcpkgs/re2/template b/srcpkgs/re2/template new file mode 100644 index 0000000000..f7f4ef3eb3 --- /dev/null +++ b/srcpkgs/re2/template @@ -0,0 +1,28 @@ +# Template build file for 're2'. +pkgname=re2 +version=20130115 +revision=1 +build_style=gnu-makefile +make_install_args="prefix=/usr" +wrksrc=re2 +short_desc="An efficient, principled regular expression library" +maintainer="ojab " +license="LGPL2.1" +homepage="https://code.google.com/p/re2/" +checksum=a95d83ed8203817587f7cc368b6f7199d8a4b1558372c306b07201058b92e1fe +distfiles="https://${pkgname}.googlecode.com/files/${pkgname}-${version}.tgz" + +re2_package() { + pkg_install() { + vmove all + } +} + +re2-devel_package() { + short_desc="${short_desc} -- development files" + depends="${sourcepkg}-${version}_${revision}" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.a" + } +}