Your message dated Wed, 23 Apr 2025 23:19:28 +0000
with message-id <e1u7jni-00exu2...@fasolo.debian.org>
and subject line Bug#1103938: fixed in curl 8.13.0-4
has caused the Debian Bug report #1103938,
regarding curl FTCBFS: intentionally broken for cross compilation
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
1103938: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1103938
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Source: curl
Version: 8.13.0-1
Tags: patch upstream
Severity: important
Justification: architecture cross bootstrap regression
User: helm...@debian.org
Usertags: rebootstrap
User: debian-cr...@lists.debian.org
Usertags: ftcbfs
Hi,
curl intentionally broke cross compilation in its last upstream release.
It stopped installing fish/zsh completion files, because that's
impossible for cross compilation. Turns out, that's factually wrong and
skipping the files makes the build fail. I'm attaching a revert for your
convenience. Please include it at least in Debian even if it ends up not
being upstreamable.
Helmut
--- curl-8.13.0.orig/scripts/CMakeLists.txt
+++ curl-8.13.0/scripts/CMakeLists.txt
@@ -51,33 +51,29 @@
endif()
if(NOT CURL_DISABLE_INSTALL)
- if(NOT CMAKE_CROSSCOMPILING)
- if(NOT CURL_COMPLETION_FISH_DIR)
- find_package(PkgConfig QUIET)
- pkg_get_variable(CURL_COMPLETION_FISH_DIR "fish" "completionsdir")
- if(NOT _pkg_fish_completionsdir)
- include(GNUInstallDirs)
- if(CMAKE_INSTALL_DATAROOTDIR)
- set(CURL_COMPLETION_FISH_DIR "${CMAKE_INSTALL_DATAROOTDIR}/fish/vendor_completions.d")
- endif()
- endif()
- endif()
- if(NOT CURL_COMPLETION_ZSH_DIR)
+ if(NOT CURL_COMPLETION_FISH_DIR)
+ find_package(PkgConfig QUIET)
+ pkg_get_variable(CURL_COMPLETION_FISH_DIR "fish" "completionsdir")
+ if(NOT _pkg_fish_completionsdir)
include(GNUInstallDirs)
if(CMAKE_INSTALL_DATAROOTDIR)
- set(CURL_COMPLETION_ZSH_DIR "${CMAKE_INSTALL_DATAROOTDIR}/zsh/site-functions")
+ set(CURL_COMPLETION_FISH_DIR "${CMAKE_INSTALL_DATAROOTDIR}/fish/vendor_completions.d")
endif()
endif()
- if(CURL_COMPLETION_FISH_DIR)
- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${_completion_fish}"
- DESTINATION "${CURL_COMPLETION_FISH_DIR}")
- endif()
- if(CURL_COMPLETION_ZSH_DIR)
- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${_completion_zsh}"
- DESTINATION "${CURL_COMPLETION_ZSH_DIR}")
+ endif()
+ if(NOT CURL_COMPLETION_ZSH_DIR)
+ include(GNUInstallDirs)
+ if(CMAKE_INSTALL_DATAROOTDIR)
+ set(CURL_COMPLETION_ZSH_DIR "${CMAKE_INSTALL_DATAROOTDIR}/zsh/site-functions")
endif()
- else()
- message(STATUS "We cannot install completion scripts when cross-compiling")
+ endif()
+ if(CURL_COMPLETION_FISH_DIR)
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${_completion_fish}"
+ DESTINATION "${CURL_COMPLETION_FISH_DIR}")
+ endif()
+ if(CURL_COMPLETION_ZSH_DIR)
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${_completion_zsh}"
+ DESTINATION "${CURL_COMPLETION_ZSH_DIR}")
endif()
endif()
else()
--- curl-8.13.0.orig/scripts/Makefile.am
+++ curl-8.13.0/scripts/Makefile.am
@@ -55,9 +55,6 @@ $(FISH_COMPLETION_FUNCTION_FILENAME): co
endif
install-data-local:
-if CROSSCOMPILING
- @echo 'NOTICE: we cannot install completion scripts when cross-compiling'
-else # if not cross-compiling:
if USE_ZSH_COMPLETION
if test -n "$(PERL)"; then \
$(MKDIR_P) $(DESTDIR)$(ZSH_FUNCTIONS_DIR); \
@@ -70,7 +67,6 @@ if USE_FISH_COMPLETION
$(INSTALL_DATA) $(FISH_COMPLETION_FUNCTION_FILENAME) $(DESTDIR)$(FISH_FUNCTIONS_DIR)/$(FISH_COMPLETION_FUNCTION_FILENAME); \
fi
endif
-endif
distclean:
rm -f $(CLEANFILES)
--- End Message ---
--- Begin Message ---
Source: curl
Source-Version: 8.13.0-4
Done: Samuel Henrique <samuel...@debian.org>
We believe that the bug you reported is fixed in the latest version of
curl, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 1103...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Samuel Henrique <samuel...@debian.org> (supplier of updated curl package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Thu, 24 Apr 2025 00:02:26 +0100
Source: curl
Architecture: source
Version: 8.13.0-4
Distribution: unstable
Urgency: medium
Maintainer: Debian Curl Maintainers <team+c...@tracker.debian.org>
Changed-By: Samuel Henrique <samuel...@debian.org>
Closes: 1103938
Changes:
curl (8.13.0-4) unstable; urgency=medium
.
* d/tests/control: Install curl for the openssl tests
* d/p/autotools_install_shell_completion_files_on_cross_build: Fix FTCBFS,
thanks to Helmut Grohne (closes: #1103938)
Checksums-Sha1:
5a1057e7866a6a207d7ce034ef8e57cce7078820 3231 curl_8.13.0-4.dsc
fbd456d9458e9b2fe66270bff53a45757c7396fd 54724 curl_8.13.0-4.debian.tar.xz
e7f2a6c7b87c2d94eb1ce1a9ee02497a38c66653 11970 curl_8.13.0-4_amd64.buildinfo
Checksums-Sha256:
513231959f1528ffa2664496494f9d3b9117a0b6bb5df671670cbdaab19e1815 3231
curl_8.13.0-4.dsc
420c7cb2178aee0ab9a2df300df7811fa1dfc997be053253a4ed6944efd9b26a 54724
curl_8.13.0-4.debian.tar.xz
77abea0d95a9eab903683858e28a058fbfd5e63a1165d019bebc7ca07633baaf 11970
curl_8.13.0-4_amd64.buildinfo
Files:
663f50b250cb115a3c080425cdd42500 3231 web optional curl_8.13.0-4.dsc
132968aee34d3571ca1801ef5b77988e 54724 web optional curl_8.13.0-4.debian.tar.xz
36f5af4054b683f81b31b921700ebd97 11970 web optional
curl_8.13.0-4_amd64.buildinfo
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEBdtqg34QX0sdAsVfu6n6rcz7RwcFAmgJctMACgkQu6n6rcz7
Rwf3yw//cgOP+7mFdD6fUkeTcei8ccK41mAoNUL6/XnEaSAyfdLOSs6nbUP6fn3d
4706f3kFxBzMNqpXTtuzod4ZXHW7onW0cvU7KPuZDCgd0+bg92S+amQ0yEFdbnAY
0WY+UOnzVlR+5lyZDs2hm4AoddXeYwLkZn8H4Nkbr9pho9VW5N/0eedrFaCAS/7N
wWmaWRUhTxv6BlhkTzRT0RyXBEF2G2jxhOFlUlEKXyc3NFrt4fNaOTFE8MXGfFKx
lBUW1tZX9hxB8ZDXqzQgicgsFEmfB8MI4FBA8mhX7/StJJWgUZvgn20YjfXnv6su
gMUI9Zvw/WNKvGn6g4RK86KubjO4rLVJdDHCXQW+935lijbOeDi/aAjFNtbpa3oD
R2oA6uHVVDc2VO2kix8vIOmFmJric/aUMc+P/2g9rH5ytcv5fpcNf0EI0IFjzQL8
QWEgaobVoyQ82BFDHzoy4tt6l3PrX1wBOoLyw4B+i33HMS7BWZSRCo8AETBQBTDk
ANzx9b2RdAIPf46NmPdhiEaGaAt1J6NloyUnF9taOtS9mZSwGt7NjQOEZOwlqu3s
UmHFLXIm/I9MYX34CDjjyeiXXuPFczR1QItrFD6F2e0C/33PxW9NvMme/eNU1d2R
uKZi5UZhZy2vmutw2MkM2JarM6Df8atA1jhfpn7eYIVC52qTLj0=
=7f0v
-----END PGP SIGNATURE-----
pgpUDLODURWgi.pgp
Description: PGP signature
--- End Message ---
