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 7B4E3138350 for ; Sat, 15 Feb 2020 12:20:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 38F53E0985; Sat, 15 Feb 2020 12:19:03 +0000 (UTC) Received: from mail-pg1-x542.google.com (mail-pg1-x542.google.com [IPv6:2607:f8b0:4864:20::542]) (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 A6910E097E for ; Sat, 15 Feb 2020 12:19:02 +0000 (UTC) Received: by mail-pg1-x542.google.com with SMTP id z12so6574754pgl.4 for ; Sat, 15 Feb 2020 04:19:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AMiqOLNdkVUxQrSneHqfmL7zwv5/SlLQ40w5/0+r6uo=; b=OGm+TSc3cb2cbgXbUq4xv8PbzDDM2njA4iFQOWmPoIAblgjRMKuvAaWCxd5N640DHa ht5lkbd2E0EMuVrXj7M2rMGPJShgPxbelHdRf23wRGHq2gmTX/BfSEEKQaA4L2mhBPnM H5+tJ5R6CVXR/XQQYslJ6pZMtc2Saak7W3inem9ys2JOGHXpnqjNcyrWnIlI+8mrodd+ DayiKF6lINyc5x2ajnH/t+gfuqKifS1jpdEXDs59skrOsq0coXPN9Ta5hCWhGlOmbfUy lZ1OlEXEtiUwzNiLwjeXXfwO6cjWp4y2a4DaObVvH1UbSMLUk9/fX3NJQCXudTR5UV0S jaiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=AMiqOLNdkVUxQrSneHqfmL7zwv5/SlLQ40w5/0+r6uo=; b=bC87PJJ9uOEHONEg+85Wd3nMvItYL2P35Y+vmdkqIrT/jRIhOW4IW6Yi8PRoFlwOxa UGc+LIuvUpMuvkT27uEKP7PzJImAggjOZi+FuRim+zPTxrlMV9jc78MJtIQun4Fmiq7E wHqkmkddhd7x25DX+GVVhsDhhd47jwutS3yyXn1o9RRQRkzW9H/fpDJBcdyc9S42HvC6 jCMpyZyIQizVRRVTPy3jLK/Cr18rZhvu8C6iraVs9YpTThB9Jvllw4u+FkRHWEx/B91k gakNfreE8hPyZzmNWSUjUjBXy/JGdEb7DWaiQPyJp3dLU5/qSbeqJow8GAYsDTdG+UF4 mNVg== X-Gm-Message-State: APjAAAUc+dwOllvCzifjV7+KIJMOcqgUkGiEUR/kZ/SetGAlKWF+MwXB Yuf+2ZRmJgILxz1RbWird7P9Rt/blns= X-Google-Smtp-Source: APXvYqzeNkhj62GQXSgodyeoqqpLR+O2eaQkMBt4s8lvwSSmnUBt49DWXYZw2HA9tkxNw/vzk08pQg== X-Received: by 2002:a63:505b:: with SMTP id q27mr8428161pgl.39.1581769139942; Sat, 15 Feb 2020 04:18:59 -0800 (PST) Received: from localhost ([240d:1a:2cc:8e00:9ae8:15b8:5709:4ef]) by smtp.gmail.com with ESMTPSA id r3sm10761465pfg.145.2020.02.15.04.18.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Feb 2020 04:18:59 -0800 (PST) Sender: Naohiro Aota From: Naohiro Aota To: gentoo-dev@lists.gentoo.org Cc: ruby@gentoo.org, Naohiro Aota Subject: [gentoo-dev] [PATCH 7/9] ruby-ng-gnome2.eclass: support non-build packages Date: Sat, 15 Feb 2020 21:18:31 +0900 Message-Id: <20200215121833.3631177-7-naota@gentoo.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200215121833.3631177-1-naota@gentoo.org> References: <20200215121833.3631177-1-naota@gentoo.org> 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 Content-Transfer-Encoding: 8bit X-Archives-Salt: de24d5a3-0dbd-4179-92d1-18b4c6a594ad X-Archives-Hash: 676202981450dbe11c86708858f5f41b 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. Check if "extconf.rb" and "Makefile" to decide what to do. Signed-off-by: Naohiro Aota --- eclass/ruby-ng-gnome2.eclass | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) 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="0" # @DESCRIPTION: # Run the configure script in the subbinding for each specific ruby target. each_ruby_configure() { + test -e extconf.rb || return + ${RUBY} extconf.rb || die "extconf.rb failed" } @@ -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=$(ruby_rbconfig_value "sitearchdir") - dodir ${archdir#${EPREFIX}} /usr/$(get_libdir)/pkgconfig + if [ -e Makefile ]; then + # Create the directories, or the package will create them as files. + local archdir=$(ruby_rbconfig_value "sitearchdir") + dodir ${archdir#${EPREFIX}} /usr/$(get_libdir)/pkgconfig - emake DESTDIR="${D}" install || die "make install failed" + emake DESTDIR="${D}" install || die "make install failed" + fi each_fakegem_install } -- 2.25.0