2017-03-05 5:11 GMT+08:00 Mauro Rossi <issor.or...@gmail.com>: > Fixes a series of libz related building errors: > > target SharedLib: gallium_dri_32 > (out/target/prod...SHARED_LIBRARIES/gallium_dri_intermediates/LINKED/gallium_dri.so) > external/elfutils/libelf/elf_compress.c:117: error: undefined reference to > 'deflateInit_' > ... > external/elfutils/libelf/elf_compress.c:244: error: undefined reference to > 'inflateEnd' > clang++: error: linker command failed with exit code 1 (use -v to see > invocation) > > Fixes: 85a9b1b "util/disk_cache: compress individual cache entries" > --- > Android.common.mk | 2 ++ > src/util/Android.mk | 4 ---- > 2 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/Android.common.mk b/Android.common.mk > index c27a77e..4b90fb9 100644 > --- a/Android.common.mk > +++ b/Android.common.mk > @@ -128,3 +128,5 @@ endif > > # Quiet down the build system and remove any .h files from the sources > LOCAL_SRC_FILES := $(patsubst %.h, , $(LOCAL_SRC_FILES)) > + > +LOCAL_SHARED_LIBRARIES += libz
I just noticed this is old patch which has been merged. Sorry I didn't read earlier enough. I have to say it is incorrect. It unconditionally adds libz as a dependency to all Mesa shared libraries. That is unnecessary. I'll send a patch to fix it later. > diff --git a/src/util/Android.mk b/src/util/Android.mk > index a139e68..a39185a 100644 > --- a/src/util/Android.mk > +++ b/src/util/Android.mk > @@ -53,8 +53,6 @@ $(LOCAL_GENERATED_SOURCES): PRIVATE_CUSTOM_TOOL = > $(PRIVATE_PYTHON) $^ > $@ > $(LOCAL_GENERATED_SOURCES): $(intermediates)/%.c: $(LOCAL_PATH)/%.py > $(transform-generated-source) > > -LOCAL_SHARED_LIBRARIES := libz > - > include $(MESA_COMMON_MK) > include $(BUILD_STATIC_LIBRARY) > > @@ -90,7 +88,5 @@ $(LOCAL_GENERATED_SOURCES): PRIVATE_CUSTOM_TOOL = > $(PRIVATE_PYTHON) $^ > $@ > $(LOCAL_GENERATED_SOURCES): $(intermediates)/%.c: $(LOCAL_PATH)/%.py > $(transform-generated-source) > > -LOCAL_SHARED_LIBRARIES := libz > - > include $(MESA_COMMON_MK) > include $(BUILD_HOST_STATIC_LIBRARY) > -- -- Chih-Wei Android-x86 project http://www.android-x86.org _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
