| 1 |
commit: 4db13a86d16973ebc6ff65e41c6c220d901b2841 |
| 2 |
Author: Viorel Munteanu <ceamac.paragon <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Mar 28 11:50:11 2021 +0000 |
| 4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Apr 10 08:31:31 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4db13a86 |
| 7 |
|
| 8 |
media-gfx/xpaint: fix emerging with `rdlibtool` |
| 9 |
|
| 10 |
`rdlibtool` is part of `sys-devel/slibtool` |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/778791 |
| 13 |
Package-Manager: Portage-3.0.17, Repoman-3.0.2 |
| 14 |
Signed-off-by: Viorel Munteanu <ceamac.paragon <AT> gmail.com> |
| 15 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
| 16 |
|
| 17 |
.../xpaint/files/xpaint-3.1.3-libtool-clang.patch | 37 ++++++++++++++++++---- |
| 18 |
media-gfx/xpaint/xpaint-3.1.3.ebuild | 1 - |
| 19 |
2 files changed, 31 insertions(+), 7 deletions(-) |
| 20 |
|
| 21 |
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 |
| 22 |
index 92ccb899ce1..9aef70c8a9a 100644 |
| 23 |
--- a/media-gfx/xpaint/files/xpaint-3.1.3-libtool-clang.patch |
| 24 |
+++ b/media-gfx/xpaint/files/xpaint-3.1.3-libtool-clang.patch |
| 25 |
@@ -1,26 +1,51 @@ |
| 26 |
libtool doesn't work if compiling with clang. Need to add --tag=CC |
| 27 |
-Also don't hardcode /usr/bin/tool in gentoo prefix |
| 28 |
+Don't hardcode /usr/bin/libtool in gentoo prefix |
| 29 |
See bug https://bugs.gentoo.org/731010 |
| 30 |
+ |
| 31 |
+rdlibtool needs to find system libtool in current directory |
| 32 |
+See bug https://bugs.gentoo.org/778791 |
| 33 |
--- a/configure.ac |
| 34 |
+++ b/configure.ac |
| 35 |
-@@ -17,6 +17,9 @@ |
| 36 |
+@@ -17,6 +17,10 @@ |
| 37 |
AC_LANG_C |
| 38 |
AM_PROG_AR |
| 39 |
|
| 40 |
-+dnl search libtool |
| 41 |
-+AC_PATH_PROG([PROGLIBTOOL], [libtool]) |
| 42 |
++dnl libtool |
| 43 |
++LT_INIT |
| 44 |
++AC_SUBST([LIBTOOL_DEPS]) |
| 45 |
+ |
| 46 |
## basic types |
| 47 |
|
| 48 |
AC_TYPE_INT8_T |
| 49 |
--- a/xpaintrw/Makefile.am |
| 50 |
+++ b/xpaintrw/Makefile.am |
| 51 |
-@@ -28,7 +28,7 @@ |
| 52 |
+@@ -28,7 +28,8 @@ |
| 53 |
|
| 54 |
xpaint_DEFINES = $(ARCH_DEFINES) $(EXTRA_DEFINES) $(XAWLIB_DEFINES) |
| 55 |
|
| 56 |
-LIBTOOL = /usr/bin/libtool |
| 57 |
-+LIBTOOL = @PROGLIBTOOL@ --tag=CC |
| 58 |
++LIBTOOL = ../libtool |
| 59 |
++AM_LIBTOOLFLAGS = --tag=CC |
| 60 |
AM_CFLAGS = @X_CFLAGS@ @SPECIAL_CFLAGS@ $(xpaint_DEFINES) |
| 61 |
AM_YFLAGS = -d |
| 62 |
CLEANFILES = |
| 63 |
+--- a/Makefile.am |
| 64 |
++++ b/Makefile.am |
| 65 |
+@@ -53,12 +53,16 @@ |
| 66 |
+ dist_man_MANS = xpaint.1 imgmerge.1 |
| 67 |
+ AM_CFLAGS = @X_CFLAGS@ @SPECIAL_CFLAGS@ $(xpaint_DEFINES) |
| 68 |
+ ACLOCAL_AMFLAGS = -I m4 |
| 69 |
+-BUILT_SOURCES = version.h DefaultRC.txt.h messages.h XPaint.ad.h xpaint.1 |
| 70 |
++BUILT_SOURCES = version.h DefaultRC.txt.h messages.h XPaint.ad.h xpaint.1 libtool |
| 71 |
+ AM_YFLAGS = -d |
| 72 |
+ CLEANFILES = preproc substads \ |
| 73 |
+ version.h DefaultRC.txt.h messages.h XPaint.ad.h xpaint.1 |
| 74 |
+ EXTRA_DIST = |
| 75 |
+ |
| 76 |
++LIBTOOL_DEPS = @LIBTOOL_DEPS@ |
| 77 |
++libtool: |
| 78 |
++ $(SHELL) ./config.status libtool |
| 79 |
++ |
| 80 |
+ BASE_HDRS = bitmap.h color.h crc32.h \ |
| 81 |
+ Colormap.h ColormapP.h graphic.h hash.h image.h \ |
| 82 |
+ menu.h messages.h misc.h operation.h ops.h \ |
| 83 |
|
| 84 |
diff --git a/media-gfx/xpaint/xpaint-3.1.3.ebuild b/media-gfx/xpaint/xpaint-3.1.3.ebuild |
| 85 |
index 131d8059027..df08e4c0d85 100644 |
| 86 |
--- a/media-gfx/xpaint/xpaint-3.1.3.ebuild |
| 87 |
+++ b/media-gfx/xpaint/xpaint-3.1.3.ebuild |
| 88 |
@@ -40,7 +40,6 @@ DEPEND="${RDEPEND}" |
| 89 |
BDEPEND=" |
| 90 |
sys-devel/bison |
| 91 |
sys-devel/flex |
| 92 |
- sys-devel/libtool |
| 93 |
virtual/pkgconfig |
| 94 |
x11-misc/imake |
| 95 |
" |
Archives