1 |
commit: f7a15c57dde3a93c40b582d2c18c691151791c86 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon May 3 14:42:34 2021 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon May 3 15:36:08 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7a15c57 |
7 |
|
8 |
app-pda/libimobiledevice: Fix for slibtool |
9 |
|
10 |
Thanks-to: orbea <orbea <AT> riseup.net> |
11 |
Closes: https://bugs.gentoo.org/780657 |
12 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
13 |
|
14 |
.../files/libimobiledevice-1.3.0-slibtool.patch | 105 +++++++++++++++++++++ |
15 |
.../libimobiledevice-1.3.0-r1.ebuild | 2 + |
16 |
2 files changed, 107 insertions(+) |
17 |
|
18 |
diff --git a/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-slibtool.patch b/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-slibtool.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..1e9fa6caf58 |
21 |
--- /dev/null |
22 |
+++ b/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-slibtool.patch |
23 |
@@ -0,0 +1,105 @@ |
24 |
+From 735ac51e0eeaa3419e85dbad9579401ae828f631 Mon Sep 17 00:00:00 2001 |
25 |
+From: orbea <orbea@××××××.net> |
26 |
+Date: Tue, 6 Apr 2021 13:06:35 -0700 |
27 |
+Subject: [PATCH] tools: Fix usage of LDFLAGS and LDADD. |
28 |
+ |
29 |
+Signed-off-by: orbea <orbea@××××××.net> |
30 |
+--- |
31 |
+ tools/Makefile.am | 40 ++++++++++++++++++++-------------------- |
32 |
+ 1 file changed, 20 insertions(+), 20 deletions(-) |
33 |
+ |
34 |
+diff --git a/tools/Makefile.am b/tools/Makefile.am |
35 |
+index 8ed8ad91..04a5faa7 100644 |
36 |
+--- a/tools/Makefile.am |
37 |
++++ b/tools/Makefile.am |
38 |
+@@ -40,8 +40,8 @@ bin_PROGRAMS = \ |
39 |
+ |
40 |
+ ideviceinfo_SOURCES = ideviceinfo.c |
41 |
+ ideviceinfo_CFLAGS = $(AM_CFLAGS) |
42 |
+-ideviceinfo_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS) |
43 |
+-ideviceinfo_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la |
44 |
++ideviceinfo_LDFLAGS = $(AM_LDFLAGS) |
45 |
++ideviceinfo_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la |
46 |
+ |
47 |
+ idevicename_SOURCES = idevicename.c |
48 |
+ idevicename_CFLAGS = $(AM_CFLAGS) |
49 |
+@@ -50,8 +50,8 @@ idevicename_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la |
50 |
+ |
51 |
+ idevicepair_SOURCES = idevicepair.c |
52 |
+ idevicepair_CFLAGS = -I$(top_srcdir) $(AM_CFLAGS) |
53 |
+-idevicepair_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS) $(libusbmuxd_LIBS) |
54 |
+-idevicepair_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la |
55 |
++idevicepair_LDFLAGS = $(AM_LDFLAGS) $(libusbmuxd_LIBS) |
56 |
++idevicepair_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la |
57 |
+ |
58 |
+ idevicesyslog_SOURCES = idevicesyslog.c |
59 |
+ idevicesyslog_CFLAGS = $(AM_CFLAGS) |
60 |
+@@ -65,18 +65,18 @@ idevice_id_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la |
61 |
+ |
62 |
+ idevicebackup_SOURCES = idevicebackup.c |
63 |
+ idevicebackup_CFLAGS = $(AM_CFLAGS) |
64 |
+-idevicebackup_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS) |
65 |
+-idevicebackup_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la |
66 |
++idevicebackup_LDFLAGS = $(AM_LDFLAGS) |
67 |
++idevicebackup_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la |
68 |
+ |
69 |
+ idevicebackup2_SOURCES = idevicebackup2.c |
70 |
+ idevicebackup2_CFLAGS = $(AM_CFLAGS) |
71 |
+-idevicebackup2_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS) |
72 |
+-idevicebackup2_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la |
73 |
++idevicebackup2_LDFLAGS = $(AM_LDFLAGS) |
74 |
++idevicebackup2_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la |
75 |
+ |
76 |
+ ideviceimagemounter_SOURCES = ideviceimagemounter.c |
77 |
+ ideviceimagemounter_CFLAGS = $(AM_CFLAGS) |
78 |
+-ideviceimagemounter_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS) |
79 |
+-ideviceimagemounter_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la |
80 |
++ideviceimagemounter_LDFLAGS = $(AM_LDFLAGS) |
81 |
++ideviceimagemounter_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la |
82 |
+ |
83 |
+ idevicescreenshot_SOURCES = idevicescreenshot.c |
84 |
+ idevicescreenshot_CFLAGS = $(AM_CFLAGS) |
85 |
+@@ -95,13 +95,13 @@ idevicedate_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la |
86 |
+ |
87 |
+ ideviceprovision_SOURCES = ideviceprovision.c |
88 |
+ ideviceprovision_CFLAGS = $(AM_CFLAGS) |
89 |
+-ideviceprovision_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS) |
90 |
+-ideviceprovision_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la |
91 |
++ideviceprovision_LDFLAGS = $(AM_LDFLAGS) |
92 |
++ideviceprovision_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la |
93 |
+ |
94 |
+ idevicedebugserverproxy_SOURCES = idevicedebugserverproxy.c |
95 |
+ idevicedebugserverproxy_CFLAGS = -I$(top_srcdir) $(AM_CFLAGS) |
96 |
+-idevicedebugserverproxy_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS) |
97 |
+-idevicedebugserverproxy_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la |
98 |
++idevicedebugserverproxy_LDFLAGS = $(AM_LDFLAGS) |
99 |
++idevicedebugserverproxy_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la |
100 |
+ |
101 |
+ idevicediagnostics_SOURCES = idevicediagnostics.c |
102 |
+ idevicediagnostics_CFLAGS = $(AM_CFLAGS) |
103 |
+@@ -110,8 +110,8 @@ idevicediagnostics_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la |
104 |
+ |
105 |
+ idevicedebug_SOURCES = idevicedebug.c |
106 |
+ idevicedebug_CFLAGS = $(AM_CFLAGS) |
107 |
+-idevicedebug_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS) |
108 |
+-idevicedebug_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la |
109 |
++idevicedebug_LDFLAGS = $(AM_LDFLAGS) |
110 |
++idevicedebug_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la |
111 |
+ |
112 |
+ idevicenotificationproxy_SOURCES = idevicenotificationproxy.c |
113 |
+ idevicenotificationproxy_CFLAGS = $(AM_CFLAGS) |
114 |
+@@ -120,10 +120,10 @@ idevicenotificationproxy_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la |
115 |
+ |
116 |
+ idevicecrashreport_SOURCES = idevicecrashreport.c |
117 |
+ idevicecrashreport_CFLAGS = -I$(top_srcdir) $(AM_CFLAGS) |
118 |
+-idevicecrashreport_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS) |
119 |
+-idevicecrashreport_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la |
120 |
++idevicecrashreport_LDFLAGS = $(AM_LDFLAGS) |
121 |
++idevicecrashreport_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la |
122 |
+ |
123 |
+ idevicesetlocation_SOURCES = idevicesetlocation.c |
124 |
+ idevicesetlocation_CFLAGS = $(AM_CFLAGS) |
125 |
+-idevicesetlocation_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS) |
126 |
+-idevicesetlocation_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la |
127 |
++idevicesetlocation_LDFLAGS = $(AM_LDFLAGS) |
128 |
++idevicesetlocation_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la |
129 |
|
130 |
diff --git a/app-pda/libimobiledevice/libimobiledevice-1.3.0-r1.ebuild b/app-pda/libimobiledevice/libimobiledevice-1.3.0-r1.ebuild |
131 |
index 8fb73fa97b2..f7ab373516b 100644 |
132 |
--- a/app-pda/libimobiledevice/libimobiledevice-1.3.0-r1.ebuild |
133 |
+++ b/app-pda/libimobiledevice/libimobiledevice-1.3.0-r1.ebuild |
134 |
@@ -46,6 +46,8 @@ BDEPEND=" |
135 |
|
136 |
BUILD_DIR="${S}_build" |
137 |
|
138 |
+PATCHES=( "${FILESDIR}"/${P}-slibtool.patch ) |
139 |
+ |
140 |
src_prepare() { |
141 |
default |
142 |
eautoreconf |