Skip to Content.
Please activate JavaScript in your web browser
List archive
Re: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (9c0d2de7afb92b98d1c3abaea45344fc05ba9df9)
Chronological
Thread
<
Chronological
>
<
Thread
>
From
: Ladislav Hagara <ladislav.hagara AT unob.cz>
To
: Eric Sandall <eric AT sandall.us>
Cc
: sm-commit AT lists.ibiblio.org
Subject
: Re: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (9c0d2de7afb92b98d1c3abaea45344fc05ba9df9)
Date
: Mon, 26 Aug 2013 17:55:51 +0200
>
> GIT changes to master grimoire by Ladislav Hagara <hgr AT vabo.cz>:
>
>
>
> crypto/nss/BUILD | 4 ++++
>
> crypto/nss/HISTORY | 3 +++
>
> crypto/nss/INSTALL | 4 ++++
>
> 3 files changed, 11 insertions(+)
>
>
>
> New commits:
>
> commit 9c0d2de7afb92b98d1c3abaea45344fc05ba9df9
>
> Author: Ladislav Hagara <hgr AT vabo.cz>
>
> Commit: Ladislav Hagara <hgr AT vabo.cz>
>
>
>
> nss: fixed for DEFAULT branch
>
>
>
> diff --git a/crypto/nss/BUILD b/crypto/nss/BUILD
>
> index a0b9b1a..dd7249c 100755
>
> --- a/crypto/nss/BUILD
>
> +++ b/crypto/nss/BUILD
>
> @@ -1,3 +1,7 @@
>
> +if [ "$NSS_BRANCH" == "DEFAULT" ]; then
>
> + NSS_BRANCH=3.15
>
> +fi &&
>
> +
>
> MAKE_OPTS="BUILD_OPT=1 NSS_USE_SYSTEM_SQLITE=1 NSS_ENABLE_ECC=1" &&
>
>
>
> persistent_add MAKE_OPTS &&
>
> diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY
>
> index e10bb31..a23edb3 100644
>
> --- a/crypto/nss/HISTORY
>
> +++ b/crypto/nss/HISTORY
>
> @@ -1,3 +1,6 @@
>
> +2013-08-26 Ladislav Hagara <hgr AT vabo.cz>
>
> + * BUILD, INSTALL: fixed for DEFAULT branch
>
> +
>
> 2013-08-24 Remko van der Vossen <wich AT sourcemage.org>
>
> * DETAILS, DEPENDS, PREPARE, PRE_BUILD, BUILD, INSTALL,
>
> SUB_DEPENDS, PRE_SUB_DEPENDS, nss-3.15.1-standalone-2.patch:
>
> diff --git a/crypto/nss/INSTALL b/crypto/nss/INSTALL
>
> index 704dd64..9e14711 100755
>
> --- a/crypto/nss/INSTALL
>
> +++ b/crypto/nss/INSTALL
>
> @@ -1,3 +1,7 @@
>
> +if [ "$NSS_BRANCH" == "DEFAULT" ]; then
>
> + NSS_BRANCH=3.15
>
> +fi &&
>
> +
>
> if [[ $NSS_BRANCH == "3.15" ]]; then
>
> cd $SOURCE_DIRECTORY/dist
>
> else
>
>
Shouldn't PREPARE take care of NSS_BRANCH for all files?
>
>
-sandalle
>
.
If in PREPARE I choose DEFAULT then in DETAILS NSS_BRANCH is set to
3.15. In BUILD and INSTALL NSS_BRANCH is DEFAULT again.
Imho, nss 3.13-3.14-3.15 are compatible, we can remove branches in nss.
Ladislav Hagara
[SM-Commit] GIT changes to master grimoire by Ladislav Hagara (9c0d2de7afb92b98d1c3abaea45344fc05ba9df9)
,
Ladislav Hagara, 08/26/2013
Re: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (9c0d2de7afb92b98d1c3abaea45344fc05ba9df9)
,
Eric Sandall, 08/26/2013
Re: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (9c0d2de7afb92b98d1c3abaea45344fc05ba9df9)
,
Ladislav Hagara, 08/26/2013
Re: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (9c0d2de7afb92b98d1c3abaea45344fc05ba9df9)
,
Remko van der Vossen, 08/26/2013
Archive powered by
MHonArc 2.6.24
.