gnupg: depend on libiconv if appropriate
PATCH 1/3 gnupg: depend on libiconv if appropriate
--- package/gnupg/gnupg.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/gnupg/gnupg.mk +1 -1
@@ -9,7 +9,7 @@ GNUPG_SOURCE = gnupg-$(GNUPG_VERSION).tar.bz2 GNUPG_SITE = ftp://ftp.gnupg.org/gcrypt/gnupg GNUPG_LICENSE = GPLv3+ GNUPG_LICENSE_FILES = COPYING -GNUPG_DEPENDENCIES = zlib ncurses +GNUPG_DEPENDENCIES = zlib ncurses $(if $(BR2_PACKAGE_LIBICONV),libiconv) GNUPG_CONF_ENV = ac_cv_sys_symbol_underscore=no GNUPG_CONF_OPT = --disable-rpath --enable-minimal --disable-regex
Signature · 1 line
1.7.9.5
PATCH 1/3 gnupg: depend on libiconv if appropriate
Bernd Kuhls <[email protected]> wrote in news:BLU0-SMTP112B1A733C43DA19ABF8DF9D9CE0 at phx.gbl:
Quoted 3 lines
(quoted diff) +1
-1-GNUPG_DEPENDENCIES = zlib ncurses +GNUPG_DEPENDENCIES = zlib ncurses $(if$(BR2_PACKAGE_LIBICONV),libiconv)
Hi,
this a follow-up for Thomas? question:
http://article.gmane.org/gmane.comp.lib.uclibc.buildroot/75233
Today I tested the necessity of my patch without a custom uClibc configuration file, only with this defconfig applied to a current git checkout:
BR2_JLEVEL=8
BR2_ENABLE_DEBUG=y
BR2_OPTIMIZE_2=y
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
BR2_PTHREAD_DEBUG=y
# BR2_UCLIBC_INSTALL_UTILS is not set
BR2_BINUTILS_VERSION_2_23_2=y
BR2_GCC_VERSION_4_8_X=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
BR2_PACKAGE_HOST_GDB=y
BR2_PACKAGE_GETTEXT=y
BR2_PACKAGE_LIBICONV=y
BR2_PACKAGE_GNUPG=y
Building these targets in the following order
- toolchain
- libiconv
- gnupg
results in a gpg binary linked to libiconv
$ /home/fli4l/buildroot/output/host/usr/bin/i586-buildroot-linux-uclibc- readelf -a /home/fli4l/buildroot/output/target/usr/bin/gpg | grep NEEDED 0x00000001 (NEEDED) Shared library: [libiconv.so.2] 0x00000001 (NEEDED) Shared library: [libz.so.1] 0x00000001 (NEEDED) Shared library: [libgcc_s.so.1] 0x00000001 (NEEDED) Shared library: [libc.so.0]
Removing
BR2_PACKAGE_GETTEXT=y
BR2_PACKAGE_LIBICONV=y
from defconfig results in this gpg binary:
/home/fli4l/buildroot/output/host/usr/bin/i586-buildroot-linux-uclibc- readelf -a /home/fli4l/buildroot/output/target/usr/bin/gpg | grep NEEDED
0x00000001 (NEEDED) Shared library: [libz.so.1] 0x00000001 (NEEDED) Shared library: [libgcc_s.so.1] 0x00000001 (NEEDED) Shared library: [libc.so.0]
I hope this proves why my patches are necessary.
Regards, Bernd
PATCH 1/3 gnupg: depend on libiconv if appropriate
In reply to Bernd KuhlsQuoted 2 lines · Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
Ideally, the explanation that you put in the follow-up message should be
in the commit log, but OK.
Regards,
Arnout
Quoted 18 lines
--- package/gnupg/gnupg.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)package/gnupg/gnupg.mk +1
-1@@ -9,7 +9,7 @@ GNUPG_SOURCE = gnupg-$(GNUPG_VERSION).tar.bz2 GNUPG_SITE = ftp://ftp.gnupg.org/gcrypt/gnupg GNUPG_LICENSE = GPLv3+ GNUPG_LICENSE_FILES = COPYING -GNUPG_DEPENDENCIES = zlib ncurses +GNUPG_DEPENDENCIES = zlib ncurses $(if $(BR2_PACKAGE_LIBICONV),libiconv) GNUPG_CONF_ENV = ac_cv_sys_symbol_underscore=no GNUPG_CONF_OPT = --disable-rpath --enable-minimal --disable-regex
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 1/3 gnupg: depend on libiconv if appropriate
Quoted 8 lines · Arnout Vandecappelle
Quoted 2 lines · Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>Ideally, the explanation that you put in the follow-up message should be
in the commit log, but OK.
Actually, Bernd, to make our life easier, could you repost your
iconv-related patches (including the one in xorg) with the following inj the commit message:
If iconv is built before this package, this package will link against it; if it is built after this package, it will not be linked against it. To make the build reproducible, make sure that iconv is always built before this package.
(You can replace "this package" with "gnupg" etc. as appropriate, of
course.)
Thanks a lot!
Regards,
Arnout
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 1/3 gnupg: depend on libiconv if appropriate
Quoted 12 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Arnout" == Arnout Vandecappelle <[email protected]> writes:
Quoted 8 lines · Arnout Vandecappelle
Quoted 2 lines · Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>Ideally, the explanation that you put in the follow-up message should be in the commit log, but OK.
Quoted 8 lines
Actually, Bernd, to make our life easier, could you repost your
iconv-related patches (including the one in xorg) with the following inj the commit message:If iconv is built before this package, this package will link against it; if it is built after this package, it will not be linked against it. To make the build reproducible, make sure that iconv is always built before this package.
True. I already applied the gnupg patch (but didn't push it), so I've adjusted the commit message to match.
Bernd, could you resend the other patches with that commit message - Thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/3 gnupg: depend on libiconv if appropriate
In reply to Arnout VandecappelleQuoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Arnout" == Arnout Vandecappelle <[email protected]> writes:
Quoted 2 lines · Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>Ideally, the explanation that you put in the follow-up message should be
in the commit log, but OK.
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard