diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2024-03-21 00:16:08 +0530 |
|---|---|---|
| committer | GStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2024-03-20 18:50:23 +0000 |
| commit | 6a3d6dd06a77232ee89c363fa955e99701b3f579 (patch) | |
| tree | 964bf076e393825fea18015864e56ff3bb3d0820 | |
| parent | f9b6a48ca80495c76de21b7b3a4e7cd7b719ebdc (diff) | |
libkate.recipe: Fix subdirs editing when autoreconf is run1.22.11
We were only modifying Makefile.in to change SUBDIRS to avoid
a forced-autoreconf. However, on non-Windows, we were running
autoreconf manually, so the Makefile.in changes were getting
overwritten.
Edit SUBDIRS in Makefile.am too when we run autoreconf, which
coincides with when we want to apply a configure.ac patch.
Fixes a build failure on latest Fedora:
```
make[4]: Entering directory '/home/nirbheek/projects/repos/cerbero.git/1.22/build/sources/android_universal/armv7/libkate-0.4.1/tools/KateDJ'
/bin/sh /home/nirbheek/projects/repos/cerbero.git/1.22/build/sources/android_universal/armv7/libkate-0.4.1/misc/autotools/install-sh -d "/home/nirbheek/projects/repos/cerbero.git/1.22/build/dist/android_universal/armv7/lib/python3.12/site-packages/kdj"
for module in __init__ constants finder tools muxer demuxer tester options ui_main ui_editor ui_options; do \
/usr/bin/install -c -m 644 "../../tools/KateDJ/kdj/$module.py" "/home/nirbheek/projects/repos/cerbero.git/1.22/build/dist/android_universal/armv7/lib/python3.12/site-packages/kdj"; \
if test -z ""; then \
../../misc/autotools/py-compile --basedir "/home/nirbheek/projects/repos/cerbero.git/1.22/build/dist/android_universal/armv7/lib/python3.12/site-packages/kdj" "$module.py"; \
else \
../../misc/autotools/py-compile --destdir "" --basedir "/home/nirbheek/projects/repos/cerbero.git/1.22/build/dist/android_universal/armv7/lib/python3.12/site-packages/kdj" "$module.py"; \
fi \
done
Traceback (most recent call last):
File "<string>", line 2, in <module>
ModuleNotFoundError: No module named 'imp'
[...]
```
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/1414>
| -rw-r--r-- | recipes/libkate/0001-be-more-permissive-with-automake-errors-now-that-we-.patch | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/recipes/libkate/0001-be-more-permissive-with-automake-errors-now-that-we-.patch b/recipes/libkate/0001-be-more-permissive-with-automake-errors-now-that-we-.patch index a543ee08..814f11f6 100644 --- a/recipes/libkate/0001-be-more-permissive-with-automake-errors-now-that-we-.patch +++ b/recipes/libkate/0001-be-more-permissive-with-automake-errors-now-that-we-.patch @@ -21,6 +21,16 @@ index 58ff478..2bbf6dd 100644 AC_CONFIG_HEADERS([include/config.h]) ifdef([AM_SILENT_RULES],[AM_SILENT_RULES]) +diff --git a/Makefile.am b/Makefile.am +index 12a85d3..0123e0d 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,4 +1,4 @@ +-SUBDIRS=. tools tests doc ++SUBDIRS=. # tools tests doc + + OGGDIR=built-streams + kateincdir=$(includedir)/kate -- 2.1.4 |