Skip to content

hyperscan: symlinks redundant ABI shared objects#23512

Merged
neheb merged 1 commit intoopenwrt:masterfrom
graysky2:hyperscan-linked
Feb 23, 2024
Merged

hyperscan: symlinks redundant ABI shared objects#23512
neheb merged 1 commit intoopenwrt:masterfrom
graysky2:hyperscan-linked

Conversation

@graysky2
Copy link
Copy Markdown
Contributor

@graysky2 graysky2 commented Feb 22, 2024

Use $(CP) macro rather than $(INSTALL_DATA) to preserve symlinks on shared objects which saves approx 11.8 M of space.

From hyperscan-runtime_5.4.2-1:

% ls -lh /usr/lib/libhs*
-rw-r--r-- 1 root root 4.7M Feb 16 14:29 /usr/lib/libhs.so
-rw-r--r-- 1 root root 4.7M Feb 16 14:29 /usr/lib/libhs.so.5
-rw-r--r-- 1 root root 4.7M Feb 16 14:29 /usr/lib/libhs.so.5.4.2
-rw-r--r-- 1 root root 1.2M Feb 16 14:29 /usr/lib/libhs_runtime.so
-rw-r--r-- 1 root root 1.2M Feb 16 14:29 /usr/lib/libhs_runtime.so.5
-rw-r--r-- 1 root root 1.2M Feb 16 14:29 /usr/lib/libhs_runtime.so.5.4.2

% grep Installed-Size /usr/lib/opkg/info/hyperscan-runtime.control Installed-Size: 18370560

From hyperscan-runetime_5.4.2-2 (created by this PR):

% ls -lh /usr/lib/libhs*
lrwxr-xr-x 1 root root   10 Feb 22 15:56 /usr/lib/libhs.so -> libhs.so.5
lrwxr-xr-x 1 root root   14 Feb 22 15:56 /usr/lib/libhs.so.5 -> libhs.so.5.4.2
-rwxr-xr-x 1 root root 4.6M Feb 22 15:27 /usr/lib/libhs.so.5.4.2
lrwxr-xr-x 1 root root   18 Feb 22 15:56 /usr/lib/libhs_runtime.so -> libhs_runtime.so.5
lrwxr-xr-x 1 root root   22 Feb 22 15:56 /usr/lib/libhs_runtime.so.5 -> libhs_runtime.so.5.4.2
-rwxr-xr-x 1 root root 1.2M Feb 22 15:27 /usr/lib/libhs_runtime.so.5.4.2

% grep Installed-Size /usr/lib/opkg/info/hyperscan-runtime.control Installed-Size: 5918720

Credit to @efahl for pointing this out.

Build system: x86/64
Build-tested: x86/64/AMD Cezanne
Run-tested: x86/64/AMD Cezanne

@efahl
Copy link
Copy Markdown
Contributor

efahl commented Feb 22, 2024

Looks good to me!

Use $(CP) macro rather than $(INSTALL_DATA) to preserve symlinks
on shared objects which saves approx 11.8 M of space.

From hyperscan-runtime_5.4.2-1:

% ls -lh /usr/lib/libhs*
-rw-r--r-- 1 root root 4.7M Feb 16 14:29 /usr/lib/libhs.so
-rw-r--r-- 1 root root 4.7M Feb 16 14:29 /usr/lib/libhs.so.5
-rw-r--r-- 1 root root 4.7M Feb 16 14:29 /usr/lib/libhs.so.5.4.2
-rw-r--r-- 1 root root 1.2M Feb 16 14:29 /usr/lib/libhs_runtime.so
-rw-r--r-- 1 root root 1.2M Feb 16 14:29 /usr/lib/libhs_runtime.so.5
-rw-r--r-- 1 root root 1.2M Feb 16 14:29 /usr/lib/libhs_runtime.so.5.4.2

% grep Installed-Size /usr/lib/opkg/info/hyperscan-runtime.control
Installed-Size: 18370560

From hyperscan-runetime_5.4.2-2 (created by this PR):

% ls -lh /usr/lib/libhs*
lrwxr-xr-x 1 root root   10 Feb 22 15:56 /usr/lib/libhs.so -> libhs.so.5
lrwxr-xr-x 1 root root   14 Feb 22 15:56 /usr/lib/libhs.so.5 -> libhs.so.5.4.2
-rwxr-xr-x 1 root root 4.6M Feb 22 15:27 /usr/lib/libhs.so.5.4.2
lrwxr-xr-x 1 root root   18 Feb 22 15:56 /usr/lib/libhs_runtime.so -> libhs_runtime.so.5
lrwxr-xr-x 1 root root   22 Feb 22 15:56 /usr/lib/libhs_runtime.so.5 -> libhs_runtime.so.5.4.2
-rwxr-xr-x 1 root root 1.2M Feb 22 15:27 /usr/lib/libhs_runtime.so.5.4.2

% grep Installed-Size /usr/lib/opkg/info/hyperscan-runtime.control
Installed-Size: 5918720

Credit to @efahl for pointing this out.

Build system: x86/64
Build-tested: x86/64/AMD Cezanne
Run-tested: x86/64/AMD Cezanne

Signed-off-by: John Audia <therealgraysky@proton.me>
@graysky2
Copy link
Copy Markdown
Contributor Author

Looks good to me!

Thanks for the private email pointing this out.

@neheb neheb merged commit bb574d7 into openwrt:master Feb 23, 2024
@graysky2 graysky2 deleted the hyperscan-linked branch February 25, 2024 11:59
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.

3 participants