libffi: Remove old libraries following rebuild (#4612)

**Summary** - Now that rebuilds are complete, the old *so.7 libraries can be removed. **Test Plan** - headless firefox seems happy **Checklist** - [x] Package was built and tested against unstable - [ ] This change could gainfully be listed in the weekly sync notes once merged (Write an appropriate message in the Summary section)
getsolus · Dec 18, 2024 · 9a0d8df · 9a0d8df
2 parents 67e071f + cb6ed55
commit 9a0d8df
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 128 deletions.
diff --git a/packages/l/libffi/abi_libs b/packages/l/libffi/abi_libs
@@ -1,2 +1 @@
-libffi.so.7
 libffi.so.8
diff --git a/packages/l/libffi/abi_libs32 b/packages/l/libffi/abi_libs32
@@ -1,2 +1 @@
-libffi.so.7
 libffi.so.8
diff --git a/packages/l/libffi/abi_symbols b/packages/l/libffi/abi_symbols
@@ -1,46 +1,3 @@
-libffi.so.7:LIBFFI_BASE_7.0
-libffi.so.7:LIBFFI_BASE_7.1
-libffi.so.7:LIBFFI_CLOSURE_7.0
-libffi.so.7:LIBFFI_COMPLEX_7.0
-libffi.so.7:LIBFFI_GO_CLOSURE_7.0
-libffi.so.7:ffi_call
-libffi.so.7:ffi_call_go
-libffi.so.7:ffi_closure_alloc
-libffi.so.7:ffi_closure_free
-libffi.so.7:ffi_get_struct_offsets
-libffi.so.7:ffi_java_ptrarray_to_raw
-libffi.so.7:ffi_java_raw_call
-libffi.so.7:ffi_java_raw_size
-libffi.so.7:ffi_java_raw_to_ptrarray
-libffi.so.7:ffi_prep_cif
-libffi.so.7:ffi_prep_cif_var
-libffi.so.7:ffi_prep_closure
-libffi.so.7:ffi_prep_closure_loc
-libffi.so.7:ffi_prep_go_closure
-libffi.so.7:ffi_prep_java_raw_closure
-libffi.so.7:ffi_prep_java_raw_closure_loc
-libffi.so.7:ffi_prep_raw_closure
-libffi.so.7:ffi_prep_raw_closure_loc
-libffi.so.7:ffi_ptrarray_to_raw
-libffi.so.7:ffi_raw_call
-libffi.so.7:ffi_raw_size
-libffi.so.7:ffi_raw_to_ptrarray
-libffi.so.7:ffi_type_complex_double
-libffi.so.7:ffi_type_complex_float
-libffi.so.7:ffi_type_complex_longdouble
-libffi.so.7:ffi_type_double
-libffi.so.7:ffi_type_float
-libffi.so.7:ffi_type_longdouble
-libffi.so.7:ffi_type_pointer
-libffi.so.7:ffi_type_sint16
-libffi.so.7:ffi_type_sint32
-libffi.so.7:ffi_type_sint64
-libffi.so.7:ffi_type_sint8
-libffi.so.7:ffi_type_uint16
-libffi.so.7:ffi_type_uint32
-libffi.so.7:ffi_type_uint64
-libffi.so.7:ffi_type_uint8
-libffi.so.7:ffi_type_void
 libffi.so.8:LIBFFI_BASE_8.0
 libffi.so.8:LIBFFI_CLOSURE_8.0
 libffi.so.8:LIBFFI_COMPLEX_8.0

diff --git a/packages/l/libffi/abi_symbols32 b/packages/l/libffi/abi_symbols32
@@ -1,43 +1,3 @@
-libffi.so.7:LIBFFI_BASE_7.0
-libffi.so.7:LIBFFI_BASE_7.1
-libffi.so.7:LIBFFI_CLOSURE_7.0
-libffi.so.7:LIBFFI_COMPLEX_7.0
-libffi.so.7:LIBFFI_GO_CLOSURE_7.0
-libffi.so.7:ffi_call
-libffi.so.7:ffi_call_go
-libffi.so.7:ffi_closure_alloc
-libffi.so.7:ffi_closure_free
-libffi.so.7:ffi_get_struct_offsets
-libffi.so.7:ffi_java_ptrarray_to_raw
-libffi.so.7:ffi_java_raw_size
-libffi.so.7:ffi_java_raw_to_ptrarray
-libffi.so.7:ffi_prep_cif
-libffi.so.7:ffi_prep_cif_var
-libffi.so.7:ffi_prep_closure
-libffi.so.7:ffi_prep_closure_loc
-libffi.so.7:ffi_prep_go_closure
-libffi.so.7:ffi_prep_raw_closure
-libffi.so.7:ffi_prep_raw_closure_loc
-libffi.so.7:ffi_ptrarray_to_raw
-libffi.so.7:ffi_raw_call
-libffi.so.7:ffi_raw_size
-libffi.so.7:ffi_raw_to_ptrarray
-libffi.so.7:ffi_type_complex_double
-libffi.so.7:ffi_type_complex_float
-libffi.so.7:ffi_type_complex_longdouble
-libffi.so.7:ffi_type_double
-libffi.so.7:ffi_type_float
-libffi.so.7:ffi_type_longdouble
-libffi.so.7:ffi_type_pointer
-libffi.so.7:ffi_type_sint16
-libffi.so.7:ffi_type_sint32
-libffi.so.7:ffi_type_sint64
-libffi.so.7:ffi_type_sint8
-libffi.so.7:ffi_type_uint16
-libffi.so.7:ffi_type_uint32
-libffi.so.7:ffi_type_uint64
-libffi.so.7:ffi_type_uint8
-libffi.so.7:ffi_type_void
 libffi.so.8:LIBFFI_BASE_8.0
 libffi.so.8:LIBFFI_CLOSURE_8.0
 libffi.so.8:LIBFFI_COMPLEX_8.0

diff --git a/packages/l/libffi/abi_used_symbols b/packages/l/libffi/abi_used_symbols
@@ -21,7 +21,6 @@ libc.so.6:malloc
 libc.so.6:memcpy
 libc.so.6:memfd_create
 libc.so.6:memset
-libc.so.6:mkostemp
 libc.so.6:mkstemp
 libc.so.6:mmap
 libc.so.6:munmap

diff --git a/packages/l/libffi/abi_used_symbols32 b/packages/l/libffi/abi_used_symbols32
@@ -21,7 +21,6 @@ libc.so.6:malloc
 libc.so.6:memcpy
 libc.so.6:memfd_create
 libc.so.6:memset
-libc.so.6:mkostemp
 libc.so.6:mkstemp
 libc.so.6:mmap
 libc.so.6:munmap

diff --git a/packages/l/libffi/package.yml b/packages/l/libffi/package.yml
@@ -1,10 +1,8 @@
 name       : libffi
 version    : '3.4.6'
-release    : 14
+release    : 15
 source     :
     - https://github.com/libffi/libffi/releases/download/v3.4.6/libffi-3.4.6.tar.gz : b0dea9df23c863a7a50e825440f3ebffabd65df1497108e5d437747843895a4e
-    - https://github.com/libffi/libffi/releases/download/v3.3/libffi-3.3.tar.gz : 72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056
-extract    : no
 homepage   : https://sourceware.org/libffi
 license    : MIT
 component  : system.base
@@ -19,39 +17,10 @@ patterns   :
 builddeps  :
     - dejagnu-devel
 setup      : |
-    mkdir old_abi new_abi
-    tar --strip-components=1 -xf $sources/libffi-3.3.tar.gz -C old_abi
-    tar --strip-components=1 -xf $sources/libffi-3.4.6.tar.gz -C new_abi
-
-    pushd old_abi
     %configure_no_runstatedir --disable-static
-    popd
-
-    pushd new_abi
-    %configure --disable-static
-    popd
 build      : |
-    pushd old_abi
     %make
-    popd
-
-    pushd new_abi
-    %make
-    popd
 install    : |
-    pushd old_abi
-    %make_install
-    # Cleanup things we don't need for ABI compat
-    rm -rfv $installdir/usr/include \
-            $installdir/usr/share \
-            $installdir/%libdir%/pkgconfig \
-            $installdir/%libdir%/libffi.so
-    popd
-    
-    pushd new_abi
     %make_install
-    popd
 check      : |
-    # We don't really care if checks for the old_abi fail, so skip that
-    cd new_abi
     %make check
diff --git a/packages/l/libffi/pspec_x86_64.xml b/packages/l/libffi/pspec_x86_64.xml
@@ -20,8 +20,6 @@
 </Description>
         <PartOf>system.base</PartOf>
         <Files>
-            <Path fileType="library">/usr/lib64/libffi.so.7</Path>
-            <Path fileType="library">/usr/lib64/libffi.so.7.1.0</Path>
             <Path fileType="library">/usr/lib64/libffi.so.8</Path>
             <Path fileType="library">/usr/lib64/libffi.so.8.1.4</Path>
         </Files>
@@ -33,11 +31,9 @@
 </Description>
         <PartOf>emul32</PartOf>
         <RuntimeDependencies>
-            <Dependency release="14">libffi</Dependency>
+            <Dependency release="15">libffi</Dependency>
         </RuntimeDependencies>
         <Files>
-            <Path fileType="library">/usr/lib32/libffi.so.7</Path>
-            <Path fileType="library">/usr/lib32/libffi.so.7.1.0</Path>
             <Path fileType="library">/usr/lib32/libffi.so.8</Path>
             <Path fileType="library">/usr/lib32/libffi.so.8.1.4</Path>
         </Files>
@@ -49,8 +45,8 @@
 </Description>
         <PartOf>programming.devel</PartOf>
         <RuntimeDependencies>
-            <Dependency release="14">libffi-32bit</Dependency>
-            <Dependency release="14">libffi-devel</Dependency>
+            <Dependency release="15">libffi-devel</Dependency>
+            <Dependency release="15">libffi-32bit</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="library">/usr/lib32/libffi.so</Path>
@@ -64,7 +60,7 @@
 </Description>
         <PartOf>system.devel</PartOf>
         <RuntimeDependencies>
-            <Dependency release="14">libffi</Dependency>
+            <Dependency release="15">libffi</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include/ffi.h</Path>
@@ -79,7 +75,7 @@
         </Files>
     </Package>
     <History>
-        <Update release="14">
+        <Update release="15">
             <Date>2024-12-18</Date>
             <Version>3.4.6</Version>
             <Comment>Packaging update</Comment>