Browse Source

openl2tp: fixed build by removing '-Werror' through gcc wrapper and by adding a patch to not build test if not explicitely requested

user/karasz/next/updates
Christian Wiese 15 years ago
parent
commit
65c2693fc9
  1. 30
      network/openl2tp/make-test.patch
  2. 4
      network/openl2tp/openl2tp.conf

30
network/openl2tp/make-test.patch

@ -0,0 +1,30 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../openl2tp/make-test.patch
# Copyright (C) 2010 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- openl2tp-1.6/Makefile.orig 2010-08-02 11:48:12.268255575 +0200
+++ openl2tp-1.6/Makefile 2010-08-02 11:50:37.532253637 +0200
@@ -85,7 +85,10 @@
export L2TP_FEATURE_LOCAL_CONF_FILE
export L2TP_FEATURE_LOCAL_STAT_FILE
-SUBDIRS= usl cli plugins pppd test doc
+SUBDIRS= usl cli plugins pppd doc
+ifeq ($(L2TP_TEST),y)
+SUBDIR+= test
+endif
.PHONY: $(SUBDIRS:%=subdir-%)

4
network/openl2tp/openl2tp.conf

@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../openl2tp/openl2tp.conf
# Copyright (C) 2007 The OpenSDE Project
# Copyright (C) 2007 - 2010 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
@ -21,3 +21,5 @@ var_append makeopt ' ' "L2TP_KERNELDIR="
var_append makeopt ' ' "KERNEL_SRCDIR=$root/usr"
makeinstopt="$makeopt install"
var_append CC_WRAPPER_REMOVE " " "-Werror"

Loading…
Cancel
Save