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

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 1967 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  f5d8aeebaf336c979d256c2fff83d1c1784b1495 (commit)
      from  a925ec2db4db4533f8fed032075ffffb0b29de3e (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 f5d8aeebaf336c979d256c2fff83d1c1784b1495
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Mar 11 10:53:53 2012 +0100

    openl2tp: Fix build by removing -Werror and fixing installation of plugins.

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

Summary of changes:
 openl2tp/openl2tp.nm |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/openl2tp/openl2tp.nm b/openl2tp/openl2tp.nm
index 2400349..354edb2 100644
--- a/openl2tp/openl2tp.nm
+++ b/openl2tp/openl2tp.nm
@@ -5,7 +5,7 @@
 
 name       = openl2tp
 version    = 1.7
-release    = 1
+release    = 2
 
 groups     = Networking/PPP
 url        = http://www.openl2tp.org/
@@ -36,10 +36,13 @@ build
 
 	prepare_cmds
 		sed -e "s/-lfl/&_pic/g" -i Makefile
+
+		# Remove -Werror from all makefiles.
+		find . -name Makefile | xargs sed -i -e "s/-Werror//g"
 	end
 
 	build
-		make OPT_CFLAGS="%{CFLAGS}" \
+		make OPT_CFLAGS="%{CFLAGS}" ARCH="%{DISTRO_ARCH}" \
 			KERNEL_SRCDIR="/usr" PPPD_VERSION="2.4.5"
 	end
 
@@ -49,7 +52,7 @@ build
 #endef
 
 	install
-		make install DESTDIR=%{BUILDROOT} \
+		make install DESTDIR=%{BUILDROOT} ARCH="%{DISTRO_ARCH}" \
 			KERNEL_SRCDIR="/usr" PPPD_VERSION="2.4.5"
 	end
 end


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