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

libimobiledevice: update to 2024-05-20 #24233

Merged
merged 1 commit into from
May 27, 2024
Merged

libimobiledevice: update to 2024-05-20 #24233

merged 1 commit into from
May 27, 2024

Conversation

neheb
Copy link
Contributor

@neheb neheb commented May 27, 2024

Add patch to fix compilation with GCC14.

Maintainer: me

ping @httpstorm

Add patch to fix compilation with GCC14.

Signed-off-by: Rosen Penev <[email protected]>
@httpstorm
Copy link
Contributor

@neheb Thank you for the fix.
Target System (Marvell EBU Armada), Subtarget (Marvell Armada 37x/38x/XP), Target Profile (Linksys WRT3200ACM)

  • gcc-13 ok

gcc-14: libimobiledevice and friends build file, but some unrelated packages fail, and we need to fix them, before I can install the firmware and make a test run:

Note: I don't use frr in my firmware. I tested it, because I have a pending PR 24083.

make package/feeds/packages/pciutils/{clean,compile} -j 1 V=sarm-openwrt-linux-muslgnueabi-gcc -Os -pipe -fno-caller-saves -fno-plt -fhonour-copts -mfloat-abi=hard -fmacro-prefix-map=/Volumes/wrt3200/openwrt/build_dir/target-arm_cortex-a9+vfpv3-d16_musl_eabi/pciutils-3.12.0=pciutils-3.12.0 -Wformat -Werror=format-security -fstack-protector -D_FORTIFY_SOURCE=1 -Wl,-z,now -Wl,-z,relro -DPIC -fpic -I/Volumes/wrt3200/openwrt/staging_dir/toolchain-arm_cortex-a9+vfpv3-d16_gcc-14.1.0_musl_eabi/usr/include -I/Volumes/wrt3200/openwrt/staging_dir/toolchain-arm_cortex-a9+vfpv3-d16_gcc-14.1.0_musl_eabi/include -I/Volumes/wrt3200/openwrt/staging_dir/toolchain-arm_cortex-a9+vfpv3-d16_gcc-14.1.0_musl_eabi/include/fortify   -c -o sysfs.o sysfs.c
sysfs.c: In function 'sysfs_fill_info':
sysfs.c:457:53: error: implicit declaration of function 'basename' [-Wimplicit-function-declaration]
  457 |           pci_set_property(d, PCI_FILL_IOMMU_GROUP, basename(group_link));
      |                                                     ^~~~~~~~
sysfs.c:457:53: error: passing argument 3 of 'pci_set_property' makes pointer from integer without a cast [-Wint-conversion]
  457 |           pci_set_property(d, PCI_FILL_IOMMU_GROUP, basename(group_link));
      |                                                     ^~~~~~~~~~~~~~~~~~~~
      |                                                     |
      |                                                     int
In file included from sysfs.c:24:
internal.h:131:58: note: expected 'char *' but argument is of type 'int'
  131 | char *pci_set_property(struct pci_dev *d, u32 key, char *value);
make package/network/utils/ebtables/{clean,compile} -j 1 V=sarm-openwrt-linux-muslgnueabi-gcc -Os -pipe -fno-caller-saves -fno-plt -fhonour-copts -mfloat-abi=hard -fmacro-prefix-map=/Volumes/wrt3200/openwrt/build_dir/target-arm_cortex-a9+vfpv3-d16_musl_eabi/ebtables-2018.06.27~48cff25d=ebtables-2018.06.27~48cff25d -Wformat -Werror=format-security -fstack-protector -D_FORTIFY_SOURCE=1 -Wl,-z,now -Wl,-z,relro -fPIC -O3 -DPROGVERSION=\"2.0.10-4\" -DPROGNAME=\"ebtables\" -DPROGDATE=\"December\ 2011\" -D_PATH_ETHERTYPES=\"/etc/ethertypes\" -DEBTD_ARGC_MAX=50 -DEBTD_CMDLINE_MAXLN=2048 -DLOCKFILE=\"/var/lib/ebtables/lock\" -DLOCKDIR=\"/var/lib/ebtables/\" -c -o useful_functions.o useful_functions.c -Iinclude/
useful_functions.c: In function 'ebt_print_mac':
useful_functions.c:63:41: error: passing argument 1 of 'ether_ntoa' from incompatible pointer type [-Wincompatible-pointer-types]
   63 |                 printf("%s", ether_ntoa((struct ether_addr *) mac));
      |                                         ^~~~~~~~~~~~~~~~~~~~~~~~~
      |                                         |
      |                                         struct ether_addr *
In file included from include/ebtables_u.h:28,
                 from useful_functions.c:25:
/Volumes/wrt3200/openwrt/staging_dir/toolchain-arm_cortex-a9+vfpv3-d16_gcc-14.1.0_musl_eabi/include/netinet/ether.h:10:19: note: expected 'const struct ether_addr *' but argument is of type 'struct ether_addr *'
   10 | char *ether_ntoa (const struct ether_addr *);
      |                   ^~~~~~~~~~~~~~~~~~~~~~~~~
make package/network/utils/iproute2/{clean,compile} -j 1 V=sarm-openwrt-linux-muslgnueabi-gcc -Wall -Wstrict-prototypes  -Wmissing-prototypes -Wmissing-declarations -Wold-style-definition -Wformat=2 -O2 -pipe -I../include -I../include/uapi -DRESOLVE_HOSTNAMES -DLIBDIR=\"/usr/lib\" -DNO_SHARED_LIBS -DCONF_USR_DIR=\"/usr/share/iproute2\" -DCONF_ETC_DIR=\"/etc/iproute2\" -DNETNS_RUN_DIR=\"/var/run/netns\" -DNETNS_ETC_DIR=\"/etc/netns\" -DCONF_COLOR=COLOR_OPT_NEVER -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -Os -pipe -fno-caller-saves -fno-plt -fhonour-copts -mfloat-abi=hard -fmacro-prefix-map=/Volumes/wrt3200/openwrt/build_dir/target-arm_cortex-a9+vfpv3-d16_musl_eabi/linux-mvebu_cortexa9/iproute2-ipfull/iproute2-6.7.0=iproute2-6.7.0 -ffunction-sections -fdata-sections -flto=auto -fno-fat-lto-objects -Wformat -Werror=format-security -fstack-protector -D_FORTIFY_SOURCE=1 -Wl,-z,now -Wl,-z,relro    -I/Volumes/wrt3200/openwrt/staging_dir/toolchain-arm_cortex-a9+vfpv3-d16_gcc-14.1.0_musl_eabi/usr/include -I/Volumes/wrt3200/openwrt/staging_dir/toolchain-arm_cortex-a9+vfpv3-d16_gcc-14.1.0_musl_eabi/include -I/Volumes/wrt3200/openwrt/staging_dir/toolchain-arm_cortex-a9+vfpv3-d16_gcc-14.1.0_musl_eabi/include/fortify   -I/Volumes/wrt3200/openwrt/staging_dir/target-arm_cortex-a9+vfpv3-d16_musl_eabi/usr/include/libnl-tiny  -DHAVE_SETNS -DHAVE_HANDLE_AT -DHAVE_LIBBPF  -I/Volumes/wrt3200/openwrt/staging_dir/target-arm_cortex-a9+vfpv3-d16_musl_eabi/usr/include -DLIBBPF_VERSION=\"1.4.2\" -DLIBBPF_DYNAMIC -DHAVE_LIBBPF_SECTION_NAME  -DHAVE_ELF -I/Volumes/wrt3200/openwrt/staging_dir/target-arm_cortex-a9+vfpv3-d16_musl_eabi/usr/include -DHAVE_SETNS -DHAVE_HANDLE_AT -DHAVE_LIBBPF  -I/Volumes/wrt3200/openwrt/staging_dir/target-arm_cortex-a9+vfpv3-d16_musl_eabi/usr/include -DLIBBPF_VERSION=\"1.4.2\" -DLIBBPF_DYNAMIC -DHAVE_LIBBPF_SECTION_NAME  -DHAVE_ELF -I/Volumes/wrt3200/openwrt/staging_dir/target-arm_cortex-a9+vfpv3-d16_musl_eabi/usr/include -DPIC -fpic   -c -o bpf_legacy.o bpf_legacy.c
bpf_legacy.c: In function 'bpf_load_common':
bpf_legacy.c:974:26: error: implicit declaration of function 'basename' [-Wimplicit-function-declaration]
  974 |                          basename(cfg->object), cfg->mode == EBPF_PINNED ?
      |                          ^~~~~~~~
bpf_legacy.c:973:60: warning: format '%s' expects argument of type 'char *', but argument 4 has type 'int' [-Wformat=]
  973 |                 snprintf(annotation, sizeof(annotation), "%s:[%s]",
      |                                                           ~^
      |                                                            |
      |                                                            char *
      |                                                           %d
  974 |                          basename(cfg->object), cfg->mode == EBPF_PINNED ?
      |                          ~~~~~~~~~~~~~~~~~~~~~              
      |                          |
      |                          int
bpf_legacy.c: In function 'bpf_obj_hash':
bpf_legacy.c:1355:64: warning: format '%zu' expects argument of type 'size_t', but argument 4 has type 'off_t' {aka 'long long int'} [-Wformat=]
 1355 |                 fprintf(stderr, "Error from sendfile (%zd vs %zu bytes): %s\n",
      |                                                              ~~^
      |                                                                |
      |                                                                unsigned int
      |                                                              %llu
 1356 |                         size, stbuff.st_size, strerror(errno));
      |                               ~~~~~~~~~~~~~~                    
      |                                     |
      |                                     off_t {aka long long int}

@neheb neheb merged commit 0b37712 into openwrt:master May 27, 2024
12 checks passed
@neheb neheb deleted the n branch May 27, 2024 17:46
@httpstorm
Copy link
Contributor

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