[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 1a7bf898c9ae964f6c82dbba2d20369149fc41a1

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 1a7bf898c9ae964f6c82dbba2d20369149fc41a1

[git]

[-- Attachment #1: Type: text/plain, Size: 2341 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  1a7bf898c9ae964f6c82dbba2d20369149fc41a1 (commit)
       via  89fb3b0ee26bacde85005610e43d288a3836e3f9 (commit)
      from  82d1bf900d8724f110b3a6846e6c757b182f5816 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1a7bf898c9ae964f6c82dbba2d20369149fc41a1
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Feb 5 21:05:05 2012 -0500

    gcc: Fix typo on armv7hl configuration condition.

commit 89fb3b0ee26bacde85005610e43d288a3836e3f9
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Feb 5 21:04:18 2012 -0500

    openssl: Make package compilable on armv7hl.

-----------------------------------------------------------------------

Summary of changes:
 gcc/gcc.nm         |    4 ++--
 openssl/openssl.nm |    6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/gcc/gcc.nm b/gcc/gcc.nm
index 845ad54..05e33c1 100644
--- a/gcc/gcc.nm
+++ b/gcc/gcc.nm
@@ -8,7 +8,7 @@ build_cloog_ppl = 1
 
 name       = gcc
 version    = 4.6.2
-release    = 11
+release    = 12
 
 maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
 groups     = Development/Compilers
@@ -93,7 +93,7 @@ build
 		configure_options += --with-float=soft
 	end
 
-	if "${DISTRO_ARCH}" == "armv7hl"
+	if "%{DISTRO_ARCH}" == "armv7hl"
 		make_bootstrap = bootstrap
 
 		configure_options += --disable-sjlj-exceptions
diff --git a/openssl/openssl.nm b/openssl/openssl.nm
index f221603..12bf7cb 100644
--- a/openssl/openssl.nm
+++ b/openssl/openssl.nm
@@ -5,7 +5,7 @@
 
 name       = openssl
 version    = 1.0.0g
-release    = 1
+release    = 2
 
 maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
 groups     = System/Libraries
@@ -54,6 +54,10 @@ build
 		ssl_arch = linux-generic32
 	end
 
+	if "%{DISTRO_ARCH}" == "armv7hl"
+		ssl_arch = linux-generic32
+	end
+
 	build
 		./Configure \
 			--prefix=/usr \


hooks/post-receive
--
IPFire 3.x development tree