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 1DA671382C5 for ; Sat, 10 Apr 2021 08:31:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6E939E0837; Sat, 10 Apr 2021 08:31:42 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 52C61E0837 for ; Sat, 10 Apr 2021 08:31:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 CB6F7335D8A for ; Sat, 10 Apr 2021 08:31:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5AB544A8 for ; Sat, 10 Apr 2021 08:31:39 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1618043491.4db13a86d16973ebc6ff65e41c6c220d901b2841.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/xpaint/, media-gfx/xpaint/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/xpaint/files/xpaint-3.1.3-libtool-clang.patch media-gfx/xpaint/xpaint-3.1.3.ebuild X-VCS-Directories: media-gfx/xpaint/files/ media-gfx/xpaint/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 4db13a86d16973ebc6ff65e41c6c220d901b2841 X-VCS-Branch: master Date: Sat, 10 Apr 2021 08:31:39 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: cafb8c60-2be5-487f-8e53-7eb94cbda4a4 X-Archives-Hash: 5bf88b23bb9d2137ecd100cc65d85537 commit: 4db13a86d16973ebc6ff65e41c6c220d901b2841 Author: Viorel Munteanu gmail com> AuthorDate: Sun Mar 28 11:50:11 2021 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Sat Apr 10 08:31:31 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4db13a86 media-gfx/xpaint: fix emerging with `rdlibtool` `rdlibtool` is part of `sys-devel/slibtool` Closes: https://bugs.gentoo.org/778791 Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Viorel Munteanu gmail.com> Signed-off-by: Joonas Niilola gentoo.org> .../xpaint/files/xpaint-3.1.3-libtool-clang.patch | 37 ++++++++++++++++++---- media-gfx/xpaint/xpaint-3.1.3.ebuild | 1 - 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/media-gfx/xpaint/files/xpaint-3.1.3-libtool-clang.patch b/media-gfx/xpaint/files/xpaint-3.1.3-libtool-clang.patch index 92ccb899ce1..9aef70c8a9a 100644 --- a/media-gfx/xpaint/files/xpaint-3.1.3-libtool-clang.patch +++ b/media-gfx/xpaint/files/xpaint-3.1.3-libtool-clang.patch @@ -1,26 +1,51 @@ libtool doesn't work if compiling with clang. Need to add --tag=CC -Also don't hardcode /usr/bin/tool in gentoo prefix +Don't hardcode /usr/bin/libtool in gentoo prefix See bug https://bugs.gentoo.org/731010 + +rdlibtool needs to find system libtool in current directory +See bug https://bugs.gentoo.org/778791 --- a/configure.ac +++ b/configure.ac -@@ -17,6 +17,9 @@ +@@ -17,6 +17,10 @@ AC_LANG_C AM_PROG_AR -+dnl search libtool -+AC_PATH_PROG([PROGLIBTOOL], [libtool]) ++dnl libtool ++LT_INIT ++AC_SUBST([LIBTOOL_DEPS]) + ## basic types AC_TYPE_INT8_T --- a/xpaintrw/Makefile.am +++ b/xpaintrw/Makefile.am -@@ -28,7 +28,7 @@ +@@ -28,7 +28,8 @@ xpaint_DEFINES = $(ARCH_DEFINES) $(EXTRA_DEFINES) $(XAWLIB_DEFINES) -LIBTOOL = /usr/bin/libtool -+LIBTOOL = @PROGLIBTOOL@ --tag=CC ++LIBTOOL = ../libtool ++AM_LIBTOOLFLAGS = --tag=CC AM_CFLAGS = @X_CFLAGS@ @SPECIAL_CFLAGS@ $(xpaint_DEFINES) AM_YFLAGS = -d CLEANFILES = +--- a/Makefile.am ++++ b/Makefile.am +@@ -53,12 +53,16 @@ + dist_man_MANS = xpaint.1 imgmerge.1 + AM_CFLAGS = @X_CFLAGS@ @SPECIAL_CFLAGS@ $(xpaint_DEFINES) + ACLOCAL_AMFLAGS = -I m4 +-BUILT_SOURCES = version.h DefaultRC.txt.h messages.h XPaint.ad.h xpaint.1 ++BUILT_SOURCES = version.h DefaultRC.txt.h messages.h XPaint.ad.h xpaint.1 libtool + AM_YFLAGS = -d + CLEANFILES = preproc substads \ + version.h DefaultRC.txt.h messages.h XPaint.ad.h xpaint.1 + EXTRA_DIST = + ++LIBTOOL_DEPS = @LIBTOOL_DEPS@ ++libtool: ++ $(SHELL) ./config.status libtool ++ + BASE_HDRS = bitmap.h color.h crc32.h \ + Colormap.h ColormapP.h graphic.h hash.h image.h \ + menu.h messages.h misc.h operation.h ops.h \ diff --git a/media-gfx/xpaint/xpaint-3.1.3.ebuild b/media-gfx/xpaint/xpaint-3.1.3.ebuild index 131d8059027..df08e4c0d85 100644 --- a/media-gfx/xpaint/xpaint-3.1.3.ebuild +++ b/media-gfx/xpaint/xpaint-3.1.3.ebuild @@ -40,7 +40,6 @@ DEPEND="${RDEPEND}" BDEPEND=" sys-devel/bison sys-devel/flex - sys-devel/libtool virtual/pkgconfig x11-misc/imake "