* [gentoo-commits] dev/bicatali:master commit in: net-fs/cvmfs/
@ 2015-08-14 18:44 Sebastien Fabbro
0 siblings, 0 replies; 10+ messages in thread
From: Sebastien Fabbro @ 2015-08-14 18:44 UTC (permalink / raw
To: gentoo-commits
commit: f370687460744860dbcd3c6c2546a9b435cb2238
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 14 18:28:27 2015 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Fri Aug 14 18:28:27 2015 +0000
URL: https://gitweb.gentoo.org/dev/bicatali.git/commit/?id=f3706874
The server has run time dependency on the client, so remove the client use flag. Refactored a few dependencies
net-fs/cvmfs/cvmfs-2.1.20.0_p05-r2.ebuild | 157 ++++++++++++++++++++++++++++++
1 file changed, 157 insertions(+)
diff --git a/net-fs/cvmfs/cvmfs-2.1.20.0_p05-r2.ebuild b/net-fs/cvmfs/cvmfs-2.1.20.0_p05-r2.ebuild
new file mode 100644
index 0000000..00dc852
--- /dev/null
+++ b/net-fs/cvmfs/cvmfs-2.1.20.0_p05-r2.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils linux-info
+
+MYP=${PN}-${PV/_p/-fix}
+
+DESCRIPTION="HTTP read-only file system for distributing software"
+HOMEPAGE="http://cernvm.cern.ch/portal/filesystem"
+SRC_URI="https://github.com/cvmfs/${PN}/archive/${MYP}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="aufs debug doc server test test-programs"
+
+CDEPEND="
+ dev-cpp/gtest
+ dev-db/sqlite:3=
+ dev-libs/openssl:0
+ net-libs/pacparser:0=
+ net-misc/curl:0=[adns]
+ sys-apps/attr
+ sys-libs/zlib:0=
+ >=dev-cpp/sparsehash-1.12
+ dev-libs/leveldb:0=
+ sys-fs/fuse:0=
+ server? (
+ >=dev-python/geoip-python-1.3.1
+ >=dev-cpp/tbb-4.3:0= )"
+
+RDEPEND="${CDEPEND}
+ app-admin/sudo
+ net-fs/autofs
+ server? (
+ aufs? ( || (
+ sys-fs/aufs3
+ sys-fs/aufs4
+ sys-kernel/aufs-sources ) )
+ www-servers/apache )"
+
+DEPEND="${CDEPEND}
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen[dot] )
+ test? (
+ >=dev-python/geoip-python-1.3.1
+ >=dev-cpp/tbb-4.3:0= )"
+
+REQUIRED_USE="test-programs? ( server )"
+
+S="${WORKDIR}/${PN}-${MYP}"
+
+pkg_setup() {
+ if use server; then
+ if use aufs; then
+ CONFIG_CHECK="~AUFS_FS"
+ ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set with the aufs flag"
+ else
+ CONFIG_CHECK="~OVERLAY_FS"
+ ERROR_AUFS_FS="CONFIG_OVERLAY_FS: is required to be set"
+ fi
+ linux-info_pkg_setup
+ fi
+}
+
+PATCHES=(
+ "${FILESDIR}"/${P}-geoip-missing-cmake.patch
+ "${FILESDIR}"/${P}-cares-underlink.patch
+ "${FILESDIR}"/${P}-overlayfs.patch
+)
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ # gentoo stuff
+ sed -i -e 's/COPYING//' CMakeLists.txt || die
+ rm bootstrap.sh || die
+ sed -i \
+ -e "s:cvmfs-\${CernVM-FS_VERSION_STRING}:${PF}:" \
+ CMakeLists.txt || die
+
+ # should be gone in >= 2.2
+ sed -i \
+ -e 's|/etc/auto.master|/etc/autofs/auto.master|g' \
+ -e 's|/etc/sysconfig/autofs|/etc/conf.d/autofs|g' \
+ cvmfs/cvmfs_config || die
+
+ sed -i \
+ -e 's|${res_path}/conf.d|${res_path/modules.d|' \
+ cvmfs/cvmfs_server || die
+
+ # hack for bundled vjson
+ # vjson not worth unbundling, already upstream obsolete
+ # upstream replaced by gason with a new api
+ if use server; then
+ sed -i \
+ -e 's/g++/$(CXX)/g' \
+ -e 's/-O2/$(CXXFLAGS)/g' \
+ -e 's/ar/$(AR)/' \
+ -e 's/ranlib/$(RANLIB)/' \
+ externals/vjson/src/Makefile || die
+ mkdir -p "${WORKDIR}/${P}_build"/externals/build_vjson
+ cp externals/vjson/src/* \
+ "${WORKDIR}/${P}_build"/externals/build_vjson/ || die
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DGEOIP_BUILTIN=OFF
+ -DGOOGLETEST_BUILTIN=OFF
+ -DLEVELDB_BUILTIN=OFF
+ -DLIBCURL_BUILTIN=OFF
+ -DPACPARSER_BUILTIN=OFF
+ -DSPARSEHASH_BUILTIN=OFF
+ -DSQLITE3_BUILTIN=OFF
+ -DTBB_PRIVATE_LIB=OFF
+ -DZLIB_BUILTIN=OFF
+ -DBUILD_CVMFS=ON
+ -DBUILD_LIBCVMFS=ON
+ -DINSTALL_MOUNT_SCRIPTS=ON
+ $(cmake-utils_use server BUILD_SERVER)
+ $(cmake-utils_use test BUILD_UNITTESTS)
+ $(cmake-utils_use test-programs INSTALL_UNITTESTS)
+ )
+ if use debug; then
+ mycmakeargs+=(
+ $(cmake-utils_use server BUILD_SERVER_DEBUG)
+ $(cmake-utils_use test BUILD_UNITTESTS_DEBUG)
+ )
+ fi
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+ if use doc; then
+ cd doc
+ doxygen cvmfs.doxy || die
+ fi
+}
+
+src_install() {
+ cmake-utils_src_install
+ use doc && dohtml -r doc/html/*
+}
+
+pkg_config() {
+ einfo "Setting up CernVM-FS client"
+ cvmfs_config setup
+ einfo "Now edit ${EROOT%/}/etc/cvmfs/default.local"
+ einfo "and restart the autofs service"
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] dev/bicatali:master commit in: net-fs/cvmfs/
@ 2015-08-14 18:44 Sebastien Fabbro
0 siblings, 0 replies; 10+ messages in thread
From: Sebastien Fabbro @ 2015-08-14 18:44 UTC (permalink / raw
To: gentoo-commits
commit: d752f3cb3a3efb3803e65f854e5c9dabc643861e
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 14 18:27:01 2015 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Fri Aug 14 18:27:01 2015 +0000
URL: https://gitweb.gentoo.org/dev/bicatali.git/commit/?id=d752f3cb
Rewrote description, update use flags
net-fs/cvmfs/metadata.xml | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/net-fs/cvmfs/metadata.xml b/net-fs/cvmfs/metadata.xml
index fa44600..da430be 100644
--- a/net-fs/cvmfs/metadata.xml
+++ b/net-fs/cvmfs/metadata.xml
@@ -5,19 +5,16 @@
<email>bicatali@gentoo.org</email>
</maintainer>
<longdescription lang='en'>
- The CernVM File System is a client-server file system developed to
- deliver software stacks onto virtual machines in a fast, scalable,
- and reliable way. CernVM-FS is implemented as a FUSE module. It
- makes a specially prepared directory tree stored on a web server
- look like a local read-only file system on the virtual
- machine. CernVM-FS uses outgoing HTTP connections only, thereby it
- avoids most of the firewall issues of other network file systems. It
- transfers data file by file on demand, verifying the content by
- SHA-1 keys.
+ CernVM File System (CernVM-FS) is a network file system based on
+ HTTP and optimized to deliver software in a fast, scalable, and
+ reliable way. Files and file metadata are aggressively cached and
+ downloaded on demand. Thereby the CernVM-FS decouples the life cycle
+ management of the application software releases from the operating
+ system.
</longdescription>
<use>
- <flag name='client'>Install the cvmfs client programs and autofs scripts</flag>
- <flag name='server'>Install the server and init script (requires apache and OverlayFS)</flag>
- <flag name='aufs'>Use AUFS instead of OverlayFS for older kernels</flag>
+ <flag name='aufs'>Use AUFS instead of OverlayFS for the server</flag>
+ <flag name='server'>Install the CVMFS server (needs apache and OverlayFS)</flag>
+ <flag name='test-programs'>Install unit test programs</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] dev/bicatali:master commit in: net-fs/cvmfs/
@ 2015-08-14 18:44 Sebastien Fabbro
0 siblings, 0 replies; 10+ messages in thread
From: Sebastien Fabbro @ 2015-08-14 18:44 UTC (permalink / raw
To: gentoo-commits
commit: 78e4ea13e7a55fd74d91ae5f525f2e01a057ca5f
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 14 18:29:50 2015 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Fri Aug 14 18:29:50 2015 +0000
URL: https://gitweb.gentoo.org/dev/bicatali.git/commit/?id=78e4ea13
Updated the live ebuild to match upstream changes
net-fs/cvmfs/cvmfs-9999.ebuild | 139 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 139 insertions(+)
diff --git a/net-fs/cvmfs/cvmfs-9999.ebuild b/net-fs/cvmfs/cvmfs-9999.ebuild
new file mode 100644
index 0000000..1f8aab8
--- /dev/null
+++ b/net-fs/cvmfs/cvmfs-9999.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="https://github.com/sfabbro/cvmfs.git"
+EGIT_BRANCH="devel"
+
+inherit cmake-utils linux-info git-r3
+
+SRC_URI=""
+KEYWORDS=""
+
+DESCRIPTION="HTTP read-only file system for distributing software"
+HOMEPAGE="http://cernvm.cern.ch/portal/filesystem"
+
+LICENSE="BSD"
+SLOT="0"
+
+IUSE="aufs debug doc server test test-programs"
+
+CDEPEND="
+ dev-cpp/gtest
+ dev-db/sqlite:3=
+ dev-libs/openssl:0
+ net-libs/pacparser:0=
+ net-misc/curl:0=[adns]
+ sys-apps/attr
+ sys-libs/zlib:0=
+ >=dev-cpp/sparsehash-1.12
+ dev-libs/leveldb:0=
+ sys-fs/fuse:0=
+ server? (
+ >=dev-python/geoip-python-1.3.1
+ >=dev-cpp/tbb-4.3:0= )"
+
+RDEPEND="${CDEPEND}
+ app-admin/sudo
+ net-fs/autofs
+ server? (
+ aufs? ( || (
+ sys-fs/aufs3
+ sys-fs/aufs4
+ sys-kernel/aufs-sources ) )
+ www-servers/apache )"
+
+DEPEND="${CDEPEND}
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen[dot] )
+ test? (
+ >=dev-python/geoip-python-1.3.1
+ >=dev-cpp/tbb-4.3:0= )"
+
+REQUIRED_USE="test-programs? ( server )"
+
+pkg_setup() {
+ if use server; then
+ if use aufs; then
+ CONFIG_CHECK="~AUFS_FS"
+ ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set with the aufs flag"
+ else
+ CONFIG_CHECK="~OVERLAY_FS"
+ ERROR_AUFS_FS="CONFIG_OVERLAY_FS: is required to be set"
+ fi
+ linux-info_pkg_setup
+ fi
+}
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ # gentoo stuff
+ sed -i -e 's/COPYING//' CMakeLists.txt || die
+ # this removal avoids all bundled packages to be configured and built
+ rm bootstrap.sh || die
+
+ sed -i \
+ -e "s:cvmfs-\${CernVM-FS_VERSION_STRING}:${PF}:" \
+ CMakeLists.txt || die
+
+ # hack for bundled vjson and sha2
+ # vjson and sha2 not worth unbundling upstreams are flaky/dead
+ local pkg
+ for pkg in vjson sha2; do
+ # respect toolchain variables
+ sed -i \
+ -e 's/g++/$(CXX)/g' \
+ -e 's/gcc/$(CC)/g' \
+ -e 's/-O2/$(CFLAGS)/g' \
+ -e 's/-O2/$(CXXFLAGS)/g' \
+ -e 's/ar/$(AR)/' \
+ -e 's/ranlib/$(RANLIB)/' \
+ externals/${pkg}/src/Makefile || die
+ mkdir -p "${WORKDIR}/${P}_build"/externals/build_${pkg}
+ cp externals/${pkg}/src/* \
+ "${WORKDIR}/${P}_build"/externals/build_${pkg}/ || die
+ done
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DGEOIP_BUILTIN=OFF
+ -DGOOGLETEST_BUILTIN=OFF
+ -DLEVELDB_BUILTIN=OFF
+ -DLIBCURL_BUILTIN=OFF
+ -DPACPARSER_BUILTIN=OFF
+ -DSPARSEHASH_BUILTIN=OFF
+ -DSQLITE3_BUILTIN=OFF
+ -DTBB_PRIVATE_LIB=OFF
+ -DZLIB_BUILTIN=OFF
+ -DBUILD_CVMFS=ON
+ -DBUILD_LIBCVMFS=ON
+ -DINSTALL_MOUNT_SCRIPTS=ON
+ $(cmake-utils_use doc BUILD_DOCUMENTATION)
+ $(cmake-utils_use server BUILD_SERVER)
+ $(cmake-utils_use test BUILD_UNITTESTS)
+ $(cmake-utils_use test-programs INSTALL_UNITTESTS)
+ )
+ if use debug; then
+ mycmakeargs+=(
+ $(cmake-utils_use server BUILD_SERVER_DEBUG)
+ $(cmake-utils_use test BUILD_UNITTESTS_DEBUG)
+ )
+ fi
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ use doc && dohtml -r doc/html/*
+}
+
+pkg_config() {
+ einfo "Setting up CernVM-FS client"
+ cvmfs_config setup
+ einfo "Now edit ${EROOT%/}/etc/cvmfs/default.local"
+ einfo "and restart the autofs service"
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] dev/bicatali:master commit in: net-fs/cvmfs/
@ 2015-08-14 18:44 Sebastien Fabbro
0 siblings, 0 replies; 10+ messages in thread
From: Sebastien Fabbro @ 2015-08-14 18:44 UTC (permalink / raw
To: gentoo-commits
commit: ce8cdbc0317395b45c4b4a7d6ae1534f8dc5dfe2
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 14 18:29:09 2015 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Fri Aug 14 18:29:09 2015 +0000
URL: https://gitweb.gentoo.org/dev/bicatali.git/commit/?id=ce8cdbc0
removed buggy ebuild
net-fs/cvmfs/cvmfs-2.1.20.0_p05-r1.ebuild | 151 ------------------------------
1 file changed, 151 deletions(-)
diff --git a/net-fs/cvmfs/cvmfs-2.1.20.0_p05-r1.ebuild b/net-fs/cvmfs/cvmfs-2.1.20.0_p05-r1.ebuild
deleted file mode 100644
index a1fd03b..0000000
--- a/net-fs/cvmfs/cvmfs-2.1.20.0_p05-r1.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/cvmfs/cvmfs-2.1.20.0_p05.ebuild,v 1.2 2015/08/07 19:00:39 bicatali Exp $
-
-EAPI=5
-
-inherit cmake-utils linux-info
-
-MYP=${PN}-${PV/_p/-fix}
-
-DESCRIPTION="HTTP read-only file system for distributing software"
-HOMEPAGE="http://cernvm.cern.ch/portal/filesystem"
-SRC_URI="https://github.com/cvmfs/${PN}/archive/${MYP}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="aufs +client debug doc test server"
-
-CDEPEND="
- dev-cpp/gtest
- dev-db/sqlite:3=
- dev-libs/openssl:0
- net-libs/pacparser:0=
- net-misc/curl:0=[adns]
- sys-apps/attr
- sys-libs/zlib:0=
- client? (
- >=dev-cpp/sparsehash-1.12
- dev-libs/leveldb:0=
- sys-fs/fuse:0= )
- server? (
- >=dev-python/geoip-python-1.3.1
- >=dev-cpp/tbb-4.3:0= )"
-
-RDEPEND="${CDEPEND}
- client? ( net-fs/autofs )
- aufs? (
- || (
- sys-fs/aufs3
- sys-fs/aufs4
- sys-kernel/aufs-sources
- )
- )"
-
-DEPEND="${CDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen[dot] )"
-
-S="${WORKDIR}/${PN}-${MYP}"
-
-pkg_setup() {
- if use server; then
- if use aufs; then
- CONFIG_CHECK="
- ~AUFS_FS
- ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
- "
- ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used"
- else
- CONFIG_CHECK="~OVERLAY_FS"
- fi
- linux-info_pkg_setup
- fi
-}
-
-PATCHES=(
- "${FILESDIR}"/${P}-geoip-missing-cmake.patch
- "${FILESDIR}"/${P}-cares-underlink.patch
- "${FILESDIR}"/${P}-overlayfs.patch
-)
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # gentoo stuff
- sed -i -e 's/COPYING//' CMakeLists.txt || die
- rm bootstrap.sh || die
- sed -i \
- -e "s:cvmfs-\${CernVM-FS_VERSION_STRING}:${PF}:" \
- CMakeLists.txt || die
-
- # should be gone in >= 2.2
- sed -i \
- -e 's|/etc/auto.master|/etc/autofs/auto.master|g' \
- -e 's|/etc/sysconfig/autofs|/etc/conf.d/autofs|g' \
- cvmfs/cvmfs_config || die
-
- sed -i \
- -e 's|${res_path}/conf.d|${res_path/modules.d|' \
- cvmfs/cvmfs_server || die
-
- # hack for bundled vjson
- # vjson not worth unbundling, already upstream obsolete
- # upstream replaced by gason with a new api
- if use server; then
- sed -i \
- -e 's/g++/$(CXX)/g' \
- -e 's/-O2/$(CXXFLAGS)/g' \
- -e 's/ar/$(AR)/' \
- -e 's/ranlib/$(RANLIB)/' \
- externals/vjson/src/Makefile || die
- mkdir -p "${WORKDIR}/${P}_build"/externals/build_vjson
- cp externals/vjson/src/* \
- "${WORKDIR}/${P}_build"/externals/build_vjson/ || die
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DGEOIP_BUILTIN=OFF
- -DGOOGLETEST_BUILTIN=OFF
- -DLEVELDB_BUILTIN=OFF
- -DLIBCURL_BUILTIN=OFF
- -DPACPARSER_BUILTIN=OFF
- -DSPARSEHASH_BUILTIN=OFF
- -DSQLITE3_BUILTIN=OFF
- -DTBB_PRIVATE_LIB=OFF
- -DZLIB_BUILTIN=OFF
- $(cmake-utils_use debug BUILD_SERVER_DEBUG)
- $(cmake-utils_use server BUILD_SERVER)
- $(cmake-utils_use client BUILD_CVMFS)
- $(cmake-utils_use client BUILD_LIBCVMFS)
- $(cmake-utils_use client INSTALL_MOUNT_SCRIPTS)
- $(cmake-utils_use test BUILD_UNITTESTS)
- )
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
- if use doc; then
- cd doc
- doxygen cvmfs.doxy || die
- fi
-}
-
-src_install() {
- cmake-utils_src_install
- use doc && dohtml -r doc/html/*
-}
-
-pkg_config() {
- if use client; then
- einfo "Setting up CernVM-FS client"
- cvmfs_config setup
- einfo "Now edit ${EROOT%/}/etc/cvmfs/default.local"
- einfo "and restart the autofs service"
- fi
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] dev/bicatali:master commit in: net-fs/cvmfs/
@ 2015-08-14 19:35 Sebastien Fabbro
0 siblings, 0 replies; 10+ messages in thread
From: Sebastien Fabbro @ 2015-08-14 19:35 UTC (permalink / raw
To: gentoo-commits
commit: 9bea335ee39f856ccf6d021c00303fb2ef5d0e6c
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 14 19:20:44 2015 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Fri Aug 14 19:20:44 2015 +0000
URL: https://gitweb.gentoo.org/dev/bicatali.git/commit/?id=9bea335e
To install test, we need to build them
net-fs/cvmfs/cvmfs-2.1.20.0_p05-r2.ebuild | 9 ++++++++-
net-fs/cvmfs/cvmfs-9999.ebuild | 9 ++++++++-
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/net-fs/cvmfs/cvmfs-2.1.20.0_p05-r2.ebuild b/net-fs/cvmfs/cvmfs-2.1.20.0_p05-r2.ebuild
index 00dc852..2bde18f 100644
--- a/net-fs/cvmfs/cvmfs-2.1.20.0_p05-r2.ebuild
+++ b/net-fs/cvmfs/cvmfs-2.1.20.0_p05-r2.ebuild
@@ -125,7 +125,6 @@ src_configure() {
-DINSTALL_MOUNT_SCRIPTS=ON
$(cmake-utils_use server BUILD_SERVER)
$(cmake-utils_use test BUILD_UNITTESTS)
- $(cmake-utils_use test-programs INSTALL_UNITTESTS)
)
if use debug; then
mycmakeargs+=(
@@ -133,6 +132,14 @@ src_configure() {
$(cmake-utils_use test BUILD_UNITTESTS_DEBUG)
)
fi
+ if use test-programs; then
+ mycmakeargs+=(
+ -DBUILD_UNITTESTS=ON
+ -DINSTALL_UNITTESTS=ON
+ )
+ else
+ mycmakeargs+=( -DINSTALL_UNITTESTS=OFF )
+ fi
cmake-utils_src_configure
}
diff --git a/net-fs/cvmfs/cvmfs-9999.ebuild b/net-fs/cvmfs/cvmfs-9999.ebuild
index 1f8aab8..bcf9821 100644
--- a/net-fs/cvmfs/cvmfs-9999.ebuild
+++ b/net-fs/cvmfs/cvmfs-9999.ebuild
@@ -115,7 +115,6 @@ src_configure() {
$(cmake-utils_use doc BUILD_DOCUMENTATION)
$(cmake-utils_use server BUILD_SERVER)
$(cmake-utils_use test BUILD_UNITTESTS)
- $(cmake-utils_use test-programs INSTALL_UNITTESTS)
)
if use debug; then
mycmakeargs+=(
@@ -123,6 +122,14 @@ src_configure() {
$(cmake-utils_use test BUILD_UNITTESTS_DEBUG)
)
fi
+ if use test-programs; then
+ mycmakeargs+=(
+ -DBUILD_UNITTESTS=ON
+ -DINSTALL_UNITTESTS=ON
+ )
+ else
+ mycmakeargs+=( -DINSTALL_UNITTESTS=OFF )
+ fi
cmake-utils_src_configure
}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] dev/bicatali:master commit in: net-fs/cvmfs/
@ 2015-08-14 20:47 Sebastien Fabbro
0 siblings, 0 replies; 10+ messages in thread
From: Sebastien Fabbro @ 2015-08-14 20:47 UTC (permalink / raw
To: gentoo-commits
commit: a610f9d9280fa44d958af0c5c9ce18fa042c5fdc
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 14 20:33:07 2015 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Fri Aug 14 20:33:07 2015 +0000
URL: https://gitweb.gentoo.org/dev/bicatali.git/commit/?id=a610f9d9
Remove conflict between two cmake flags
net-fs/cvmfs/cvmfs-2.1.20.0_p05-r2.ebuild | 13 ++++---------
net-fs/cvmfs/cvmfs-9999.ebuild | 13 ++++---------
2 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/net-fs/cvmfs/cvmfs-2.1.20.0_p05-r2.ebuild b/net-fs/cvmfs/cvmfs-2.1.20.0_p05-r2.ebuild
index 2bde18f..1f14695 100644
--- a/net-fs/cvmfs/cvmfs-2.1.20.0_p05-r2.ebuild
+++ b/net-fs/cvmfs/cvmfs-2.1.20.0_p05-r2.ebuild
@@ -124,22 +124,17 @@ src_configure() {
-DBUILD_LIBCVMFS=ON
-DINSTALL_MOUNT_SCRIPTS=ON
$(cmake-utils_use server BUILD_SERVER)
- $(cmake-utils_use test BUILD_UNITTESTS)
)
+ if use test || use test-programs; then
+ mycmakeargs+=( -DBUILD_UNITTESTS=ON )
+ fi
+ use test-programs && mycmakeargs+=( -DINSTALL_UNITTESTS=ON )
if use debug; then
mycmakeargs+=(
$(cmake-utils_use server BUILD_SERVER_DEBUG)
$(cmake-utils_use test BUILD_UNITTESTS_DEBUG)
)
fi
- if use test-programs; then
- mycmakeargs+=(
- -DBUILD_UNITTESTS=ON
- -DINSTALL_UNITTESTS=ON
- )
- else
- mycmakeargs+=( -DINSTALL_UNITTESTS=OFF )
- fi
cmake-utils_src_configure
}
diff --git a/net-fs/cvmfs/cvmfs-9999.ebuild b/net-fs/cvmfs/cvmfs-9999.ebuild
index bcf9821..0a47788 100644
--- a/net-fs/cvmfs/cvmfs-9999.ebuild
+++ b/net-fs/cvmfs/cvmfs-9999.ebuild
@@ -114,22 +114,17 @@ src_configure() {
-DINSTALL_MOUNT_SCRIPTS=ON
$(cmake-utils_use doc BUILD_DOCUMENTATION)
$(cmake-utils_use server BUILD_SERVER)
- $(cmake-utils_use test BUILD_UNITTESTS)
)
+ if use test || use test-programs; then
+ mycmakeargs+=( -DBUILD_UNITTESTS=ON )
+ fi
+ use test-programs && mycmakeargs+=( -DINSTALL_UNITTESTS=ON )
if use debug; then
mycmakeargs+=(
$(cmake-utils_use server BUILD_SERVER_DEBUG)
$(cmake-utils_use test BUILD_UNITTESTS_DEBUG)
)
fi
- if use test-programs; then
- mycmakeargs+=(
- -DBUILD_UNITTESTS=ON
- -DINSTALL_UNITTESTS=ON
- )
- else
- mycmakeargs+=( -DINSTALL_UNITTESTS=OFF )
- fi
cmake-utils_src_configure
}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] dev/bicatali:master commit in: net-fs/cvmfs/
@ 2015-08-18 16:14 Sebastien Fabbro
0 siblings, 0 replies; 10+ messages in thread
From: Sebastien Fabbro @ 2015-08-18 16:14 UTC (permalink / raw
To: gentoo-commits
commit: 7c49435d62f6a6dddf604055c9eeb77b3d95ea64
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 18 15:59:49 2015 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Tue Aug 18 15:59:49 2015 +0000
URL: https://gitweb.gentoo.org/dev/bicatali.git/commit/?id=7c49435d
installed unit test programs need gdb as dependency
net-fs/cvmfs/cvmfs-9999.ebuild | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net-fs/cvmfs/cvmfs-9999.ebuild b/net-fs/cvmfs/cvmfs-9999.ebuild
index 0a47788..a6eaeda 100644
--- a/net-fs/cvmfs/cvmfs-9999.ebuild
+++ b/net-fs/cvmfs/cvmfs-9999.ebuild
@@ -52,6 +52,8 @@ DEPEND="${CDEPEND}
>=dev-python/geoip-python-1.3.1
>=dev-cpp/tbb-4.3:0= )"
+PDEPEND="test-programs? ( sys-devel/gdb )"
+
REQUIRED_USE="test-programs? ( server )"
pkg_setup() {
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] dev/bicatali:master commit in: net-fs/cvmfs/
@ 2015-08-18 16:53 Sebastien Fabbro
0 siblings, 0 replies; 10+ messages in thread
From: Sebastien Fabbro @ 2015-08-18 16:53 UTC (permalink / raw
To: gentoo-commits
commit: 591532c1c119f5811eb49c7397ee8634b3a53402
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 18 16:38:45 2015 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Tue Aug 18 16:38:45 2015 +0000
URL: https://gitweb.gentoo.org/dev/bicatali.git/commit/?id=591532c1
switch to upstream git repo
net-fs/cvmfs/cvmfs-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-fs/cvmfs/cvmfs-9999.ebuild b/net-fs/cvmfs/cvmfs-9999.ebuild
index a6eaeda..5f87cdc 100644
--- a/net-fs/cvmfs/cvmfs-9999.ebuild
+++ b/net-fs/cvmfs/cvmfs-9999.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-EGIT_REPO_URI="https://github.com/sfabbro/cvmfs.git"
+EGIT_REPO_URI="https://github.com/cvmfs/cvmfs.git"
EGIT_BRANCH="devel"
inherit cmake-utils linux-info git-r3
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] dev/bicatali:master commit in: net-fs/cvmfs/
@ 2015-08-24 18:30 Sebastien Fabbro
0 siblings, 0 replies; 10+ messages in thread
From: Sebastien Fabbro @ 2015-08-24 18:30 UTC (permalink / raw
To: gentoo-commits
commit: 00a3ab4e0312f79ec15ab0c23bc45140b7957e30
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 24 18:16:01 2015 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Mon Aug 24 18:16:01 2015 +0000
URL: https://gitweb.gentoo.org/dev/bicatali.git/commit/?id=00a3ab4e
fix path for gentoo bash completion
net-fs/cvmfs/cvmfs-9999.ebuild | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/net-fs/cvmfs/cvmfs-9999.ebuild b/net-fs/cvmfs/cvmfs-9999.ebuild
index 5f87cdc..6e832ae 100644
--- a/net-fs/cvmfs/cvmfs-9999.ebuild
+++ b/net-fs/cvmfs/cvmfs-9999.ebuild
@@ -7,7 +7,7 @@ EAPI=5
EGIT_REPO_URI="https://github.com/cvmfs/cvmfs.git"
EGIT_BRANCH="devel"
-inherit cmake-utils linux-info git-r3
+inherit cmake-utils linux-info git-r3 bash-completion-r1
SRC_URI=""
KEYWORDS=""
@@ -72,14 +72,17 @@ pkg_setup() {
src_prepare() {
cmake-utils_src_prepare
- # gentoo stuff
- sed -i -e 's/COPYING//' CMakeLists.txt || die
# this removal avoids all bundled packages to be configured and built
rm bootstrap.sh || die
+ # specific gentoo paths and qa fixes
+ sed -i -e 's/COPYING//' CMakeLists.txt || die
sed -i \
-e "s:cvmfs-\${CernVM-FS_VERSION_STRING}:${PF}:" \
CMakeLists.txt || die
+ sed -i \
+ -e "s:/etc/bash_completion.d:$(get_bashcompdir):" \
+ cvmfs/CMakeLists.txt || die
# hack for bundled vjson and sha2
# vjson and sha2 not worth unbundling upstreams are flaky/dead
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] dev/bicatali:master commit in: net-fs/cvmfs/
@ 2015-11-10 23:07 Sebastien Fabbro
0 siblings, 0 replies; 10+ messages in thread
From: Sebastien Fabbro @ 2015-11-10 23:07 UTC (permalink / raw
To: gentoo-commits
commit: 947d8ff2e04ce14ca78d740978acccb9fb4d7b20
Author: Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com>
AuthorDate: Tue Nov 10 23:04:55 2015 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Tue Nov 10 23:04:55 2015 +0000
URL: https://gitweb.gentoo.org/dev/bicatali.git/commit/?id=947d8ff2
adding sha3 bundle
net-fs/cvmfs/cvmfs-9999.ebuild | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/net-fs/cvmfs/cvmfs-9999.ebuild b/net-fs/cvmfs/cvmfs-9999.ebuild
index 6e832ae..859dddb 100644
--- a/net-fs/cvmfs/cvmfs-9999.ebuild
+++ b/net-fs/cvmfs/cvmfs-9999.ebuild
@@ -84,21 +84,22 @@ src_prepare() {
-e "s:/etc/bash_completion.d:$(get_bashcompdir):" \
cvmfs/CMakeLists.txt || die
- # hack for bundled vjson and sha2
- # vjson and sha2 not worth unbundling upstreams are flaky/dead
+ # hack for bundled packages
+ # not worth unbundling upstreams are flaky/dead
local pkg
- for pkg in vjson sha2; do
+ for pkg in vjson sha2 sha3; do
# respect toolchain variables
sed -i \
-e 's/g++/$(CXX)/g' \
-e 's/gcc/$(CC)/g' \
+ -e 's/CFLAGS/MYCFLAGS/g' \
-e 's/-O2/$(CFLAGS)/g' \
-e 's/-O2/$(CXXFLAGS)/g' \
-e 's/ar/$(AR)/' \
-e 's/ranlib/$(RANLIB)/' \
externals/${pkg}/src/Makefile || die
mkdir -p "${WORKDIR}/${P}_build"/externals/build_${pkg}
- cp externals/${pkg}/src/* \
+ cp -r externals/${pkg}/src/* \
"${WORKDIR}/${P}_build"/externals/build_${pkg}/ || die
done
}
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2015-11-10 23:07 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-14 18:44 [gentoo-commits] dev/bicatali:master commit in: net-fs/cvmfs/ Sebastien Fabbro
-- strict thread matches above, loose matches on Subject: below --
2015-11-10 23:07 Sebastien Fabbro
2015-08-24 18:30 Sebastien Fabbro
2015-08-18 16:53 Sebastien Fabbro
2015-08-18 16:14 Sebastien Fabbro
2015-08-14 20:47 Sebastien Fabbro
2015-08-14 19:35 Sebastien Fabbro
2015-08-14 18:44 Sebastien Fabbro
2015-08-14 18:44 Sebastien Fabbro
2015-08-14 18:44 Sebastien Fabbro
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox