1 |
commit: 8bc3e9357bac813dab9c79ce98c943f78f1eb52e |
2 |
Author: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jul 2 16:26:38 2018 +0000 |
4 |
Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jul 2 16:26:38 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=8bc3e935 |
7 |
|
8 |
dev-libs/libgpg-error: fix yat2m dep bug with Cygwin |
9 |
|
10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
11 |
Manifest-Sign-Key: 0x29FB0E9EC719EE20 |
12 |
|
13 |
dev-libs/libgpg-error/Manifest | 23 ++++++ |
14 |
.../libgpg-error/files/1.29-yat2m-dep-exeext.patch | 96 ++++++++++++++++++++++ |
15 |
dev-libs/libgpg-error/libgpg-error-1.29.ebuild | 1 + |
16 |
3 files changed, 120 insertions(+) |
17 |
|
18 |
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest |
19 |
index 5547341e5d..988f2c4db9 100644 |
20 |
--- a/dev-libs/libgpg-error/Manifest |
21 |
+++ b/dev-libs/libgpg-error/Manifest |
22 |
@@ -1,3 +1,26 @@ |
23 |
+-----BEGIN PGP SIGNED MESSAGE----- |
24 |
+Hash: SHA256 |
25 |
+ |
26 |
+AUX 1.29-yat2m-dep-exeext.patch 2802 BLAKE2B 30dddaeb5779381b336c95074e70e864c57ec9d12a8d22f4bdc2340af58a3d529a77ccfaf97c3f632e5e54f3a6d7bde8c49e5e4919928db1b33c79bd86a46a64 SHA512 58390b214f0c01d8119bc6b0cc51a4a04c6d45828743d2d22c0fab5efd4204794e65ef8434a81d1b81abf94cffd10ce1fa02a410b02043051109f0a1d3a92483 |
27 |
DIST libgpg-error-1.27.tar.bz2 813060 BLAKE2B ece50b2f6f2fc21584724c07e4285ba6e3cd7c11def7155ef1e7be1d496e0d3a7abf977afa1f618b33ca8bcd0427c0c3b46fce2d0a2b9613378f06780f1aa47c SHA512 51b313c1159074fdbbce84f63bd8afd84b3b58cd608714865b25bed84c1862d050708aa06ac3dab92f1906593df5121161e594c2809653b0fb2c236cae5dcc2f |
28 |
DIST libgpg-error-1.29-solaris.patch 1445 BLAKE2B 5c7cc0babe2e4bc883991691d95eddb2c96d71972ae05e875fa9c2c8fa964489c6a0f542e1ea4bd5f8efd9df18da4787d4be337657225c0060c8e380370bc84b SHA512 6071e3dc6f280f94a96453d953baa21caac1ff0c7a258d0a2d4e3ca272b664be6fe260ed619a66a6e5d87a7cf22e877e9c30189c641b37a401d84255a2e1add1 |
29 |
DIST libgpg-error-1.29.tar.bz2 894749 BLAKE2B 27f7eb516663e31b5a4734d83117127d88abecf87aefb655eb7847546148a6a887caf7f574aae101274da20375b90b32c35d599508711f7b5eac2addfabfe4b8 SHA512 57b95a7ed0ed808f05a75d7ee700ed0317da06fde1f8c59f5a4f049d784c4598f3c693068ddd47cd8bb0efdb43b9b628b876d34211f8a3e67d5088110a15323b |
30 |
+EBUILD libgpg-error-1.27-r1.ebuild 1495 BLAKE2B 72f4fcf8748d80668827499a003b60101cba1ba94c83d3450a3ecdb3116ea53f20d8484d8297f4cfdd8c45be067faa4a7b4ffa15b379047f084f408d3ce3e176 SHA512 2331146f2baba155a89a02124b2c6b3ffb65c4acb10656324fd6d124b37df496ec96e815a045d6d8b2cb0a89cd383436a5c753aa0d24bcaeda90981e2bf01d4d |
31 |
+EBUILD libgpg-error-1.29.ebuild 1834 BLAKE2B bdb42d2e2af4f1ba3a7ceb0723f6c1617896e9c1c5b0825b1417a24f9b015579ee4b09d2c907ab433970c46a20cacfc4ca0127122b0548c0bf22658c34ddac44 SHA512 1519f9f7a951d8e63c1b8df3951e8e59c8b45f12ef9a31691aebbd712bb895b7a2e61e9389bc37ad75dada588ef89017bbaf4e619ad98eec0d3a5fcca9afe405 |
32 |
+MISC metadata.xml 315 BLAKE2B 18ded955b84237e03c8d14dc65f6b869c12674d4a87906f8fbc7650d02b20418cc2d97e9be6ea32f1aa170a8763cad3b91f9ac9b821a825fea0583cc66bed728 SHA512 502b5daf04f1b706514aba7d18cd454e1e99f63462159d3f5baebd1617bfa4760c7ea6fae9b7624fae2bc5943f8950211c6f4b326b6b62c3cf7eba4fc1255334 |
33 |
+-----BEGIN PGP SIGNATURE----- |
34 |
+ |
35 |
+iQIzBAEBCAAdFiEEqGPdSmYcJzzTeG67KfsOnscZ7iAFAls6UjwACgkQKfsOnscZ |
36 |
+7iBtHBAAlVmz7RvOgyO7et1jkOprn5dGbeOSu/tYkQwrnc9c3L8tFfj/8GvFSzdZ |
37 |
+tlH/+vcdBhHBljrC4X65F/m/7L2vT1I7ot63xwwHMfwZEw6Ivy8coUGhts7eEjdU |
38 |
+WG7e23FpbxKMEMiHp7FGbXKiTokWLHYrsnQchHojm1Umu56HifBdkgGmz9Wf5zd+ |
39 |
+EJigJXoMx9k2YaaG6JbeMmiJxE6jMLVw/Wa6z5PxAq2cmeNOXCMZWr+dheSrGK8x |
40 |
+Pq/390laHb3N7u2BkBnM8U8G9UrXLMEJzSTjKjoCpjwlpHDBluRbDxZ4UwmLSqTB |
41 |
+/pjTDPTZAF5rwzQLLTmglqqXQHljC11nciPDi7dw6N8Chbv1wCvXhxYbfwCDFQwd |
42 |
+AajCMN5P+Sql19qal+HoBR+I7fhjvk2FGz3tNZMVt8B0vAUk68Elh/7Ix7OPUaLd |
43 |
+eOd9KvcIzTX0JZ99Eoc9BvSRP9WxJRiYBSJMIYZJMrWov0K0bg3QL4exzm4xJtqP |
44 |
+p/+JqiIYcp0AK2jOxkmuNjeBH2rvnbsmX9x8Z/6ZKkfDDd4oCVBYwNdaDs6+4dUf |
45 |
+QypqPD/v1TtxYrj0CsTt5o+urfcz5Ki/gZy+sVk986k31dy/+rcDFBAYBg01iwLA |
46 |
+MHwf4s6lkIRVBV3U6QgjZbCPPwQ50xo6Msx/x0MCDJAyI7cC1TM= |
47 |
+=BxMZ |
48 |
+-----END PGP SIGNATURE----- |
49 |
|
50 |
diff --git a/dev-libs/libgpg-error/files/1.29-yat2m-dep-exeext.patch b/dev-libs/libgpg-error/files/1.29-yat2m-dep-exeext.patch |
51 |
new file mode 100644 |
52 |
index 0000000000..e1cfa43d51 |
53 |
--- /dev/null |
54 |
+++ b/dev-libs/libgpg-error/files/1.29-yat2m-dep-exeext.patch |
55 |
@@ -0,0 +1,96 @@ |
56 |
+From b174418aaf00b82c12b291a86a06855d35a10e10 Mon Sep 17 00:00:00 2001 |
57 |
+From: Michael Haubenwallner <michael.haubenwallner@××××××××××××.com> |
58 |
+Date: Mon, 2 Jul 2018 15:20:41 +0200 |
59 |
+Subject: [PATCH] doc: if ever, depend on yat2m$(EXEEXT) |
60 |
+ |
61 |
+Cygwin is not a "real" w32 system, and transparently hides the still |
62 |
+required '.exe' extension whenever possible. Unfortunately, this does |
63 |
+not apply to Makefile targets, so we still have to use '.exe' here. |
64 |
+Fortunately, there is the portable EXEEXT Makefile variable we can use. |
65 |
+ |
66 |
+Furthermore, we want to use a detected yat2m utility only if we are |
67 |
+cross compiling, but we do not need a Makefile dependency then. |
68 |
+Otherwise, the just created yat2m utility should work fine. |
69 |
+ |
70 |
+* doc/Makefile.am (CROSS_COMPILING, HAVE_YAT2M): Set empty YAT2M_DEP. |
71 |
+(not CROSS_COMPILING): Ignore detected yat2m, use local one. Use EXEEXT |
72 |
+in YAT2M_DEP rather than explicit '.exe' based on HAVE_W32_SYSTEM. |
73 |
+-- |
74 |
+ |
75 |
+Analysis for the problem on Cygwin when YAT2M_DEP does lack EXEEXT: |
76 |
+* make has a default rule to create 'yat2m' from 'yat2m.c' (uses CC) |
77 |
+* gcc transparently adds '.exe' when creating executables for Cygwin |
78 |
+* 'yat2m.exe' created from default rule does perfectly work |
79 |
+* automake generates the 'yat2m$(EXEEXT)' Makefile target (uses libtool) |
80 |
+* with EXEEXT=.exe, Makefile has both targets 'yat2m' and 'yat2m.exe' |
81 |
+* parallel make does execute commands for both targets in parallel |
82 |
+* both targets really create 'yat2m.exe', overwriting each other... |
83 |
+--- |
84 |
+ doc/Makefile.am | 15 +++++---------- |
85 |
+ 1 file changed, 5 insertions(+), 10 deletions(-) |
86 |
+ |
87 |
+diff --git a/doc/Makefile.am b/doc/Makefile.am |
88 |
+index 6f3e5a1..3fff0a6 100644 |
89 |
+--- a/doc/Makefile.am |
90 |
++++ b/doc/Makefile.am |
91 |
+#@@ -37,26 +37,21 @@ myman_pages = gpg-error-config.1 |
92 |
+ |
93 |
+ man_MANS = $(myman_pages) |
94 |
+ |
95 |
++if CROSS_COMPILING |
96 |
+ if HAVE_YAT2M |
97 |
+ YAT2M_CMD = $(YAT2M) |
98 |
+-YAT2M_DEP = $(YAT2M) |
99 |
++YAT2M_DEP = |
100 |
+ else |
101 |
+-if CROSS_COMPILING |
102 |
+ YAT2M_CMD = ./yat2m-for-build |
103 |
+ YAT2M_DEP = yat2m-for-build |
104 |
+ CLEANFILES += yat2m-for-build |
105 |
+ |
106 |
+ yat2m-for-build: yat2m.c |
107 |
+ $(CC_FOR_BUILD) -o $@ $(srcdir)/yat2m.c |
108 |
+-else |
109 |
+-if HAVE_W32_SYSTEM |
110 |
+-YAT2M_CMD = ./yat2m.exe |
111 |
+-YAT2M_DEP = yat2m.exe |
112 |
+-else |
113 |
+-YAT2M_CMD = ./yat2m |
114 |
+-YAT2M_DEP = yat2m |
115 |
+-endif |
116 |
+ endif |
117 |
++else |
118 |
++YAT2M_CMD = ./yat2m$(EXEEXT) |
119 |
++YAT2M_DEP = yat2m$(EXEEXT) |
120 |
+ endif |
121 |
+ |
122 |
+ yat2m-stamp: $(myman_sources) $(srcdir)/version.texi |
123 |
+-- |
124 |
+2.16.1 |
125 |
+ |
126 |
+@@ -37,21 +37,21 @@ |
127 |
+ |
128 |
+ man_MANS = $(myman_pages) |
129 |
+ |
130 |
++if CROSS_COMPILING |
131 |
+ if HAVE_YAT2M |
132 |
+ YAT2M_CMD = $(YAT2M) |
133 |
+ YAT2M_DEP = $(YAT2M) |
134 |
+ else |
135 |
+-if CROSS_COMPILING |
136 |
+ YAT2M_CMD = ./yat2m-for-build |
137 |
+ YAT2M_DEP = yat2m-for-build |
138 |
+ CLEANFILES += yat2m-for-build |
139 |
+ |
140 |
+ yat2m-for-build$(EXEEXT): yat2m.c |
141 |
+ $(CC_FOR_BUILD) -o $@ $(srcdir)/yat2m.c |
142 |
+-else |
143 |
+-YAT2M_CMD = ./yat2m |
144 |
+-YAT2M_DEP = yat2m |
145 |
+ endif |
146 |
++else |
147 |
++YAT2M_CMD = ./yat2m$(EXEEXT) |
148 |
++YAT2M_DEP = yat2m$(EXEEXT) |
149 |
+ endif |
150 |
+ |
151 |
+ yat2m-stamp: $(myman_sources) |
152 |
|
153 |
diff --git a/dev-libs/libgpg-error/libgpg-error-1.29.ebuild b/dev-libs/libgpg-error/libgpg-error-1.29.ebuild |
154 |
index da73f4e943..02ef002585 100644 |
155 |
--- a/dev-libs/libgpg-error/libgpg-error-1.29.ebuild |
156 |
+++ b/dev-libs/libgpg-error/libgpg-error-1.29.ebuild |
157 |
@@ -30,6 +30,7 @@ MULTILIB_WRAPPED_HEADERS=( |
158 |
src_prepare() { |
159 |
default |
160 |
eapply "${DISTDIR}"/${P}-solaris.patch |
161 |
+ eapply "${FILESDIR}"/1.29-yat2m-dep-exeext.patch |
162 |
# autogen is needed for getting a version number, it needs a |
163 |
# POSIX compliant shell |
164 |
hprefixify "${S}"/autogen.sh |