From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lo.gmane.org ([80.91.229.12]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1Q2U5J-0008TJ-OZ for openembedded-devel@lists.openembedded.org; Wed, 23 Mar 2011 20:51:13 +0100 Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1Q2U3W-0005t7-5T for openembedded-devel@lists.openembedded.org; Wed, 23 Mar 2011 20:49:22 +0100 Received: from ip545070eb.adsl-surfen.hetnet.nl ([84.80.112.235]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 23 Mar 2011 20:49:22 +0100 Received: from koen by ip545070eb.adsl-surfen.hetnet.nl with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 23 Mar 2011 20:49:22 +0100 X-Injected-Via-Gmane: http://gmane.org/ To: openembedded-devel@lists.openembedded.org From: Koen Kooi Date: Wed, 23 Mar 2011 20:49:06 +0100 Message-ID: References: <20110323162552.GH3418@jama.jama.net> <1300899470-10514-1-git-send-email-Martin.Jansa@gmail.com> Mime-Version: 1.0 X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: ip545070eb.adsl-surfen.hetnet.nl User-Agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.1.16) Gecko/20101127 Shredder/3.0.11pre In-Reply-To: <1300899470-10514-1-git-send-email-Martin.Jansa@gmail.com> X-Enigmail-Version: 1.0.1 Subject: Re: [PATCH 1/2] libnl-1.1: rename to libnl1 and build only static lib X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Mar 2011 19:51:13 -0000 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Can you regenerate this on top of .dev? I couldn't get it to apply, even after renaming files -> libnl-1.1 On 23-03-11 17:57, Martin Jansa wrote: > * static lib is enough to build nm and shouldn't conflict with libnl2 > * this makes special case from libnl1 instead libnl2 > > Signed-off-by: Martin Jansa > --- > .../libnl-1.1/dont-link-libnl-from-sysroot.patch | 26 ------- > recipes/libnl/libnl-1.1/fix-includes.patch | 13 --- > recipes/libnl/libnl-1.1/local-includes.patch | 12 --- > recipes/libnl/libnl-1.1/netlink-local-fix.patch | 12 --- > recipes/libnl/libnl-1.1/respect-ldflags.patch | 12 --- > .../libnl/libnl1-1.1/build.only.static.lib.patch | 79 ++++++++++++++++++++ > .../libnl1-1.1/dont-link-libnl-from-sysroot.patch | 26 +++++++ > recipes/libnl/libnl1-1.1/fix-includes.patch | 13 +++ > recipes/libnl/libnl1-1.1/local-includes.patch | 12 +++ > recipes/libnl/libnl1-1.1/netlink-local-fix.patch | 12 +++ > recipes/libnl/libnl1-1.1/respect-ldflags.patch | 12 +++ > recipes/libnl/libnl1_1.1.bb | 22 ++++++ > recipes/libnl/libnl_1.1.bb | 17 ---- > 13 files changed, 176 insertions(+), 92 deletions(-) > delete mode 100644 recipes/libnl/libnl-1.1/dont-link-libnl-from-sysroot.patch > delete mode 100644 recipes/libnl/libnl-1.1/fix-includes.patch > delete mode 100644 recipes/libnl/libnl-1.1/local-includes.patch > delete mode 100644 recipes/libnl/libnl-1.1/netlink-local-fix.patch > delete mode 100644 recipes/libnl/libnl-1.1/respect-ldflags.patch > create mode 100644 recipes/libnl/libnl1-1.1/build.only.static.lib.patch > create mode 100644 recipes/libnl/libnl1-1.1/dont-link-libnl-from-sysroot.patch > create mode 100644 recipes/libnl/libnl1-1.1/fix-includes.patch > create mode 100644 recipes/libnl/libnl1-1.1/local-includes.patch > create mode 100644 recipes/libnl/libnl1-1.1/netlink-local-fix.patch > create mode 100644 recipes/libnl/libnl1-1.1/respect-ldflags.patch > create mode 100644 recipes/libnl/libnl1_1.1.bb > delete mode 100644 recipes/libnl/libnl_1.1.bb > > diff --git a/recipes/libnl/libnl-1.1/dont-link-libnl-from-sysroot.patch b/recipes/libnl/libnl-1.1/dont-link-libnl-from-sysroot.patch > deleted file mode 100644 > index beb6361..0000000 > --- a/recipes/libnl/libnl-1.1/dont-link-libnl-from-sysroot.patch > +++ /dev/null > @@ -1,26 +0,0 @@ > -Index: libnl-1.1/src/Makefile > -=================================================================== > ---- libnl-1.1.orig/src/Makefile 2008-01-14 07:48:45.000000000 -0800 > -+++ libnl-1.1/src/Makefile 2010-09-22 14:58:46.820826001 -0700 > -@@ -13,7 +13,7 @@ ifeq ($(shell [ ! -r ../Makefile.opts ] > - include ../Makefile.opts > - endif > - > --LDFLAGS += -L../lib -lnl utils.o > -+LDFLAGS += ../lib/libnl.so utils.o > - CIN := $(wildcard nl-*.c) $(wildcard genl-*.c) $(wildcard nf-*.c) > - TOOLS := $(CIN:%.c=%) > - > -Index: libnl-1.1/tests/Makefile > -=================================================================== > ---- libnl-1.1.orig/tests/Makefile 2008-01-14 07:48:45.000000000 -0800 > -+++ libnl-1.1/tests/Makefile 2010-09-22 14:58:46.820826001 -0700 > -@@ -13,7 +13,7 @@ ifeq ($(shell [ ! -r ../Makefile.opts ] > - include ../Makefile.opts > - endif > - > --LDFLAGS += -L../lib -lnl ../src/utils.o > -+LDFLAGS += ../lib/libnl.so ../src/utils.o > - CIN := $(wildcard test-*.c) > - TOOLS := $(CIN:%.c=%) > - > diff --git a/recipes/libnl/libnl-1.1/fix-includes.patch b/recipes/libnl/libnl-1.1/fix-includes.patch > deleted file mode 100644 > index b172fd2..0000000 > --- a/recipes/libnl/libnl-1.1/fix-includes.patch > +++ /dev/null > @@ -1,13 +0,0 @@ > -diff -ruN libnl-1.1/lib/route/link/vlan.c libnl-1.1-new/lib/route/link/vlan.c > ---- libnl-1.1/lib/route/link/vlan.c 2008-01-14 18:48:45.000000000 +0300 > -+++ libnl-1.1-new/lib/route/link/vlan.c 2009-01-30 10:55:09.000000000 +0300 > -@@ -26,7 +26,9 @@ > - #include > - #include > - > -+#ifndef VLAN_FLAG_REORDER_HDR > - #include > -+#endif > - > - /** @cond SKIP */ > - #define VLAN_HAS_ID (1<<0) > diff --git a/recipes/libnl/libnl-1.1/local-includes.patch b/recipes/libnl/libnl-1.1/local-includes.patch > deleted file mode 100644 > index 85659db..0000000 > --- a/recipes/libnl/libnl-1.1/local-includes.patch > +++ /dev/null > @@ -1,12 +0,0 @@ > -diff -urN libnl-1.1.orig/Makefile.opts.in libnl-1.1/Makefile.opts.in > ---- libnl-1.1.orig/Makefile.opts.in 2008-01-14 15:48:45.000000000 +0000 > -+++ libnl-1.1/Makefile.opts.in 2009-04-06 10:20:40.000000000 +0000 > -@@ -10,7 +10,7 @@ > - # > - > - CC := @CC@ > --CFLAGS := @CFLAGS@ > -+CFLAGS := -I./include -I. -I../include @CFLAGS@ > - LDFLAGS := @LDFLAGS@ > - CPPFLAGS := @CPPFLAGS@ > - PACKAGE_NAME := @PACKAGE_NAME@ > diff --git a/recipes/libnl/libnl-1.1/netlink-local-fix.patch b/recipes/libnl/libnl-1.1/netlink-local-fix.patch > deleted file mode 100644 > index 51c6736..0000000 > --- a/recipes/libnl/libnl-1.1/netlink-local-fix.patch > +++ /dev/null > @@ -1,12 +0,0 @@ > -Index: libnl-1.1/include/netlink-local.h > -=================================================================== > ---- libnl-1.1.orig/include/netlink-local.h 2009-06-18 15:28:32.614209645 +0400 > -+++ libnl-1.1/include/netlink-local.h 2009-06-18 15:28:44.094190518 +0400 > -@@ -26,6 +26,7 @@ > - #include > - #include > - #include > -+#include > - > - #include > - #include > diff --git a/recipes/libnl/libnl-1.1/respect-ldflags.patch b/recipes/libnl/libnl-1.1/respect-ldflags.patch > deleted file mode 100644 > index ba97dc6..0000000 > --- a/recipes/libnl/libnl-1.1/respect-ldflags.patch > +++ /dev/null > @@ -1,12 +0,0 @@ > -diff -urN libnl-1.1.orig/lib/Makefile libnl-1.1/lib/Makefile > ---- libnl-1.1.orig/lib/Makefile 2008-01-14 15:48:45.000000000 +0000 > -+++ libnl-1.1/lib/Makefile 2009-04-06 10:16:21.000000000 +0000 > -@@ -48,7 +48,7 @@ > - > - $(OUT_SLIB): ../Makefile.opts $(OBJ) > - @echo " LD $(OUT_SLIB)"; \ > -- $(CC) -shared -Wl,-soname,libnl.so.1 -o $(OUT_SLIB) $(OBJ) $(LIBNL_LIB) -lc > -+ $(CC) $(LDFLAGS) -shared -Wl,-soname,libnl.so.1 -o $(OUT_SLIB) $(OBJ) $(LIBNL_LIB) -lc > - @echo " LN $(OUT_SLIB) $(LN1_SLIB)"; \ > - rm -f $(LN1_SLIB) ; $(LN) -s $(OUT_SLIB) $(LN1_SLIB) > - @echo " LN $(LN1_SLIB) $(LN_SLIB)"; \ > diff --git a/recipes/libnl/libnl1-1.1/build.only.static.lib.patch b/recipes/libnl/libnl1-1.1/build.only.static.lib.patch > new file mode 100644 > index 0000000..770a392 > --- /dev/null > +++ b/recipes/libnl/libnl1-1.1/build.only.static.lib.patch > @@ -0,0 +1,79 @@ > +diff -uNr libnl-1.1.orig//lib/Makefile libnl-1.1/lib/Makefile > +--- libnl-1.1.orig//lib/Makefile 2011-03-23 15:50:32.310534329 +0100 > ++++ libnl-1.1/lib/Makefile 2011-03-23 15:50:43.926534326 +0100 > +@@ -33,18 +33,24 @@ > + DEPS := $(CIN:%.c=%.d) > + OBJ := $(CIN:%.c=%.o) > + CFLAGS += -fPIC > ++OUT_LIB := $(PACKAGE_NAME)1.a > + OUT_SLIB := $(PACKAGE_NAME).so.$(PACKAGE_VERSION) > + LN_SLIB := $(PACKAGE_NAME).so > + LN1_SLIB := $(LN_SLIB).1 > + > + export > + > +-.PHONY: all clean install librtn.a $(OUT_SLIB) > ++.PHONY: all clean install librtn.a $(OUT_SLIB) $(OUT_LIB) > + > + > + all: > +- @echo " MAKE $(OUT_SLIB)"; \ > +- $(MAKE) $(OUT_SLIB) > ++ @echo " MAKE $(OUT_LIB)"; \ > ++ $(MAKE) $(OUT_LIB) > ++ > ++$(OUT_LIB): ../Makefile.opts $(OBJ) > ++ @echo " LD $(OUT_LIB)"; \ > ++ echo $(AR) rs $(OUT_LIB) $(OBJ) > ++ $(AR) rs $(OUT_LIB) $(OBJ) > + > + $(OUT_SLIB): ../Makefile.opts $(OBJ) > + @echo " LD $(OUT_SLIB)"; \ > +@@ -56,8 +62,8 @@ > + > + clean: > + @echo " CLEAN lib"; \ > +- $(RM) -f $(OBJ) $(OUT_SLIB) $(LN_SLIB) $(LN1_SLIB); \ > +- $(RM) -f $(DEPS) $(OUT_SLIB) $(LN_SLIB) $(LN1_SLIB) > ++ $(RM) -f $(OBJ) $(OUT_SLIB) $(OUT_LIB) $(LN_SLIB) $(LN1_SLIB); \ > ++ $(RM) -f $(DEPS) $(OUT_SLIB) $(OUT_LIB) $(LN_SLIB) $(LN1_SLIB) > + > + distclean: > + @echo " DISTCLEAN lib"; \ > +@@ -65,11 +71,7 @@ > + > + install: > +- mkdir -p $(DESTDIR)$(libdir)/ > +- install -m 0644 $(OUT_SLIB) $(DESTDIR)$(libdir) > +- rm -f $(DESTDIR)$(libdir)/$(LN1_SLIB) > +- $(LN) -s $(OUT_SLIB) $(DESTDIR)$(libdir)/$(LN1_SLIB) > +- rm -f $(DESTDIR)$(libdir)/$(LN_SLIB) > +- $(LN) -s $(LN1_SLIB) $(DESTDIR)$(libdir)/$(LN_SLIB) > ++ mkdir -p $(DESTDIR)$(libdir)/libnl1 > ++ install -m 0644 $(OUT_LIB) $(DESTDIR)$(libdir)/libnl1 > + > + $(DEPS): ../Makefile.opts > + > +diff -uNr libnl-1.1.orig//Makefile libnl-1.1/Makefile > +--- libnl-1.1.orig//Makefile 2008-01-14 16:48:45.000000000 +0100 > ++++ libnl-1.1/Makefile 2011-03-23 16:53:12.438533242 +0100 > +@@ -13,7 +13,7 @@ > + include Makefile.opts > + endif > + > +-SUBDIRS := lib include doc src tests > ++SUBDIRS := lib include doc > + .PHONY: all clean distclean install gendoc $(SUBDIRS) > + > + all: Makefile.opts > +diff -uNr libnl-1.1.orig//libnl-1.pc.in libnl-1.1/libnl-1.pc.in > +--- libnl-1.1.orig//libnl-1.pc.in 2008-01-14 16:48:45.000000000 +0100 > ++++ libnl-1.1/libnl-1.pc.in 2011-03-23 16:57:18.084533174 +0100 > +@@ -6,5 +6,5 @@ > + Name: libnl > + Description: Convenience library for netlink sockets > + Version: @PACKAGE_VERSION@ > +-Libs: -L${libdir} -lnl > +-Cflags: > ++Libs: -L${libdir}/libnl1 -lnl1 -lm > ++Cflags: -I${includedir}/libnl1 > diff --git a/recipes/libnl/libnl1-1.1/dont-link-libnl-from-sysroot.patch b/recipes/libnl/libnl1-1.1/dont-link-libnl-from-sysroot.patch > new file mode 100644 > index 0000000..beb6361 > --- /dev/null > +++ b/recipes/libnl/libnl1-1.1/dont-link-libnl-from-sysroot.patch > @@ -0,0 +1,26 @@ > +Index: libnl-1.1/src/Makefile > +=================================================================== > +--- libnl-1.1.orig/src/Makefile 2008-01-14 07:48:45.000000000 -0800 > ++++ libnl-1.1/src/Makefile 2010-09-22 14:58:46.820826001 -0700 > +@@ -13,7 +13,7 @@ ifeq ($(shell [ ! -r ../Makefile.opts ] > + include ../Makefile.opts > + endif > + > +-LDFLAGS += -L../lib -lnl utils.o > ++LDFLAGS += ../lib/libnl.so utils.o > + CIN := $(wildcard nl-*.c) $(wildcard genl-*.c) $(wildcard nf-*.c) > + TOOLS := $(CIN:%.c=%) > + > +Index: libnl-1.1/tests/Makefile > +=================================================================== > +--- libnl-1.1.orig/tests/Makefile 2008-01-14 07:48:45.000000000 -0800 > ++++ libnl-1.1/tests/Makefile 2010-09-22 14:58:46.820826001 -0700 > +@@ -13,7 +13,7 @@ ifeq ($(shell [ ! -r ../Makefile.opts ] > + include ../Makefile.opts > + endif > + > +-LDFLAGS += -L../lib -lnl ../src/utils.o > ++LDFLAGS += ../lib/libnl.so ../src/utils.o > + CIN := $(wildcard test-*.c) > + TOOLS := $(CIN:%.c=%) > + > diff --git a/recipes/libnl/libnl1-1.1/fix-includes.patch b/recipes/libnl/libnl1-1.1/fix-includes.patch > new file mode 100644 > index 0000000..b172fd2 > --- /dev/null > +++ b/recipes/libnl/libnl1-1.1/fix-includes.patch > @@ -0,0 +1,13 @@ > +diff -ruN libnl-1.1/lib/route/link/vlan.c libnl-1.1-new/lib/route/link/vlan.c > +--- libnl-1.1/lib/route/link/vlan.c 2008-01-14 18:48:45.000000000 +0300 > ++++ libnl-1.1-new/lib/route/link/vlan.c 2009-01-30 10:55:09.000000000 +0300 > +@@ -26,7 +26,9 @@ > + #include > + #include > + > ++#ifndef VLAN_FLAG_REORDER_HDR > + #include > ++#endif > + > + /** @cond SKIP */ > + #define VLAN_HAS_ID (1<<0) > diff --git a/recipes/libnl/libnl1-1.1/local-includes.patch b/recipes/libnl/libnl1-1.1/local-includes.patch > new file mode 100644 > index 0000000..85659db > --- /dev/null > +++ b/recipes/libnl/libnl1-1.1/local-includes.patch > @@ -0,0 +1,12 @@ > +diff -urN libnl-1.1.orig/Makefile.opts.in libnl-1.1/Makefile.opts.in > +--- libnl-1.1.orig/Makefile.opts.in 2008-01-14 15:48:45.000000000 +0000 > ++++ libnl-1.1/Makefile.opts.in 2009-04-06 10:20:40.000000000 +0000 > +@@ -10,7 +10,7 @@ > + # > + > + CC := @CC@ > +-CFLAGS := @CFLAGS@ > ++CFLAGS := -I./include -I. -I../include @CFLAGS@ > + LDFLAGS := @LDFLAGS@ > + CPPFLAGS := @CPPFLAGS@ > + PACKAGE_NAME := @PACKAGE_NAME@ > diff --git a/recipes/libnl/libnl1-1.1/netlink-local-fix.patch b/recipes/libnl/libnl1-1.1/netlink-local-fix.patch > new file mode 100644 > index 0000000..51c6736 > --- /dev/null > +++ b/recipes/libnl/libnl1-1.1/netlink-local-fix.patch > @@ -0,0 +1,12 @@ > +Index: libnl-1.1/include/netlink-local.h > +=================================================================== > +--- libnl-1.1.orig/include/netlink-local.h 2009-06-18 15:28:32.614209645 +0400 > ++++ libnl-1.1/include/netlink-local.h 2009-06-18 15:28:44.094190518 +0400 > +@@ -26,6 +26,7 @@ > + #include > + #include > + #include > ++#include > + > + #include > + #include > diff --git a/recipes/libnl/libnl1-1.1/respect-ldflags.patch b/recipes/libnl/libnl1-1.1/respect-ldflags.patch > new file mode 100644 > index 0000000..ba97dc6 > --- /dev/null > +++ b/recipes/libnl/libnl1-1.1/respect-ldflags.patch > @@ -0,0 +1,12 @@ > +diff -urN libnl-1.1.orig/lib/Makefile libnl-1.1/lib/Makefile > +--- libnl-1.1.orig/lib/Makefile 2008-01-14 15:48:45.000000000 +0000 > ++++ libnl-1.1/lib/Makefile 2009-04-06 10:16:21.000000000 +0000 > +@@ -48,7 +48,7 @@ > + > + $(OUT_SLIB): ../Makefile.opts $(OBJ) > + @echo " LD $(OUT_SLIB)"; \ > +- $(CC) -shared -Wl,-soname,libnl.so.1 -o $(OUT_SLIB) $(OBJ) $(LIBNL_LIB) -lc > ++ $(CC) $(LDFLAGS) -shared -Wl,-soname,libnl.so.1 -o $(OUT_SLIB) $(OBJ) $(LIBNL_LIB) -lc > + @echo " LN $(OUT_SLIB) $(LN1_SLIB)"; \ > + rm -f $(LN1_SLIB) ; $(LN) -s $(OUT_SLIB) $(LN1_SLIB) > + @echo " LN $(LN1_SLIB) $(LN_SLIB)"; \ > diff --git a/recipes/libnl/libnl1_1.1.bb b/recipes/libnl/libnl1_1.1.bb > new file mode 100644 > index 0000000..3569867 > --- /dev/null > +++ b/recipes/libnl/libnl1_1.1.bb > @@ -0,0 +1,22 @@ > +require libnl.inc > + > +PR = "${INC_PR}.0" > + > +# move it to extra subdirectory > +includedir = "${prefix}/include/libnl1" > + > +CFLAGS += '-DVLAN_FLAG_REORDER_HDR=1' > + > +SRC_URI = "\ > + http://www.infradead.org/~tgr/libnl/files/libnl-${PV}.tar.gz \ > + file://local-includes.patch \ > + file://fix-includes.patch \ > + file://respect-ldflags.patch \ > + file://netlink-local-fix.patch \ > + file://dont-link-libnl-from-sysroot.patch \ > + file://build.only.static.lib.patch \ > +" > +S = "${WORKDIR}/libnl-${PV}" > + > +SRC_URI[md5sum] = "ae970ccd9144e132b68664f98e7ceeb1" > +SRC_URI[sha256sum] = "35cea4cfb6cd8af0cafa0f34fff81def5a1f193b8b8384299b4b21883e22edc3" > diff --git a/recipes/libnl/libnl_1.1.bb b/recipes/libnl/libnl_1.1.bb > deleted file mode 100644 > index d9f250e..0000000 > --- a/recipes/libnl/libnl_1.1.bb > +++ /dev/null > @@ -1,17 +0,0 @@ > -require libnl.inc > - > -PR = "${INC_PR}.0" > - > -CFLAGS += '-DVLAN_FLAG_REORDER_HDR=1' > - > -SRC_URI = "\ > - http://www.infradead.org/~tgr/libnl/files/libnl-${PV}.tar.gz \ > - file://local-includes.patch \ > - file://fix-includes.patch \ > - file://respect-ldflags.patch \ > - file://netlink-local-fix.patch \ > - file://dont-link-libnl-from-sysroot.patch \ > -" > - > -SRC_URI[md5sum] = "ae970ccd9144e132b68664f98e7ceeb1" > -SRC_URI[sha256sum] = "35cea4cfb6cd8af0cafa0f34fff81def5a1f193b8b8384299b4b21883e22edc3" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (Darwin) iD8DBQFNik6yMkyGM64RGpERAmGaAJ4hgELxVhOiPwxLdFdvQ8NLxocuCACeIuyH XZWggTYtFEhserJNsOLOhqU= =7A9C -----END PGP SIGNATURE-----