| Message ID | BLU0-SMTP112B1A733C43DA19ABF8DF9D9CE0@phx.gbl |
|---|---|
| State | Accepted |
| Commit | 1e7602327a318540cb92efd14b8cb092a4ab19bd |
| Headers | show |
On 30/12/13 18:57, Bernd Kuhls wrote: > > Signed-off-by: Bernd Kuhls <berndkuhls@hotmail.com> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Ideally, the explanation that you put in the follow-up message should be in the commit log, but OK. Regards, Arnout > --- > package/gnupg/gnupg.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/gnupg/gnupg.mk b/package/gnupg/gnupg.mk > index 39a37d0..c334ac6 100644 > --- a/package/gnupg/gnupg.mk > +++ b/package/gnupg/gnupg.mk > @@ -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 > >
On 04/02/14 10:59, Arnout Vandecappelle wrote: > On 30/12/13 18:57, Bernd Kuhls wrote: >> >> Signed-off-by: Bernd Kuhls <berndkuhls@hotmail.com> > > Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> > > 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
>>>>> "Arnout" == Arnout Vandecappelle <arnout@mind.be> writes: > On 30/12/13 18:57, Bernd Kuhls wrote: >> >> Signed-off-by: Bernd Kuhls <berndkuhls@hotmail.com> > Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> > Ideally, the explanation that you put in the follow-up message should be > in the commit log, but OK. Committed, thanks.
>>>>> "Arnout" == Arnout Vandecappelle <arnout@mind.be> writes: > On 04/02/14 10:59, Arnout Vandecappelle wrote: >> On 30/12/13 18:57, Bernd Kuhls wrote: >>> >>> Signed-off-by: Bernd Kuhls <berndkuhls@hotmail.com> >> >> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> >> >> 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. 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.
diff --git a/package/gnupg/gnupg.mk b/package/gnupg/gnupg.mk index 39a37d0..c334ac6 100644 --- a/package/gnupg/gnupg.mk +++ b/package/gnupg/gnupg.mk @@ -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
Signed-off-by: Bernd Kuhls <berndkuhls@hotmail.com> --- package/gnupg/gnupg.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)