From 711c8e821b77e77d81a1882d8d1bc3dec058a14b Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Sat, 6 Nov 2021 20:28:39 +0200 Subject: [PATCH] mesa: add patch to fix linking errors on 32bit ld: error: undefined symbol: __aeabi_uidivmod >>> referenced by fakeglx.c >>> .libs/fakeglx.o:(Fake_glXWaitVideoSyncSGI) >>> referenced by bufferobj.c >>> bufferobj.o:(buffer_page_commitment) in archive ../../../../src/mesa/.libs/libmesa.a >>> referenced by bufferobj.c >>> bufferobj.o:(buffer_page_commitment) in archive ../../../../src/mesa/.libs/libmesa.a >>> referenced 80 more times --- x11-packages/mesa/build.sh | 3 +++ x11-packages/mesa/libtool.m4.patch | 14 ++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 x11-packages/mesa/libtool.m4.patch diff --git a/x11-packages/mesa/build.sh b/x11-packages/mesa/build.sh index f482adaf8..93354a63c 100644 --- a/x11-packages/mesa/build.sh +++ b/x11-packages/mesa/build.sh @@ -32,6 +32,9 @@ ac_cv_header_xlocale_h=no termux_step_pre_configure() { export LIBS="-landroid-shmem -latomic" + aclocal + automake + autoconf } termux_step_post_massage() { diff --git a/x11-packages/mesa/libtool.m4.patch b/x11-packages/mesa/libtool.m4.patch new file mode 100644 index 000000000..374ba3d88 --- /dev/null +++ b/x11-packages/mesa/libtool.m4.patch @@ -0,0 +1,14 @@ +diff -uNr mesa-17.3.9/m4/libtool.m4 mesa-17.3.9.mod/m4/libtool.m4 +--- mesa-17.3.9/m4/libtool.m4 2018-04-18 11:44:05.000000000 +0300 ++++ mesa-17.3.9.mod/m4/libtool.m4 2021-11-06 20:20:39.088856120 +0200 +@@ -6405,8 +6405,8 @@ + # Check if GNU C++ uses GNU ld as the underlying linker, since the + # archiving commands below assume that GNU ld is being used. + if test yes = "$with_gnu_ld"; then +- _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'