Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various improvements #135

Merged
merged 1 commit into from
May 29, 2022
Merged

Various improvements #135

merged 1 commit into from
May 29, 2022

Conversation

kleisauke
Copy link
Collaborator

Consolidated linux-x64 build diff:

Details
--- a/various-improvements-linux-x64.out
+++ b/various-improvements-linux-x64.out
@@ -4059,10 +4059,7 @@ checking whether to build static libraries... yes
 Configuring for a minimal library
 So far so good!
 Checking zlib
-checking zlib.h usability... yes
-checking zlib.h presence... yes
-checking for zlib.h... yes
-checking for gzread in -lz... yes
+checking for Z... yes
 Checking lzma
 Disabling lzma compression support
 Checking headers
@@ -8138,17 +8135,13 @@ checking for lerc_decode in -l"Lerc"... no
 checking Lerc_c_api.h usability... no
 checking Lerc_c_api.h presence... no
 checking for Lerc_c_api.h... no
-checking for WebPDecode in -lwebp... no
+checking for WebPDecode in -lwebp... yes
 checking webp/decode.h usability... yes
 checking webp/decode.h presence... yes
 checking for webp/decode.h... yes
 checking for X... no
 checking for the pthreads library -lpthreads... no
-checking whether pthreads work without any flags... no
-checking whether pthreads work with -Kthread... no
-checking whether pthreads work with -kthread... no
-checking for the pthreads library -llthread... no
-checking whether pthreads work with -pthread... yes
+checking whether pthreads work without any flags... yes
 checking for joinable pthread attribute... PTHREAD_CREATE_JOINABLE
 checking if more special flags are required for pthreads... no
 checking whether we are using the Microsoft C compiler... no
@@ -8211,7 +8204,7 @@ Libtiff is now configured for x86_64-pc-linux-gnu
 
   Installation directory:             /target
   Documentation directory:            ${prefix}/share/doc/tiff-4.4.0
-  C compiler:                         gcc -march=westmere -Os -fPIC -D_GLIBCXX_USE_CXX11_ABI=1 -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -Wall -W
+  C compiler:                         gcc -march=westmere -Os -fPIC -D_GLIBCXX_USE_CXX11_ABI=1 -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -pthread -Wall -W
   C++ compiler:                       g++ -march=westmere -Os -fPIC -D_GLIBCXX_USE_CXX11_ABI=1 -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections
   Enable runtime linker paths:        no
   Enable linker symbol versioning:    no
@@ -8237,7 +8230,7 @@ Libtiff is now configured for x86_64-pc-linux-gnu
   LERC support:                       no
   LZMA2 support:                      no
   ZSTD support:                       no
-  WEBP support:                       no
+  WEBP support:                       yes
 
   C++ support:                        no
 
@@ -16423,60 +16368,60 @@ libm.so.6 does not exist in /target/lib
 libc.so.6 does not exist in /target/lib
 ld-linux-x86-64.so.2 does not exist in /target/lib
 libgcc_s.so.1 does not exist in /target/lib
-total 69252
-drwxr-xr-x 2 root root     4096 May 28 15:58 .
-drwxr-xr-x 7 root root     4096 May 28 15:58 ..
--rw-r--r-- 1 root root  6355878 May 28 15:49 libaom.a
--rw-r--r-- 1 root root    57894 May 28 15:53 libcairo-gobject.a
--rw-r--r-- 1 root root  1748028 May 28 15:53 libcairo.a
--rw-r--r-- 1 root root    15708 May 28 15:56 libcgif.a
--rw-r--r-- 1 root root   356106 May 28 15:47 libexif.a
--rw-r--r-- 1 root root   310408 May 28 15:51 libexpat.a
--rw-r--r-- 1 root root    84278 May 28 15:46 libffi.a
--rw-r--r-- 1 root root   553142 May 28 15:51 libfontconfig.a
--rw-r--r-- 1 root root  1089988 May 28 15:51 libfreetype.a
--rw-r--r-- 1 root root   150978 May 28 15:53 libfribidi.a
--rw-r--r-- 1 root root   361010 May 28 15:51 libgdk_pixbuf-2.0.a
--rw-r--r-- 1 root root  5553098 May 28 15:47 libgio-2.0.a
--rw-r--r-- 1 root root  2769508 May 28 15:46 libglib-2.0.a
--rw-r--r-- 1 root root    17740 May 28 15:46 libgmodule-2.0.a
--rw-r--r-- 1 root root   831922 May 28 15:46 libgobject-2.0.a
--rw-r--r-- 1 root root   685208 May 28 15:47 libgsf-1.a
--rw-r--r-- 1 root root     2846 May 28 15:46 libgthread-2.0.a
--rw-r--r-- 1 root root  2086714 May 28 15:52 libharfbuzz-subset.a
--rw-r--r-- 1 root root  2276974 May 28 15:52 libharfbuzz.a
--rw-r--r-- 1 root root  1905718 May 28 15:50 libheif.a
--rw-r--r-- 1 root root    83574 May 28 15:50 libimagequant.a
--rw-r--r-- 1 root root   869366 May 28 15:50 libjpeg.a
--rw-r--r-- 1 root root   975154 May 28 15:47 liblcms2.a
--rw-r--r-- 1 root root  1255920 May 28 15:51 liborc-0.4.a
--rw-r--r-- 1 root root   838738 May 28 15:53 libpango-1.0.a
--rw-r--r-- 1 root root   101924 May 28 15:53 libpangocairo-1.0.a
--rw-r--r-- 1 root root   185930 May 28 15:53 libpangoft2-1.0.a
--rw-r--r-- 1 root root   911992 May 28 15:53 libpixman-1.a
-lrwxrwxrwx 1 root root       10 May 28 15:50 libpng.a -> libpng16.a
--rw-r--r-- 1 root root   449666 May 28 15:50 libpng16.a
--rw-r--r-- 1 root root 10239968 May 28 15:56 librsvg-2.a
--rw-r--r-- 1 root root   105976 May 28 15:50 libspng.a
--rw-r--r-- 1 root root   762670 May 28 15:51 libtiff.a
-lrwxrwxrwx 1 root root       22 May 28 15:58 libvips-cpp.so -> libvips-cpp.so.42.14.2
-lrwxrwxrwx 1 root root       22 May 28 15:58 libvips-cpp.so.42 -> libvips-cpp.so.42.14.2
--rwxr-xr-x 1 root root 18821928 May 28 15:58 libvips-cpp.so.42.14.2
--rw-r--r-- 1 root root  6008736 May 28 15:58 libvips.a
--rw-r--r-- 1 root root   770968 May 28 15:50 libwebp.a
--rw-r--r-- 1 root root    17658 May 28 15:50 libwebpdemux.a
--rw-r--r-- 1 root root    55024 May 28 15:50 libwebpmux.a
--rw-r--r-- 1 root root   957014 May 28 15:47 libxml2.a
--rw-r--r-- 1 root root   200682 May 28 15:45 libz.a
--rw-r--r-- 1 root root      221 May 28 15:47 xml2Conf.sh
-     9085892     8759310  96% /packaging/libvips-8.12.2-linux-x64.tar.gz
-     9085892     8759310  96%
+total 69312
+drwxr-xr-x 2 root root     4096 May 28 18:34 .
+drwxr-xr-x 7 root root     4096 May 28 18:34 ..
+-rw-r--r-- 1 root root  6355878 May 28 18:25 libaom.a
+-rw-r--r-- 1 root root    57894 May 28 18:29 libcairo-gobject.a
+-rw-r--r-- 1 root root  1748028 May 28 18:29 libcairo.a
+-rw-r--r-- 1 root root    15708 May 28 18:32 libcgif.a
+-rw-r--r-- 1 root root   356106 May 28 18:23 libexif.a
+-rw-r--r-- 1 root root   310408 May 28 18:27 libexpat.a
+-rw-r--r-- 1 root root    84278 May 28 18:21 libffi.a
+-rw-r--r-- 1 root root   553142 May 28 18:27 libfontconfig.a
+-rw-r--r-- 1 root root  1089988 May 28 18:27 libfreetype.a
+-rw-r--r-- 1 root root   150978 May 28 18:29 libfribidi.a
+-rw-r--r-- 1 root root   361010 May 28 18:27 libgdk_pixbuf-2.0.a
+-rw-r--r-- 1 root root  5553098 May 28 18:22 libgio-2.0.a
+-rw-r--r-- 1 root root  2769508 May 28 18:21 libglib-2.0.a
+-rw-r--r-- 1 root root    17740 May 28 18:21 libgmodule-2.0.a
+-rw-r--r-- 1 root root   831922 May 28 18:22 libgobject-2.0.a
+-rw-r--r-- 1 root root   685208 May 28 18:23 libgsf-1.a
+-rw-r--r-- 1 root root     2846 May 28 18:21 libgthread-2.0.a
+-rw-r--r-- 1 root root  2086714 May 28 18:28 libharfbuzz-subset.a
+-rw-r--r-- 1 root root  2276974 May 28 18:28 libharfbuzz.a
+-rw-r--r-- 1 root root  1905718 May 28 18:26 libheif.a
+-rw-r--r-- 1 root root    83574 May 28 18:26 libimagequant.a
+-rw-r--r-- 1 root root   869366 May 28 18:26 libjpeg.a
+-rw-r--r-- 1 root root   975154 May 28 18:23 liblcms2.a
+-rw-r--r-- 1 root root  1255920 May 28 18:27 liborc-0.4.a
+-rw-r--r-- 1 root root   838738 May 28 18:29 libpango-1.0.a
+-rw-r--r-- 1 root root   101924 May 28 18:29 libpangocairo-1.0.a
+-rw-r--r-- 1 root root   185930 May 28 18:29 libpangoft2-1.0.a
+-rw-r--r-- 1 root root   911992 May 28 18:29 libpixman-1.a
+lrwxrwxrwx 1 root root       10 May 28 18:26 libpng.a -> libpng16.a
+-rw-r--r-- 1 root root   449666 May 28 18:26 libpng16.a
+-rw-r--r-- 1 root root 10239968 May 28 18:32 librsvg-2.a
+-rw-r--r-- 1 root root   105976 May 28 18:26 libspng.a
+-rw-r--r-- 1 root root   782006 May 28 18:27 libtiff.a
+lrwxrwxrwx 1 root root       22 May 28 18:34 libvips-cpp.so -> libvips-cpp.so.42.14.2
+lrwxrwxrwx 1 root root       22 May 28 18:34 libvips-cpp.so.42 -> libvips-cpp.so.42.14.2
+-rwxr-xr-x 1 root root 18866984 May 28 18:34 libvips-cpp.so.42.14.2
+-rw-r--r-- 1 root root  6008736 May 28 18:34 libvips.a
+-rw-r--r-- 1 root root   770968 May 28 18:26 libwebp.a
+-rw-r--r-- 1 root root    17658 May 28 18:26 libwebpdemux.a
+-rw-r--r-- 1 root root    55024 May 28 18:26 libwebpmux.a
+-rw-r--r-- 1 root root   957014 May 28 18:22 libxml2.a
+-rw-r--r-- 1 root root   200682 May 28 18:21 libz.a
+-rw-r--r-- 1 root root      223 May 28 18:22 xml2Conf.sh
+     9098440     8774865  96% /packaging/libvips-8.12.2-linux-x64.tar.gz
+     9098440     8774865  96%
 ##[group]Run ./integrity.sh
 �[36;1m./integrity.sh�[0m
 shell: /usr/bin/bash -e {0}
 ##[endgroup]
-sha512-SEFgYixn2dW/ZqCppDwMnQAL9sXizzFSvwLdnc96QILiJCFdPRJ6RHJcWT8XDndDa849zAFLZW2qNQ8opNplGw== libvips-8.12.2-linux-x64.tar.br
-sha512-RDokHL/3pD/xIkf9Yp4wuC0m9yQ9hOhsoPbeSNXQCVS9l/COJ5hJHnem0nZjDesiG7GZNCDIlffzFx+4/gDDGg== libvips-8.12.2-linux-x64.tar.gz
+sha512-B4OUhTaxxBaNftuevFZ4p4g0ltbadQ7h4hSwq5Py/XGw3Qa03C+TwJ78Wj2i5z9EqlKd1VSvLGBdie1gvzzeOA== libvips-8.12.2-linux-x64.tar.br
+sha512-IWuODV3bVi50FgkWhAdDjgBFaxQVqav2tBv5QaEhHgr5Jdk3P4bwNCGIPFUq0RvQVDuQ0jO50Ozs5hZ7usYD+Q== libvips-8.12.2-linux-x64.tar.gz
 Post job cleanup.
 [command]/usr/bin/git version
 git version 2.36.1

Might depend on PR: google/oss-fuzz#7775.

- Remove `CPATH` env in favor of `CPPFLAGS`.
- Remove redundant `LIBRARY_PATH` env.
- Remove redundant sed replacements and configure options.
- Enable Arm Neon support in libwebp, if available.
- Enable WebP support in libtiff.
build/lin.sh Show resolved Hide resolved
@lovell lovell merged commit c68ec1e into lovell:main May 29, 2022
@lovell
Copy link
Owner

lovell commented May 29, 2022

Dankjewel Kleis!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants