From ade39d0e32680552a3c0b72e30c59c5b11cda106 Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Tue, 20 Mar 2007 01:22:21 +0000 Subject: [PATCH] * hacked iproute2 to be able to compile staticly by disabling tc and genl git-svn-id: svn://svn.opensde.net/opensde/package/trunk@20514 10447126-35f2-4685-b0cf-6dd780d3921f --- network/iproute2/iproute2.conf | 12 ++++++++--- network/iproute2/nodynamic.diff | 36 +++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 network/iproute2/nodynamic.diff diff --git a/network/iproute2/iproute2.conf b/network/iproute2/iproute2.conf index bc4cbd664..662cf9b10 100644 --- a/network/iproute2/iproute2.conf +++ b/network/iproute2/iproute2.conf @@ -1,7 +1,8 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- +# --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# T2 SDE: package/.../iproute2/iproute2.conf +# Filename: package/.../iproute2/iproute2.conf +# Copyright (C) 2007 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf # @@ -11,7 +12,7 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the # GNU General Public License can be found in the file COPYING. -# --- T2-COPYRIGHT-NOTE-END --- +# --- SDE-COPYRIGHT-NOTE-END --- prefix='' set_confopt @@ -30,3 +31,8 @@ hook_add postmake 5 "ipr2_pm" pkginstalled bdb33 && atstage native || \ var_append patchfiles ' ' $confdir/bdb_unavailable.diff + +# FIXME: disabling tc and genl is not the best way of not needed -ldl +if [ "$SDECFG_STATIC" == 1 ]; then + var_append patchfiles ' ' $confdir/nodynamic.diff +fi diff --git a/network/iproute2/nodynamic.diff b/network/iproute2/nodynamic.diff new file mode 100644 index 000000000..902eb72b9 --- /dev/null +++ b/network/iproute2/nodynamic.diff @@ -0,0 +1,36 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../iproute2/nodynamic.diff +# Copyright (C) 2007 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 --- + +--- ./Makefile.orig 2007-03-19 21:04:47.000000000 -0400 ++++ ./Makefile 2007-03-19 21:09:31.000000000 -0400 +@@ -27,7 +27,7 @@ + + LDLIBS += -L../lib -lnetlink ../lib/libutil.a + +-SUBDIRS=lib ip tc misc netem genl ++SUBDIRS=lib ip misc netem + + LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a + +@@ -43,8 +43,6 @@ + install -m 0755 -d $(DESTDIR)$(CONFDIR) + install -m 0755 -d $(DESTDIR)$(DOCDIR)/examples + install -m 0755 -d $(DESTDIR)$(DOCDIR)/examples/diffserv +- install -m 0644 README.iproute2+tc $(shell find examples -maxdepth 1 -type f) \ +- $(DESTDIR)$(DOCDIR)/examples + install -m 0644 $(shell find examples/diffserv -maxdepth 1 -type f) \ + $(DESTDIR)$(DOCDIR)/examples/diffserv + @for i in $(SUBDIRS) doc; do $(MAKE) -C $$i install; done