[gentoo-commits] repo/gentoo:master commit in: net-fs/cvmfs/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Sebastien Fabbro" <bicatali@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-fs/cvmfs/
Date: Tue, 18 Jul 2017 16:12:16 +0000 (UTC)	[thread overview]
Message-ID: <1500394188.43c7f8b2781e4b51706915a8dd5e55ff24b18cdc.bicatali@gentoo> (raw)

commit:     43c7f8b2781e4b51706915a8dd5e55ff24b18cdc
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 17 23:34:52 2017 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Tue Jul 18 16:09:48 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43c7f8b2

net-fs/cvmfs: fix to respect toolchain / cross-compiling

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 net-fs/cvmfs/cvmfs-2.3.5.ebuild | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/net-fs/cvmfs/cvmfs-2.3.5.ebuild b/net-fs/cvmfs/cvmfs-2.3.5.ebuild
index ae16006ece1..8913abdb7b1 100644
--- a/net-fs/cvmfs/cvmfs-2.3.5.ebuild
+++ b/net-fs/cvmfs/cvmfs-2.3.5.ebuild
@@ -82,21 +82,22 @@ src_prepare() {
 	sed -e "s:cvmfs-\${CernVM-FS_VERSION_STRING}:${PF}:" \
 		-i CMakeLists.txt || die
 
-	sed -e 's|${res_path}/conf.d|${res_path/modules.d|' \
-		-i cvmfs/cvmfs_server || die
-
-	# hack for bundled vjson sha2 and sha3
-	# vjson not worth unbundling, already upstream obsolete
-	# upstream replaced by gason with a new api
-	sed -e 's/g++/$(CXX)/g' \
-		-e 's/ar/$(AR)/' \
-		-e 's/ranlib/$(RANLIB)/' \
-		-i externals/vjson/src/Makefile || die
-	local d
-	for d in vjson sha2 sha3; do
-		mkdir -p "${WORKDIR}/${P}_build"/externals/build_${d}
-		cp -r externals/${d}/src/* \
-		   "${WORKDIR}/${P}_build"/externals/build_${d}/ || die
+	# hack for bundled packages
+	# not worth unbundling upstreams are flaky/dead
+	local pkg
+	for pkg in vjson sha2 sha3; do
+		# respect toolchain variables
+		sed -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)/' \
+			-i externals/${pkg}/src/Makefile || die
+		mkdir -p "${WORKDIR}/${P}_build"/externals/build_${pkg}
+		cp -r externals/${pkg}/src/* \
+		   "${WORKDIR}/${P}_build"/externals/build_${pkg}/ || die
 	done
 }

next             reply	other threads:[~2017-07-18 16:12 UTC|newest]

Thread overview: 60+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-07-18 16:12 Sebastien Fabbro [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-09-09 12:43 [gentoo-commits] repo/gentoo:master commit in: net-fs/cvmfs/ Guilherme Amadio
2025-08-22  8:52 Guilherme Amadio
2025-07-03  8:04 Guilherme Amadio
2025-04-21  7:51 Sam James
2025-02-28 17:01 Guilherme Amadio
2025-02-02 10:25 Guilherme Amadio
2024-12-18  9:17 Guilherme Amadio
2024-12-06  9:27 Guilherme Amadio
2024-12-06  9:27 Guilherme Amadio
2024-11-23  8:55 Arthur Zamarin
2024-11-23  8:06 Arthur Zamarin
2024-09-30 14:19 Guilherme Amadio
2024-08-06 12:31 Guilherme Amadio
2024-08-06 12:31 Guilherme Amadio
2024-08-06 12:31 Guilherme Amadio
2024-07-03 11:53 Guilherme Amadio
2024-03-10 17:15 Guilherme Amadio
2024-03-10 16:55 Guilherme Amadio
2024-03-10 16:55 Guilherme Amadio
2024-03-10 16:55 Guilherme Amadio
2023-11-02 10:45 Guilherme Amadio
2023-10-27  6:56 Guilherme Amadio
2023-05-14  8:48 Sam James
2023-05-14  8:48 Sam James
2023-03-02  9:40 Guilherme Amadio
2023-01-26 21:06 Andreas Sturmlechner
2023-01-03 18:28 Sam James
2023-01-03 18:28 Sam James
2022-09-19 12:11 Guilherme Amadio
2022-09-19 12:11 Guilherme Amadio
2022-09-19 12:11 Guilherme Amadio
2022-03-28 14:52 Guilherme Amadio
2022-03-16 15:13 Guilherme Amadio
2022-02-11  7:56 Guilherme Amadio
2022-02-11  7:56 Guilherme Amadio
2021-12-14 10:03 Guilherme Amadio
2021-09-21 15:43 Guilherme Amadio
2021-09-21 15:43 Guilherme Amadio
2021-09-21 15:43 Guilherme Amadio
2021-08-25 13:06 Guilherme Amadio
2021-06-28 19:20 Guilherme Amadio
2021-06-16  8:35 Guilherme Amadio
2021-06-16  8:35 Guilherme Amadio
2021-06-16  8:35 Guilherme Amadio
2020-08-30 14:55 Mikle Kolyada
2020-06-26 13:16 Guilherme Amadio
2020-06-20  6:09 Guilherme Amadio
2020-06-20  5:53 Guilherme Amadio
2020-06-19  8:23 Guilherme Amadio
2020-06-19  7:52 Guilherme Amadio
2020-06-19  7:20 Guilherme Amadio
2020-06-19  7:20 Guilherme Amadio
2019-12-03  8:20 Guilherme Amadio
2019-11-10 14:14 Mikle Kolyada
2019-06-14  6:43 Guilherme Amadio
2019-06-11 10:12 Guilherme Amadio
2018-08-26 17:08 Michał Górny
2017-08-17 16:20 Sebastien Fabbro
2017-07-18 16:12 Sebastien Fabbro

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:ae16006ece dfblob:8913abdb7b )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: net-fs/cvmfs/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1500394188.43c7f8b2781e4b51706915a8dd5e55ff24b18cdc.bicatali@gentoo \
    --to=bicatali@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox