From ca67e6442fb2afc63f99aa6580468cc09153e912 Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Mon, 25 Jun 2007 14:25:17 +0000 Subject: [PATCH] * updated attr (2.4.32-1 -> 2.4.38-1) git-svn-id: svn://svn.opensde.net/opensde/package/trunk@21440 10447126-35f2-4685-b0cf-6dd780d3921f --- base/attr/attr.conf | 13 ++++++++----- base/attr/attr.desc | 6 +++--- base/attr/destdir.patch | 39 +++++++++++++++++++++++++++++++++++++ base/attr/libtool_tag.patch | 31 +++++++++++++++++++++++++++++ 4 files changed, 81 insertions(+), 8 deletions(-) create mode 100644 base/attr/destdir.patch create mode 100644 base/attr/libtool_tag.patch diff --git a/base/attr/attr.conf b/base/attr/attr.conf index 99752b4b6..a0962c67d 100644 --- a/base/attr/attr.conf +++ b/base/attr/attr.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/.../attr/attr.conf +# Filename: package/.../attr/attr.conf +# Copyright (C) 2007 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf # @@ -11,10 +12,10 @@ # 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 --- # adjust paths -libdir="$root/${libdir##*/}" +libdir="/${libdir##*/}" # also install headers and libs makeinstopt="$makeinstopt install-lib install-dev" @@ -29,5 +30,7 @@ var_append confopt ' ' "--enable-shared" var_append flistrfilter '|' ".*:.*/man/.*" # install missing .la file -hook_add inmake 9 "cp -av libattr/libattr.la $libdir/; sed -i 's,installed=no,installed=yes,' $libdir/libattr.la" +hook_add inmake 9 "cp -av libattr/libattr.la $root$libdir/; sed -i 's,installed=no,installed=yes,' $root$libdir/libattr.la" +#pkgprefix -t libtool +#var_append configcache ' ' "ac_cv_path_LIBTOOL=$root$( pkgprefix bindir libtool )/libtool" diff --git a/base/attr/attr.desc b/base/attr/attr.desc index c4776a111..c31bcb59f 100644 --- a/base/attr/attr.desc +++ b/base/attr/attr.desc @@ -41,7 +41,7 @@ [L] LGPL [S] Stable -[V] 2.4.32-1 -[P] X -----5---9 140.500 +[V] 2.4.38-1 +[P] X -1---5---9 140.500 -[D] 1840157894 attr_2.4.32-1.tar.gz ftp://oss.sgi.com/projects/xfs/cmd_tars/ +[D] 3139583978 attr_2.4.38-1.tar.gz ftp://oss.sgi.com/projects/xfs/cmd_tars/ diff --git a/base/attr/destdir.patch b/base/attr/destdir.patch new file mode 100644 index 000000000..37be54434 --- /dev/null +++ b/base/attr/destdir.patch @@ -0,0 +1,39 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../attr/destdir.patch +# 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 --- + +--- ./include/builddefs.in.orig 2007-01-25 01:32:46.000000000 -0300 ++++ ./include/builddefs.in 2007-06-25 05:44:53.000000000 -0400 +@@ -27,13 +27,13 @@ + PKG_VERSION = @pkg_version@ + PKG_PLATFORM = @pkg_platform@ + PKG_DISTRIBUTION= @pkg_distribution@ +-PKG_BIN_DIR = @bindir@ +-PKG_SBIN_DIR = @sbindir@ +-PKG_LIB_DIR = @libdir@@libdirsuffix@ +-PKG_DEVLIB_DIR = @libexecdir@@libdirsuffix@ +-PKG_INC_DIR = @includedir@/attr +-PKG_MAN_DIR = @mandir@ +-PKG_DOC_DIR = @datadir@/doc/@pkg_name@ ++PKG_BIN_DIR = $(DESTDIR)@bindir@ ++PKG_SBIN_DIR = $(DESTDIR)@sbindir@ ++PKG_LIB_DIR = $(DESTDIR)@libdir@@libdirsuffix@ ++PKG_DEVLIB_DIR = $(DESTDIR)@libexecdir@@libdirsuffix@ ++PKG_INC_DIR = $(DESTDIR)@includedir@/attr ++PKG_MAN_DIR = $(DESTDIR)@mandir@ ++PKG_DOC_DIR = $(DESTDIR)@datadir@/doc/@pkg_name@ + PKG_LOCALE_DIR = @datadir@/locale + + CC = @cc@ diff --git a/base/attr/libtool_tag.patch b/base/attr/libtool_tag.patch new file mode 100644 index 000000000..bb21d643c --- /dev/null +++ b/base/attr/libtool_tag.patch @@ -0,0 +1,31 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../attr/libtool_tag.patch +# 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 --- + +--- ./include/buildmacros.orig 2007-06-25 05:46:58.000000000 -0400 ++++ ./include/buildmacros 2007-06-25 05:47:18.000000000 -0400 +@@ -41,10 +41,10 @@ + LTOBJECTS = $(OBJECTS:.o=.lo) + LTVERSION = $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) + +-LTLINK = $(LIBTOOL) --mode=link $(CC) ++LTLINK = $(LIBTOOL) --mode=link --tag=gcc $(CC) + LTEXEC = $(LIBTOOL) --mode=execute + LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) +-LTCOMPILE = $(LIBTOOL) --mode=compile $(CCF) ++LTCOMPILE = $(LIBTOOL) --mode=compile --tag=gcc $(CCF) + + ifeq ($(ENABLE_SHARED),yes) + LTLDFLAGS += -rpath $(PKG_LIB_DIR)