Re: [Mesa-dev] [PATCH] android: fix libz dynamic library dependencies

2017-05-16 Thread Chih-Wei Huang
2017-03-05 5:11 GMT+08:00 Mauro Rossi :
> 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


Re: [Mesa-dev] [PATCH] android: fix libz dynamic library dependencies

2017-03-13 Thread Emil Velikov
On 6 March 2017 at 02:29, Tomasz Figa  wrote:
> 2017-03-06 4:55 GMT+09:00 Mauro Rossi :
>>
>>
>>> Unrelated: where do we use the "host" libmesa_util ? Can we add a note
>>> in src/util/Android.mk (since it's not obvious) or just remove the
>>> hunk if it's not used.
>>>
>>> Thanks
>>> Emil
>>
>>
>> Hi,
>>
>> My guess would be it's not used,
>> but it's better to check with Tomasz (added in Cc:) who added the host
>> static library.
>>
>> https://cgit.freedesktop.org/mesa/mesa/commit/src/util/Android.mk?id=d703abf735bc2fe27af893d07e44598b8601b172
>
> Looking at the commit in its full extent [1], I can't find any host
> binary being built using libmesa_util indeed. I don't remember exactly
> the reason I added the host one specifically, but generally that was a
> reactive patch for all the build failures I experienced when tried to
> build Mesa for Android. I guess one just needs to remove it and check
> if the code still compiles. (These days I mostly work with regular
> autotools-based build for Android, which is what we use in ChromeOS
> team.)
>
Pretty much my line of thinking as well. Mauro can you drop the hunk
and check that things still build ?

Thanks
Emil
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev


Re: [Mesa-dev] [PATCH] android: fix libz dynamic library dependencies

2017-03-05 Thread Tomasz Figa
2017-03-06 4:55 GMT+09:00 Mauro Rossi :
>
>
>> Unrelated: where do we use the "host" libmesa_util ? Can we add a note
>> in src/util/Android.mk (since it's not obvious) or just remove the
>> hunk if it's not used.
>>
>> Thanks
>> Emil
>
>
> Hi,
>
> My guess would be it's not used,
> but it's better to check with Tomasz (added in Cc:) who added the host
> static library.
>
> https://cgit.freedesktop.org/mesa/mesa/commit/src/util/Android.mk?id=d703abf735bc2fe27af893d07e44598b8601b172

Looking at the commit in its full extent [1], I can't find any host
binary being built using libmesa_util indeed. I don't remember exactly
the reason I added the host one specifically, but generally that was a
reactive patch for all the build failures I experienced when tried to
build Mesa for Android. I guess one just needs to remove it and check
if the code still compiles. (These days I mostly work with regular
autotools-based build for Android, which is what we use in ChromeOS
team.)

[1] 
https://cgit.freedesktop.org/mesa/mesa/commit/src?id=d703abf735bc2fe27af893d07e44598b8601b172

Best regards,
Tomasz
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev


Re: [Mesa-dev] [PATCH] android: fix libz dynamic library dependencies

2017-03-05 Thread Mauro Rossi
Unrelated: where do we use the "host" libmesa_util ? Can we add a note
> in src/util/Android.mk (since it's not obvious) or just remove the
> hunk if it's not used.
>
> Thanks
> Emil
>

Hi,

My guess would be it's not used,
but it's better to check with Tomasz (added in Cc:) who added the host
static library.

https://cgit.freedesktop.org/mesa/mesa/commit/src/util/Android.mk?id=d703abf735bc2fe27af893d07e44598b8601b172

Mauro
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev


Re: [Mesa-dev] [PATCH] android: fix libz dynamic library dependencies

2017-03-04 Thread Emil Velikov
On 4 March 2017 at 21:11, Mauro Rossi  wrote:
> 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"
Eh, I almost figured it out ... pushed to master.

Unrelated: where do we use the "host" libmesa_util ? Can we add a note
in src/util/Android.mk (since it's not obvious) or just remove the
hunk if it's not used.

Thanks
Emil
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev


[Mesa-dev] [PATCH] android: fix libz dynamic library dependencies

2017-03-04 Thread Mauro Rossi
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
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)
-- 
2.10.2

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev