From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 73D951382C5 for ; Sun, 4 Mar 2018 14:57:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 932D3E0870; Sun, 4 Mar 2018 14:57:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5FC3EE0870 for ; Sun, 4 Mar 2018 14:57:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B8DFA335C74 for ; Sun, 4 Mar 2018 14:57:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 94A4D211 for ; Sun, 4 Mar 2018 14:57:40 +0000 (UTC) From: "Yixun Lan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Yixun Lan" Message-ID: <1520175200.8f69d6fe4ca77d44807f58f55a5143d1fd5c1bbd.dlan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libcork/, net-libs/libcork/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/libcork/files/libcork-0.15.0-git.patch net-libs/libcork/files/libcork-0.15.0-version.patch net-libs/libcork/libcork-0.15.0.ebuild X-VCS-Directories: net-libs/libcork/ net-libs/libcork/files/ X-VCS-Committer: dlan X-VCS-Committer-Name: Yixun Lan X-VCS-Revision: 8f69d6fe4ca77d44807f58f55a5143d1fd5c1bbd X-VCS-Branch: master Date: Sun, 4 Mar 2018 14:57:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4447fb4b-8d77-4592-8351-e1b7cfebbfad X-Archives-Hash: 0d9a2627d1a194d0e75e8e31837a1948 commit: 8f69d6fe4ca77d44807f58f55a5143d1fd5c1bbd Author: Yixun Lan gentoo org> AuthorDate: Sun Mar 4 14:50:34 2018 +0000 Commit: Yixun Lan gentoo org> CommitDate: Sun Mar 4 14:53:20 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f69d6fe net-libs/libcork: fix build err Package-Manager: Portage-2.3.19, Repoman-2.3.6 net-libs/libcork/files/libcork-0.15.0-git.patch | 16 ++++++++++++++++ net-libs/libcork/files/libcork-0.15.0-version.patch | 15 +++++++++++++++ net-libs/libcork/libcork-0.15.0.ebuild | 21 +++++++++++++++++++-- 3 files changed, 50 insertions(+), 2 deletions(-) diff --git a/net-libs/libcork/files/libcork-0.15.0-git.patch b/net-libs/libcork/files/libcork-0.15.0-git.patch new file mode 100644 index 00000000000..54a54a412f4 --- /dev/null +++ b/net-libs/libcork/files/libcork-0.15.0-git.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1e236f9..c8770f6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -49,11 +49,6 @@ execute_process( + OUTPUT_VARIABLE GIT_SHA1 + OUTPUT_STRIP_TRAILING_WHITESPACE + ) +-if(GIT_SHA1_RESULT) +- message(FATAL_ERROR +- "Cannot determine git commit: " ${GIT_SHA1_RESULT}) +-endif(GIT_SHA1_RESULT) +- + #----------------------------------------------------------------------- + # Check for building on Tilera + # If the Tilera environment is installed, then $TILERA_ROOT is defined diff --git a/net-libs/libcork/files/libcork-0.15.0-version.patch b/net-libs/libcork/files/libcork-0.15.0-version.patch new file mode 100644 index 00000000000..64cef927443 --- /dev/null +++ b/net-libs/libcork/files/libcork-0.15.0-version.patch @@ -0,0 +1,15 @@ +diff --git a/version.sh b/version.sh +index 40e8d05..e06443f 100755 +--- a/version.sh ++++ b/version.sh +@@ -17,8 +17,8 @@ + # Note that the RELEASE-VERSION file should *not* be checked into git; + # please add it to your top-level .gitignore file. + +-version=$(git describe) +-if [ -n ${version} ]; then ++[ -d .git ] && version=$(git describe) ++if [ -n "${version}" ]; then + # If we got something from git-describe, write the version to the + # output file. + echo ${version} > RELEASE-VERSION diff --git a/net-libs/libcork/libcork-0.15.0.ebuild b/net-libs/libcork/libcork-0.15.0.ebuild index 3a4e572ad7f..f31843ee66b 100644 --- a/net-libs/libcork/libcork-0.15.0.ebuild +++ b/net-libs/libcork/libcork-0.15.0.ebuild @@ -3,6 +3,8 @@ EAPI=6 +inherit cmake-utils + DESCRIPTION="A simple, easily embeddable cross-platform C library" HOMEPAGE="https://github.com/dcreager/libcork" SRC_URI="https://github.com/dcreager/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" @@ -12,5 +14,20 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -DEPEND="" -RDEPEND="${DEPEND}" +RDEPEND="dev-libs/check" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +src_prepare() { + if ! [ -e "${S}"/RELEASE-VERSION ] ; then + echo ${PV} > "${S}"/RELEASE-VERSION || die + fi + eapply "${FILESDIR}"/${P}-git.patch + eapply "${FILESDIR}"/${P}-version.patch + + cmake-utils_src_prepare +} + +src_install() { + cmake-utils_src_install +}