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 93407138350 for ; Sun, 16 Feb 2020 05:43:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6D8DFE087E; Sun, 16 Feb 2020 05:43:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 0C956E07A7 for ; Sun, 16 Feb 2020 05:43:20 +0000 (UTC) Received: from pomiot (c142-245.icpnet.pl [85.221.142.245]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: mgorny) by smtp.gentoo.org (Postfix) with ESMTPSA id E502634ED62; Sun, 16 Feb 2020 05:43:17 +0000 (UTC) Message-ID: <249e4f83f8bd7a639fd4a0edfbd2c74c830ea5a5.camel@gentoo.org> Subject: Re: [gentoo-dev] [PATCH 7/9] ruby-ng-gnome2.eclass: support non-build packages From: =?UTF-8?Q?Micha=C5=82_G=C3=B3rny?= To: gentoo-dev@lists.gentoo.org Cc: ruby@gentoo.org, Naohiro Aota Date: Sun, 16 Feb 2020 06:43:13 +0100 In-Reply-To: <20200215121833.3631177-7-naota@gentoo.org> References: <20200215121833.3631177-1-naota@gentoo.org> <20200215121833.3631177-7-naota@gentoo.org> Organization: Gentoo Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-axHELicFvcb/W7G0muj0" User-Agent: Evolution 3.32.5 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 X-Archives-Salt: 24c80127-828a-4daa-948b-590bbebae362 X-Archives-Hash: 9ea1b83374bafde95c0ead6d5c62cb03 --=-axHELicFvcb/W7G0muj0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Sat, 2020-02-15 at 21:18 +0900, Naohiro Aota wrote: > Some ruby-gnome2 ebuild does not build C bindings, so there is no need to > call each_ruby_{configure,compile} and emake install of this eclass. Chec= k > if "extconf.rb" and "Makefile" to decide what to do. >=20 > Signed-off-by: Naohiro Aota > --- > eclass/ruby-ng-gnome2.eclass | 14 ++++++++++---- > 1 file changed, 10 insertions(+), 4 deletions(-) >=20 > diff --git a/eclass/ruby-ng-gnome2.eclass b/eclass/ruby-ng-gnome2.eclass > index 1cc3cdce4ce6..619a02d0d1d7 100644 > --- a/eclass/ruby-ng-gnome2.eclass > +++ b/eclass/ruby-ng-gnome2.eclass > @@ -51,6 +51,8 @@ SLOT=3D"0" > # @DESCRIPTION: > # Run the configure script in the subbinding for each specific ruby targ= et. > each_ruby_configure() { > + test -e extconf.rb || return Don't use 'test'. > + > ${RUBY} extconf.rb || die "extconf.rb failed" > } > =20 > @@ -58,6 +60,8 @@ each_ruby_configure() { > # @DESCRIPTION: > # Compile the C bindings in the subbinding for each specific ruby target= . > each_ruby_compile() { > + test -e Makefile || return > + > # We have injected --no-undefined in Ruby as a safety precaution > # against broken ebuilds, but the Ruby-Gnome bindings > # unfortunately rely on the lazy load of other extensions; see bug > @@ -74,11 +78,13 @@ each_ruby_compile() { > # @DESCRIPTION: > # Install the files in the subbinding for each specific ruby target. > each_ruby_install() { > - # Create the directories, or the package will create them as files. > - local archdir=3D$(ruby_rbconfig_value "sitearchdir") > - dodir ${archdir#${EPREFIX}} /usr/$(get_libdir)/pkgconfig > + if [ -e Makefile ]; then Don't use [. > + # Create the directories, or the package will create them as files. > + local archdir=3D$(ruby_rbconfig_value "sitearchdir") > + dodir ${archdir#${EPREFIX}} /usr/$(get_libdir)/pkgconfig > =20 > - emake DESTDIR=3D"${D}" install || die "make install failed" > + emake DESTDIR=3D"${D}" install || die "make install failed" > + fi > =20 > each_fakegem_install > } --=20 Best regards, Micha=C5=82 G=C3=B3rny --=-axHELicFvcb/W7G0muj0 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iQGTBAABCgB9FiEEx2qEUJQJjSjMiybFY5ra4jKeJA4FAl5I1nJfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEM3 NkE4NDUwOTQwOThEMjhDQzhCMjZDNTYzOUFEQUUyMzI5RTI0MEUACgkQY5ra4jKe JA7k6gf/T1zZciZcFOulCumRVJQmo6gVcjuq2rSEnE7Ru8OIV6HgNFYdCcfhFsFl 9qUNRD0vsRZIbaLkhpkU2CpDjQ6CVPl7psPOg5mTeMWLKv7VDRk/3VKcQUESE/TC PH3hg4OHU/OILfaPJttpvrF25xwqIl9DgkJ9pksTRFL+19yiKtUkgi1vZgbwsAV6 n4op+rmH0KKFU09CqTUMK26d/biAzPOy9iWgG8BX8m0KBEdWHhkOLlA4vbcJORHq hYAV53bnGHOLr3LebT+Q2qSJL1iUiwInI33ar6OYkuzAuSlcYsUfzPbyXx9uSBoC eAFzB4Y/HapaMrBCnTpckgqrEcZvCA== =JFIN -----END PGP SIGNATURE----- --=-axHELicFvcb/W7G0muj0--