| 1 |
commit: 70a6c877b9763fb19eb292bd0b15243d5fd534d4 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jan 9 13:52:42 2021 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 9 13:53:07 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70a6c877 |
| 7 |
|
| 8 |
net-misc/socat: Fixed build on 32bit arches |
| 9 |
|
| 10 |
with kind permission from Sam |
| 11 |
|
| 12 |
Package-Manager: Portage-3.0.12, Repoman-3.0.2 |
| 13 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 14 |
|
| 15 |
.../files/socat-1.7.4.0-32bit_build_fix.patch | 42 ++++++++++++++++++++++ |
| 16 |
net-misc/socat/socat-1.7.4.0.ebuild | 4 +++ |
| 17 |
2 files changed, 46 insertions(+) |
| 18 |
|
| 19 |
diff --git a/net-misc/socat/files/socat-1.7.4.0-32bit_build_fix.patch b/net-misc/socat/files/socat-1.7.4.0-32bit_build_fix.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..0b391ed8929 |
| 22 |
--- /dev/null |
| 23 |
+++ b/net-misc/socat/files/socat-1.7.4.0-32bit_build_fix.patch |
| 24 |
@@ -0,0 +1,42 @@ |
| 25 |
+2021-01-08: Quick fix to a compilation failure especially on 32 bit systems |
| 26 |
+ |
| 27 |
+--- socat-1.7.4.0/compat.h |
| 28 |
++++ socat-1.7.4.0/compat.h |
| 29 |
+@@ -134,6 +134,8 @@ |
| 30 |
+ # define F_uint64_t "%u" |
| 31 |
+ # elif HAVE_BASIC_UINT64_T==6 |
| 32 |
+ # define F_uint64_t "%lu" |
| 33 |
++# elif HAVE_BASIC_UINT64_T==8 |
| 34 |
++# define F_uint64_t "%llu" |
| 35 |
+ # else |
| 36 |
+ # error "HAVE_BASIC_UINT64_T is out of range:" HAVE_BASIC_UINT64_T |
| 37 |
+ # endif |
| 38 |
+@@ -147,7 +149,7 @@ |
| 39 |
+ # elif HAVE_BASIC_INT16_T==3 |
| 40 |
+ # define F_int16_t "%d" |
| 41 |
+ # elif HAVE_BASIC_INT16_T==5 |
| 42 |
+-# define F_int16_t "%l" |
| 43 |
++# define F_int16_t "%ld" |
| 44 |
+ # else |
| 45 |
+ # error "HAVE_BASIC_INT16_T is out of range:" HAVE_BASIC_INT16_T |
| 46 |
+ # endif |
| 47 |
+@@ -161,7 +163,7 @@ |
| 48 |
+ # elif HAVE_BASIC_INT32_T==3 |
| 49 |
+ # define F_int32_t "%d" |
| 50 |
+ # elif HAVE_BASIC_INT32_T==5 |
| 51 |
+-# define F_int32_t "%l" |
| 52 |
++# define F_int32_t "%ld" |
| 53 |
+ # else |
| 54 |
+ # error "HAVE_BASIC_INT32_T is out of range:" HAVE_BASIC_INT32_T |
| 55 |
+ # endif |
| 56 |
+@@ -175,7 +177,9 @@ |
| 57 |
+ # elif HAVE_BASIC_INT64_T==3 |
| 58 |
+ # define F_int64_t "%d" |
| 59 |
+ # elif HAVE_BASIC_INT64_T==5 |
| 60 |
+-# define F_int64_t "%l" |
| 61 |
++# define F_int64_t "%ld" |
| 62 |
++# elif HAVE_BASIC_INT64_T==7 |
| 63 |
++# define F_int64_t "%lld" |
| 64 |
+ # else |
| 65 |
+ # error "HAVE_BASIC_INT64_T is out of range:" HAVE_BASIC_INT64_T |
| 66 |
+ # endif |
| 67 |
|
| 68 |
diff --git a/net-misc/socat/socat-1.7.4.0.ebuild b/net-misc/socat/socat-1.7.4.0.ebuild |
| 69 |
index 1db0f86eaaf..4b62fa74485 100644 |
| 70 |
--- a/net-misc/socat/socat-1.7.4.0.ebuild |
| 71 |
+++ b/net-misc/socat/socat-1.7.4.0.ebuild |
| 72 |
@@ -35,6 +35,10 @@ RESTRICT=" |
| 73 |
|
| 74 |
DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY ) |
| 75 |
|
| 76 |
+PATCHES=( |
| 77 |
+ "${FILESDIR}/${P}-32bit_build_fix.patch" |
| 78 |
+) |
| 79 |
+ |
| 80 |
pkg_setup() { |
| 81 |
# bug #587740 |
| 82 |
if use readline && use ssl; then |
Archives