karasz
/
package-update
1
0
Fork 0
Code Issues Releases Activity
Browse Source

Patched acl to honor DESTDIR

early
Alejandro Mery 17 years ago
parent
d5996571ea
commit
a9e74db19b
3 changed files with 194 additions and 48 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      base/acl/acl.conf
  2. 191
      base/acl/destdir.patch
  3. 46
      base/acl/no-links.patch

5
base/acl/acl.conf
Unescape View File

@ -2,6 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../acl/acl.conf
# Copyright (C) 2007 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf
#
@ -17,7 +18,7 @@
export RPM=/no
# adjust libdir
libdir="$root/${libdir##*/}"
libdir="/${libdir##*/}"
# also install headers and libs
makeinstopt="$makeinstopt install-lib install-dev"
@ -29,5 +30,5 @@ var_append confopt ' ' "--libexecdir='$libdir'"
var_append confopt ' ' "--enable-shared"
# install missing .la file
hook_add inmake 9 "cp -av libacl/libacl.la $libdir/; sed -i 's,installed=no,installed=yes,' $libdir/libacl.la"
hook_add inmake 9 "cp -av libacl/libacl.la $root$libdir/; sed -i 's,installed=no,installed=yes,' $root$libdir/libacl.la"

191
base/acl/destdir.patch
Unescape View File

@ -0,0 +1,191 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../acl/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 ---
--- ./doc/Makefile.orig 2007-10-15 13:05:47.000000000 -0300
+++ ./doc/Makefile 2007-10-15 13:07:07.000000000 -0300
@@ -17,12 +17,12 @@
$(ZIP) --best -c < CHANGES > $@
install: default
- $(INSTALL) -m 755 -d $(PKG_DOC_DIR)
- $(INSTALL) -m 644 PORTING CHANGES.gz $(PKG_DOC_DIR)
+ $(INSTALL) -m 755 -d $(DESTDIR)$(PKG_DOC_DIR)
+ $(INSTALL) -m 644 PORTING CHANGES.gz $(DESTDIR)$(PKG_DOC_DIR)
ifeq ($(PKG_DISTRIBUTION), debian)
- $(INSTALL) -S CHANGES.gz $(PKG_DOC_DIR)/changelog.gz
+ $(INSTALL) -S CHANGES.gz $(DESTDIR)$(PKG_DOC_DIR)/changelog.gz
else
- $(INSTALL) -m 644 COPYING $(PKG_DOC_DIR)
+ $(INSTALL) -m 644 COPYING $(DESTDIR)$(PKG_DOC_DIR)
endif
install-dev install-lib:
--- ./Makefile.orig 2007-10-15 13:05:47.000000000 -0300
+++ ./Makefile 2007-10-15 13:07:30.000000000 -0300
@@ -53,8 +53,8 @@
install: default
$(SUBDIRS_MAKERULE)
- $(INSTALL) -m 755 -d $(PKG_DOC_DIR)
- $(INSTALL) -m 644 README $(PKG_DOC_DIR)
+ $(INSTALL) -m 755 -d $(DESTDIR)$(PKG_DOC_DIR)
+ $(INSTALL) -m 644 README $(DESTDIR)$(PKG_DOC_DIR)
install-dev: default
$(SUBDIRS_MAKERULE)
--- ./chacl/Makefile.orig 2007-10-15 13:05:47.000000000 -0300
+++ ./chacl/Makefile 2007-10-15 13:07:48.000000000 -0300
@@ -16,6 +16,7 @@
include $(BUILDRULES)
install: default
- $(INSTALL) -m 755 -d $(PKG_BIN_DIR)
- $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR)
+ $(INSTALL) -m 755 -d $(DESTDIR)$(PKG_BIN_DIR)
+ $(LTINSTALL) -m 755 $(LTCOMMAND) $(DESTDIR)$(PKG_BIN_DIR)
+
install-dev install-lib:
--- ./setfacl/Makefile.orig 2007-10-15 13:05:47.000000000 -0300
+++ ./setfacl/Makefile 2007-10-15 13:08:00.000000000 -0300
@@ -17,6 +17,7 @@
include $(BUILDRULES)
install: default
- $(INSTALL) -m 755 -d $(PKG_BIN_DIR)
- $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR)
+ $(INSTALL) -m 755 -d $(DESTDIR)$(PKG_BIN_DIR)
+ $(LTINSTALL) -m 755 $(LTCOMMAND) $(DESTDIR)$(PKG_BIN_DIR)
+
install-dev install-lib:
--- ./debian/Makefile.orig 2007-10-15 13:05:47.000000000 -0300
+++ ./debian/Makefile 2007-10-15 13:10:17.000000000 -0300
@@ -16,22 +16,22 @@
install: default
ifeq ($(PKG_DISTRIBUTION), debian)
- $(INSTALL) -m 755 -d $(PKG_DOC_DIR)
- $(INSTALL) -m 644 changelog $(PKG_DOC_DIR)/changelog.Debian
+ $(INSTALL) -m 755 -d $(DESTDIR)$(PKG_DOC_DIR)
+ $(INSTALL) -m 644 changelog $(DESTDIR)$(PKG_DOC_DIR)/changelog.Debian
endif
install-dev: default
ifeq ($(PKG_DISTRIBUTION), debian)
- $(INSTALL) -m 755 -d $(PKG_DOC_DIR)
- $(INSTALL) -m 755 -d $(DEV_DOC_DIR)
- $(INSTALL) -m 644 copyright $(DEV_DOC_DIR)
- $(INSTALL) -m 644 changelog $(DEV_DOC_DIR)/changelog.Debian
+ $(INSTALL) -m 755 -d $(DESTDIR)$(PKG_DOC_DIR)
+ $(INSTALL) -m 755 -d $(DESTDIR)$(DEV_DOC_DIR)
+ $(INSTALL) -m 644 copyright $(DESTDIR)$(DEV_DOC_DIR)
+ $(INSTALL) -m 644 changelog $(DESTDIR)$(DEV_DOC_DIR)/changelog.Debian
endif
install-lib: default
ifeq ($(PKG_DISTRIBUTION), debian)
- $(INSTALL) -m 755 -d $(PKG_DOC_DIR)
- $(INSTALL) -m 755 -d $(LIB_DOC_DIR)
- $(INSTALL) -m 644 copyright $(LIB_DOC_DIR)
- $(INSTALL) -m 644 changelog $(LIB_DOC_DIR)/changelog.Debian
+ $(INSTALL) -m 755 -d $(DESTDIR)$(PKG_DOC_DIR)
+ $(INSTALL) -m 755 -d $(DESTDIR)$(LIB_DOC_DIR)
+ $(INSTALL) -m 644 copyright $(DESTDIR)$(LIB_DOC_DIR)
+ $(INSTALL) -m 644 changelog $(DESTDIR)$(LIB_DOC_DIR)/changelog.Debian
endif
--- ./getfacl/Makefile.orig 2007-10-15 13:05:47.000000000 -0300
+++ ./getfacl/Makefile 2007-10-15 13:10:36.000000000 -0300
@@ -17,6 +17,7 @@
include $(BUILDRULES)
install: default
- $(INSTALL) -m 755 -d $(PKG_BIN_DIR)
- $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR)
+ $(INSTALL) -m 755 -d $(DESTDIR)$(PKG_BIN_DIR)
+ $(LTINSTALL) -m 755 $(LTCOMMAND) $(DESTDIR)$(PKG_BIN_DIR)
+
install-dev install-lib:
--- ./include/buildmacros.orig 2007-09-10 22:00:47.000000000 -0400
+++ ./include/buildmacros 2007-10-15 13:22:45.000000000 -0300
@@ -69,22 +69,22 @@
ifeq ($(ENABLE_SHARED),yes)
INSTALL_LTLIB_DEV = \
cd $(TOPDIR)/$(LIBNAME)/.libs; \
- ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \
- ../$(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) -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) -m 755 -d $(DESTDIR)$(PKG_DEVLIB_DIR); \
+ ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(DESTDIR)$(PKG_DEVLIB_DIR); \
+ ../$(INSTALL) -m 644 $(LIBNAME).lai $(DESTDIR)$(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \
+ ../$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_LIB_DIR); \
+ ../$(INSTALL) -T so_base $(LIBNAME).lai $(DESTDIR)$(PKG_LIB_DIR); \
+ ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(DESTDIR)$(PKG_LIB_DIR)/$(LIBNAME).a; \
+ ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(DESTDIR)$(PKG_LIB_DIR)/$(LIBNAME).la; \
+ ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(DESTDIR)$(PKG_DEVLIB_DIR)/$(LIBNAME).so
else
INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
endif
INSTALL_LTLIB_STATIC = \
cd $(TOPDIR)/$(LIBNAME)/.libs; \
- ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \
- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_DEVLIB_DIR)
+ ../$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_DEVLIB_DIR); \
+ ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(DESTDIR)$(PKG_DEVLIB_DIR)
INSTALL_MAN = \
@for d in $(MAN_PAGES); do \
@@ -96,7 +96,7 @@
-e 's/\\\f[0-9]//g' -e 's/ / /g;q'`; \
do \
[ -z "$$m" -o "$$m" = "\\" ] && continue; \
- t=$(MAN_DEST)/$$m.$(MAN_SECTION); \
+ t=$(DESTDIR)$(MAN_DEST)/$$m.$(MAN_SECTION); \
if $$first; then \
if $(HAVE_ZIPPED_MANPAGES); then \
$(ZIP) -9 -c $$d > $$d.gz; _sfx=.gz; \
@@ -116,8 +116,8 @@
INSTALL_LINGUAS = \
@for l in $(LINGUAS) ""; do \
if test -f "$$l.mo" ; then \
- ldir=$(PKG_LOCALE_DIR)/$$l/LC_MESSAGES; \
+ ldir=$(DESTDIR)$(PKG_LOCALE_DIR)/$$l/LC_MESSAGES; \
$(INSTALL) -m 755 -d $$ldir; \
$(INSTALL) -m 644 $$l.mo $$ldir/$(PKG_NAME).mo; \
fi; \
done
--- ./include/Makefile.orig 2007-10-15 13:32:59.000000000 -0300
+++ ./include/Makefile 2007-10-15 13:33:26.000000000 -0300
@@ -17,9 +17,10 @@
include $(BUILDRULES)
install-dev: default
- $(INSTALL) -m 755 -d $(PKG_INC_DIR)
- $(INSTALL) -m 755 -d $(PKG_INC_DIR)/sys
- $(INSTALL) -m 644 acl.h $(PKG_INC_DIR)/sys/acl.h
- $(INSTALL) -m 755 -d $(PKG_INC_DIR)/acl
- $(INSTALL) -m 644 libacl.h $(PKG_INC_DIR)/acl/libacl.h
+ $(INSTALL) -m 755 -d $(DESTDIR)$(PKG_INC_DIR)
+ $(INSTALL) -m 755 -d $(DESTDIR)$(PKG_INC_DIR)/sys
+ $(INSTALL) -m 644 acl.h $(DESTDIR)$(PKG_INC_DIR)/sys/acl.h
+ $(INSTALL) -m 755 -d $(DESTDIR)$(PKG_INC_DIR)/acl
+ $(INSTALL) -m 644 libacl.h $(DESTDIR)$(PKG_INC_DIR)/acl/libacl.h
+
install install-lib:

46
base/acl/no-links.patch
Unescape View File

@ -1,46 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../acl/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.
#
# 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 ---
Don't create these links, this hurts our .la,.a file handling,
but create a normal /lib/libacl.so link.
-- jsaw
--- acl-2.2.39/include/buildmacros.orig 2007-03-14 16:42:05.000000000 +0100
+++ acl-2.2.39/include/buildmacros 2007-03-14 16:45:55.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); \
- ../$(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
@@ -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) -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
Write Preview
Loading…
Cancel
Save