From 4bc48eff422d27fb6811e5c6183bec834a36be6b Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Sun, 13 Mar 2011 12:09:58 +0100 Subject: [PATCH] libarena: Updated (0.3.1 -> 0.3.4) --- develop/libarena/libarena-0.3.4-install.patch | 41 +++++++++++++++++++ develop/libarena/libarena.desc | 6 +-- 2 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 develop/libarena/libarena-0.3.4-install.patch diff --git a/develop/libarena/libarena-0.3.4-install.patch b/develop/libarena/libarena-0.3.4-install.patch new file mode 100644 index 000000000..85ad6e8ca --- /dev/null +++ b/develop/libarena/libarena-0.3.4-install.patch @@ -0,0 +1,41 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../libarena/libarena-0.3.4-install.patch +# Copyright (C) 2011 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 --- + +Description: Running 'make install' fails with the following error message: + +make: Circular /usr/lib/libarena.a <- /usr/lib/libarena.a dependency dropped. + + +--- libarena-0.3.4/src/Rules.mk.orig 2011-03-13 11:59:30.104072238 +0100 ++++ libarena-0.3.4/src/Rules.mk 2011-03-13 12:01:41.692072238 +0100 +@@ -93,14 +93,14 @@ + $(LIBTOOL) --mode=install $(INSTALL_DATA) $(^:.a=.la) $(>:.a=.la) $(@:.a=.la); \ + fi + +-.INTERMEDIATE: -larena ++.INTERMEDIATE: larena + +--larena: $(DESTDIR)$(libdir)/libarena.a $(DESTDIR)$(includedir)/arena/arena.h \ ++larena: $(DESTDIR)$(libdir)/libarena.a $(DESTDIR)$(includedir)/arena/arena.h \ + $(DESTDIR)$(includedir)/arena/pool.h $(DESTDIR)$(includedir)/arena/proto.h \ + $(DESTDIR)$(includedir)/arena/rbits.h $(DESTDIR)$(includedir)/arena/util.h \ + $(DESTDIR)$(includedir)/arena/align.h + +-install: -larena ++install: larena + + + # diff --git a/develop/libarena/libarena.desc b/develop/libarena/libarena.desc index a87be7916..af7c86863 100644 --- a/develop/libarena/libarena.desc +++ b/develop/libarena/libarena.desc @@ -2,7 +2,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../libarena/libarena.desc -[COPY] Copyright (C) 2007 The OpenSDE Project +[COPY] Copyright (C) 2007 - 2011 The OpenSDE Project [COPY] [COPY] More information can be found in the files COPYING and README. [COPY] @@ -28,7 +28,7 @@ [L] MIT [S] Alpha -[V] 0.3.1 +[V] 0.3.4 [P] X -----5---9 149.000 -[D] 1695059254 libarena-0.3.1.tgz http://www.25thandclement.com/~william/projects/releases/ +[D] 2532385735 libarena-0.3.4.tgz http://www.25thandclement.com/~william/projects/releases/