From 6d5b08ed35cc5e3bc4c909cd52f7859f796a3459 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 11 Sep 2015 10:38:04 +0200 Subject: [PATCH] llvm: update armhf triplets list to handle ours. --- common/shlibs | 2 ++ srcpkgs/gflags-devel | 1 + srcpkgs/gflags/template | 16 ++++++++++++++-- .../patches/cfe/cfe-004-add-musl-triples.patch | 4 ++-- srcpkgs/llvm/template | 2 +- 5 files changed, 20 insertions(+), 5 deletions(-) create mode 120000 srcpkgs/gflags-devel diff --git a/common/shlibs b/common/shlibs index fbc5c4298af..4eccda4abd1 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2159,3 +2159,5 @@ libmemcachedutil.so.2 libmemcached-1.0.18_1 libc-client.so.1 c-client-2007f_1 libonig.so.2 oniguruma-5.9.6_1 liblo10k1.so.0 alsa-tools-1.0.29_1 +libgflags.so.2 gflags-2.1.2_1 +libgflags_nothreads.so.2 gflags-2.1.2_1 diff --git a/srcpkgs/gflags-devel b/srcpkgs/gflags-devel new file mode 120000 index 00000000000..1004c4ce88b --- /dev/null +++ b/srcpkgs/gflags-devel @@ -0,0 +1 @@ +gflags/ \ No newline at end of file diff --git a/srcpkgs/gflags/template b/srcpkgs/gflags/template index 8e364c26c98..2c3822a6e41 100644 --- a/srcpkgs/gflags/template +++ b/srcpkgs/gflags/template @@ -1,8 +1,9 @@ # Template file for 'gflags' pkgname=gflags version=2.1.2 -revision=1 +revision=2 build_style=cmake +configure_args=" -DBUILD_STATIC_LIBS=ON -DBUILD_SHARED_LIBS=ON -DBUILD_TESTING=ON" hostmakedepends="cmake" short_desc="A C++ library that implements commandline flags processing" maintainer="Diogo Leal " @@ -11,9 +12,20 @@ homepage="http://gflags.github.io/gflags" distfiles="https://github.com/gflags/gflags/archive/v${version}.tar.gz" checksum=d8331bd0f7367c8afd5fcb5f5e85e96868a00fd24b7276fa5fcee1e5575c2662 -post_install(){ +post_install() { vlicense COPYING.txt vdoc ChangeLog.txt vdoc README.md } +gflags-devel_package() { + short_desc+=" - development files" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove usr/lib/cmake + vmove usr/lib/*.a + vmove usr/lib/*.so + } +} + diff --git a/srcpkgs/llvm/files/patches/cfe/cfe-004-add-musl-triples.patch b/srcpkgs/llvm/files/patches/cfe/cfe-004-add-musl-triples.patch index 6fb79154851..a96916b74e2 100644 --- a/srcpkgs/llvm/files/patches/cfe/cfe-004-add-musl-triples.patch +++ b/srcpkgs/llvm/files/patches/cfe/cfe-004-add-musl-triples.patch @@ -17,8 +17,8 @@ index 15e36a1..3cd6dd1 100644 static const char *const ARMHFTriples[] = {"arm-linux-gnueabihf", - "armv7hl-redhat-linux-gnueabi"}; + "armv7hl-redhat-linux-gnueabi", -+ "armv6-linux-musleabihf", -+ "armv7-linux-musleabihf", ++ "armv6-linux-musleabihf", "armv6l-linux-musleabihf", ++ "armv7-linux-musleabihf", "armv7l-linux-musleabihf", + "arm-linux-musleabihf" }; static const char *const ARMebLibDirs[] = {"/lib"}; static const char *const ARMebTriples[] = {"armeb-linux-gnueabi", diff --git a/srcpkgs/llvm/template b/srcpkgs/llvm/template index 8c6bdd7b927..59f9a23120f 100644 --- a/srcpkgs/llvm/template +++ b/srcpkgs/llvm/template @@ -1,7 +1,7 @@ # Template file for 'llvm' pkgname=llvm version=3.7.0 -revision=1 +revision=2 wrksrc="llvm-${version}.src" lib32disabled=yes configure_args="--disable-expensive-checks --disable-debug-runtime