diff options
| -rw-r--r-- | perl-install/any.pm | 2 | ||||
| -rwxr-xr-x | perl-install/c/Makefile.PL | 2 | ||||
| -rw-r--r-- | perl-install/common.pm | 2 | ||||
| -rw-r--r-- | perl-install/install/share/list.xml | 12 | ||||
| -rwxr-xr-x | tools/install-xml-file-list | 2 |
5 files changed, 16 insertions, 4 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index 9ffe0a86d..5c67cb7a3 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -991,7 +991,7 @@ sub writeandclean_ldsoconf { my @default = ('/lib', '/usr/lib'); #- no need to have /lib and /usr/lib in ld.so.conf my @suggest = ('/usr/lib/qt3/lib'); #- needed for upgrade where package renaming can cause this to disappear - if (arch() =~ /x86_64/) { + if (arch() =~ /x86_64|aarch64/) { @default = map { $_, $_ . '64' } @default; @suggest = map { $_, $_ . '64' } @suggest; } diff --git a/perl-install/c/Makefile.PL b/perl-install/c/Makefile.PL index f776d27f2..6b4358ffc 100755 --- a/perl-install/c/Makefile.PL +++ b/perl-install/c/Makefile.PL @@ -4,7 +4,7 @@ use Config; # See lib/ExtUtils/MakeMaker.pm for details of how to influence # the contents of the Makefile that is written. -my $lib = arch() =~ /x86_64/ ? 'lib64' : 'lib'; +my $lib = arch() =~ /x86_64|aarch64/ ? 'lib64' : 'lib'; my $libs = '-lldetect -lparted'; diff --git a/perl-install/common.pm b/perl-install/common.pm index 508e6b31f..de8e705d1 100644 --- a/perl-install/common.pm +++ b/perl-install/common.pm @@ -715,7 +715,7 @@ sub update_gnomekderc_no_create { } sub get_libdir() { - arch() =~ /x86_64/ ? "lib64" : "lib"; + arch() =~ /x86_64|aarch64/ ? "lib64" : "lib"; } =item is_uefi() diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml index 83766f27f..3a0e63e5f 100644 --- a/perl-install/install/share/list.xml +++ b/perl-install/install/share/list.xml @@ -245,7 +245,9 @@ libnss_files.so.2 libnss_dns.so.2 libresolv.so.2 + <if ARCH="i.86|x86_64"> ld-linux*.so.* + </if> <!-- needed for mount.ntfs-3g --> libfuse.so.2 @@ -258,6 +260,11 @@ </from> webkit2gtk-4.1/injected-bundle/libwebkit2gtkinjectedbundle.so </from> +<from dir="/lib"> + <if ARCH="aarch64"> + ld-linux*.so.* + </if> +</from> </filter> <from> @@ -495,6 +502,11 @@ asm/unistd_32.ph asm/unistd_64.ph </if> + <if ARCH="aarch64"> + asm-generic/unistd.ph + asm-generic/bitsperlong.ph + asm/bitsperlong.ph + </if> asm/unistd.ph auto/B/B.so auto/Cwd/Cwd.so diff --git a/tools/install-xml-file-list b/tools/install-xml-file-list index 64c70b9c6..4e7aad347 100755 --- a/tools/install-xml-file-list +++ b/tools/install-xml-file-list @@ -25,7 +25,7 @@ my $verbose; my $initial_dir = cwd(); my $ARCH = arch() =~ /i.86/ ? 'i386' : arch(); $ARCH =~ s/^(arm).*/$1/; -my $LIB = arch() =~ /x86_64/ ? "lib64" : "lib"; +my $LIB = arch() =~ /x86_64|aarch64/ ? "lib64" : "lib"; my $base_cpio_options = '-pumd --quiet'; |