| 1 |
commit: eb7a00e00ea5619385930a3893bb6c40928a2c4a |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Apr 15 01:24:59 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 15 01:31:06 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb7a00e0 |
| 7 |
|
| 8 |
app-admin/openrc-settingsd: fix build with non-Bash |
| 9 |
|
| 10 |
Thanks-to: Kerin Millar |
| 11 |
Closes: https://bugs.gentoo.org/754987 |
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
.../openrc-settingsd-1.0.1-remove-bashisms.patch | 81 ++++++++++++++++++++++ |
| 15 |
.../openrc-settingsd-1.0.1-r1.ebuild | 4 ++ |
| 16 |
2 files changed, 85 insertions(+) |
| 17 |
|
| 18 |
diff --git a/app-admin/openrc-settingsd/files/openrc-settingsd-1.0.1-remove-bashisms.patch b/app-admin/openrc-settingsd/files/openrc-settingsd-1.0.1-remove-bashisms.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..7723a44af67 |
| 21 |
--- /dev/null |
| 22 |
+++ b/app-admin/openrc-settingsd/files/openrc-settingsd-1.0.1-remove-bashisms.patch |
| 23 |
@@ -0,0 +1,81 @@ |
| 24 |
+https://bugs.gentoo.org/754987 |
| 25 |
+--- a/Makefile.am |
| 26 |
++++ b/Makefile.am |
| 27 |
+@@ -123,31 +123,31 @@ |
| 28 |
+ $(NULL) |
| 29 |
+ |
| 30 |
+ $(hostnamed_built_sources) : data/org.freedesktop.hostname1.xml |
| 31 |
+- $(AM_V_GEN)( pushd "$(srcdir)/src" > /dev/null; \ |
| 32 |
++ $(AM_V_GEN)( cd "$(srcdir)/src" && \ |
| 33 |
+ $(GDBUS_CODEGEN) \ |
| 34 |
+ --interface-prefix org.freedesktop. \ |
| 35 |
+ --c-namespace OpenrcSettingsdHostnamed \ |
| 36 |
+ --generate-c-code hostname1-generated \ |
| 37 |
+ $(abs_srcdir)/data/org.freedesktop.hostname1.xml; \ |
| 38 |
+- popd > /dev/null ) |
| 39 |
++ ) |
| 40 |
+ |
| 41 |
+ $(localed_built_sources) : data/org.freedesktop.locale1.xml |
| 42 |
+- $(AM_V_GEN)( pushd "$(srcdir)/src" > /dev/null; \ |
| 43 |
++ $(AM_V_GEN)( cd "$(srcdir)/src" && \ |
| 44 |
+ $(GDBUS_CODEGEN) \ |
| 45 |
+ --interface-prefix org.freedesktop. \ |
| 46 |
+ --c-namespace OpenrcSettingsdLocaled \ |
| 47 |
+ --generate-c-code locale1-generated \ |
| 48 |
+ $(abs_srcdir)/data/org.freedesktop.locale1.xml; \ |
| 49 |
+- popd > /dev/null ) |
| 50 |
++ ) |
| 51 |
+ |
| 52 |
+ $(timedated_built_sources) : data/org.freedesktop.timedate1.xml |
| 53 |
+- $(AM_V_GEN)( pushd "$(srcdir)/src" > /dev/null; \ |
| 54 |
++ $(AM_V_GEN)( cd "$(srcdir)/src" && \ |
| 55 |
+ $(GDBUS_CODEGEN) \ |
| 56 |
+ --interface-prefix org.freedesktop. \ |
| 57 |
+ --c-namespace OpenrcSettingsdTimedated \ |
| 58 |
+ --generate-c-code timedate1-generated \ |
| 59 |
+ $(abs_srcdir)/data/org.freedesktop.timedate1.xml; \ |
| 60 |
+- popd > /dev/null ) |
| 61 |
++ ) |
| 62 |
+ |
| 63 |
+ BUILT_SOURCES = \ |
| 64 |
+ $(hostnamed_built_sources) \ |
| 65 |
+--- a/Makefile.in |
| 66 |
++++ b/Makefile.in |
| 67 |
+@@ -1315,31 +1315,31 @@ |
| 68 |
+ $(do_subst) < $(srcdir)/$< > $(srcdir)/$@ |
| 69 |
+ |
| 70 |
+ $(hostnamed_built_sources) : data/org.freedesktop.hostname1.xml |
| 71 |
+- $(AM_V_GEN)( pushd "$(srcdir)/src" > /dev/null; \ |
| 72 |
++ $(AM_V_GEN)( cd "$(srcdir)/src" && \ |
| 73 |
+ $(GDBUS_CODEGEN) \ |
| 74 |
+ --interface-prefix org.freedesktop. \ |
| 75 |
+ --c-namespace OpenrcSettingsdHostnamed \ |
| 76 |
+ --generate-c-code hostname1-generated \ |
| 77 |
+ $(abs_srcdir)/data/org.freedesktop.hostname1.xml; \ |
| 78 |
+- popd > /dev/null ) |
| 79 |
++ ) |
| 80 |
+ |
| 81 |
+ $(localed_built_sources) : data/org.freedesktop.locale1.xml |
| 82 |
+- $(AM_V_GEN)( pushd "$(srcdir)/src" > /dev/null; \ |
| 83 |
++ $(AM_V_GEN)( cd "$(srcdir)/src" && \ |
| 84 |
+ $(GDBUS_CODEGEN) \ |
| 85 |
+ --interface-prefix org.freedesktop. \ |
| 86 |
+ --c-namespace OpenrcSettingsdLocaled \ |
| 87 |
+ --generate-c-code locale1-generated \ |
| 88 |
+ $(abs_srcdir)/data/org.freedesktop.locale1.xml; \ |
| 89 |
+- popd > /dev/null ) |
| 90 |
++ ) |
| 91 |
+ |
| 92 |
+ $(timedated_built_sources) : data/org.freedesktop.timedate1.xml |
| 93 |
+- $(AM_V_GEN)( pushd "$(srcdir)/src" > /dev/null; \ |
| 94 |
++ $(AM_V_GEN)( cd "$(srcdir)/src" && \ |
| 95 |
+ $(GDBUS_CODEGEN) \ |
| 96 |
+ --interface-prefix org.freedesktop. \ |
| 97 |
+ --c-namespace OpenrcSettingsdTimedated \ |
| 98 |
+ --generate-c-code timedate1-generated \ |
| 99 |
+ $(abs_srcdir)/data/org.freedesktop.timedate1.xml; \ |
| 100 |
+- popd > /dev/null ) |
| 101 |
++ ) |
| 102 |
+ |
| 103 |
+ # Tell versions [3.59,3.63) of GNU make to not export all variables. |
| 104 |
+ # Otherwise a system limit (for SysV at least) may be exceeded. |
| 105 |
|
| 106 |
diff --git a/app-admin/openrc-settingsd/openrc-settingsd-1.0.1-r1.ebuild b/app-admin/openrc-settingsd/openrc-settingsd-1.0.1-r1.ebuild |
| 107 |
index e4a68aca3d9..fe4a85bc57b 100644 |
| 108 |
--- a/app-admin/openrc-settingsd/openrc-settingsd-1.0.1-r1.ebuild |
| 109 |
+++ b/app-admin/openrc-settingsd/openrc-settingsd-1.0.1-r1.ebuild |
| 110 |
@@ -28,6 +28,10 @@ DEPEND="${COMMON_DEPEND} |
| 111 |
virtual/pkgconfig |
| 112 |
" |
| 113 |
|
| 114 |
+PATCHES=( |
| 115 |
+ "${FILESDIR}"/${PN}-1.0.1-remove-bashisms.patch |
| 116 |
+) |
| 117 |
+ |
| 118 |
src_prepare() { |
| 119 |
default |
| 120 |
sed -i -e 's:/sbin/runscript:/sbin/openrc-run:g' data/init.d/openrc-settingsd.in || die |
Archives