From e6e51753e73bd70abf3b5f5f6c1d83e617238864 Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Sat, 24 Mar 2007 18:09:47 +0000 Subject: [PATCH] * updated attr (2.4.24 -> 2.4.32-1) git-svn-id: svn://svn.opensde.net/opensde/package/trunk@20564 10447126-35f2-4685-b0cf-6dd780d3921f --- base/attr/attr.desc | 6 +++--- base/attr/no-links.patch | 20 +++++++++++--------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/base/attr/attr.desc b/base/attr/attr.desc index c022b5f22..c4776a111 100644 --- a/base/attr/attr.desc +++ b/base/attr/attr.desc @@ -3,7 +3,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../attr/attr.desc -[COPY] Copyright (C) 2006 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2007 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 1998 - 2003 Clifford Wolf [COPY] @@ -41,7 +41,7 @@ [L] LGPL [S] Stable -[V] 2.4.24 +[V] 2.4.32-1 [P] X -----5---9 140.500 -[D] 1503430840 attr-2.4.24.src.tar.gz ftp://oss.sgi.com/projects/xfs/cmd_tars/ +[D] 1840157894 attr_2.4.32-1.tar.gz ftp://oss.sgi.com/projects/xfs/cmd_tars/ diff --git a/base/attr/no-links.patch b/base/attr/no-links.patch index 96349f367..6011b5d61 100644 --- a/base/attr/no-links.patch +++ b/base/attr/no-links.patch @@ -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/.../attr/no-links.patch +# Filename: package/.../attr/no-links.patch +# Copyright (C) 2007 The OpenSDE Project # Copyright (C) 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -12,33 +13,34 @@ # 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. -# --- T2-COPYRIGHT-NOTE-END --- +# --- SDE-COPYRIGHT-NOTE-END --- Don't create these links, this hurts our .la,.a file handling, but create a normal /lib/libattr.so link. -- jsaw ---- attr-2.4.24/include/buildmacros 2005-10-07 18:51:16.000000000 +0200 -+++ attr-2.4.24-t2/include/buildmacros 2006-01-06 23:15:05.000000000 +0100 -@@ -84,8 +84,8 @@ +--- attr-2.4.32/include/buildmacros.orig 2007-03-14 16:51:02.000000000 +0100 ++++ attr-2.4.32/include/buildmacros 2007-03-14 16:52:20.000000000 +0100 +@@ -56,7 +56,8 @@ cd $(TOPDIR)/$(LIBNAME)/.libs; \ ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ ../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(PKG_LIB_DIR); \ -- test "$(PKG_DISTRIBUTION)" = debian || \ - ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_LIB_DIR) + ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_LIB_DIR); \ + ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR) endif # Libtool thinks the static and shared libs should be in the same dir, so -@@ -102,9 +102,6 @@ +@@ -72,10 +73,7 @@ + ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_DEVLIB_DIR); \ ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \ ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ - ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \ +- ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \ - ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \ - ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \ - ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so ++ ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); else INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC) endif