OpenSDE
/
package-nopast
3
0
Fork 0
Code Issues 9 Projects 1 Releases Activity
OpenSDE Packages Database (without history before r20070)
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
11394 Commits
49 Branches
0 Tags
34 MiB
Tree: f4304f043c
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from 'f4304f043c'
${ noResults }
package-nopast/base/acl/acl-add-destdir.patch

206 lines
7.9 KiB
Raw Normal View History

acl: fixed install when cross-compiling by adding DESTDIR support
12 years ago
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
  1. # --- SDE-COPYRIGHT-NOTE-BEGIN ---
  2. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  3. #
  4. # Filename: package/.../acl/acl-add-destdir.patch
  5. # Copyright (C) 2013 The OpenSDE Project
  6. #
  7. # More information can be found in the files COPYING and README.
  8. #
  9. # This patch file is dual-licensed. It is available under the license the
  10. # patched project is licensed under, as long as it is an OpenSource license
  11. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12. # of the GNU General Public License as published by the Free Software
  13. # Foundation; either version 2 of the License, or (at your option) any later
  14. # version.
  15. # --- SDE-COPYRIGHT-NOTE-END ---
  17. --- ./include/buildmacros.orig 2012-12-30 19:52:35.262553946 +0100
  18. +++ ./include/buildmacros 2012-12-30 19:56:34.532084427 +0100
  19. @@ -61,16 +61,16 @@
  20. LTCOMPILE = $(LIBTOOL) --mode=compile $(CCF)
  22. ifeq ($(ENABLE_SHARED),yes)
  23. -LTLDFLAGS += -rpath $(PKG_LIB_DIR)
  24. +LTLDFLAGS += -rpath $(DESTDIR)$(PKG_LIB_DIR)
  25. LTLDFLAGS += -version-info $(LTVERSION)
  26. endif
  28. ifeq ($(ENABLE_SHARED),yes)
  29. INSTALL_LTLIB = \
  30. cd $(TOPDIR)/$(LIBNAME)/.libs; \
  31. - ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
  32. - ../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(PKG_LIB_DIR); \
  33. - ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_LIB_DIR)
  34. + ../$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_LIB_DIR); \
  35. + ../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(DESTDIR)$(PKG_LIB_DIR); \
  36. + ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(DESTDIR)$(PKG_LIB_DIR)
  37. endif
  39. # Libtool thinks the static and shared libs should be in the same dir, so
  40. @@ -82,15 +82,15 @@
  41. ifeq ($(ENABLE_SHARED),yes)
  42. INSTALL_LTLIB_DEV = \
  43. cd $(TOPDIR)/$(LIBNAME)/.libs; \
  44. - ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \
  45. - ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_DEVLIB_DIR); \
  46. - ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \
  47. - ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
  48. - ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \
  49. - if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \
  50. - ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
  51. - ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
  52. - ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so; \
  53. + ../$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_DEVLIB_DIR); \
  54. + ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(DESTDIR)$(PKG_DEVLIB_DIR); \
  55. + ../$(INSTALL) -m 644 $(LIBNAME).lai $(DESTDIR)$(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \
  56. + ../$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_LIB_DIR); \
  57. + ../$(INSTALL) -T so_base $(LIBNAME).lai $(DESTDIR)$(PKG_LIB_DIR); \
  58. + if test "x$(DESTDIR)$(PKG_DEVLIB_DIR)" != "x$(DESTDIR)$(PKG_LIB_DIR)" ; then \
  59. + ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(DESTDIR)$(PKG_LIB_DIR)/$(LIBNAME).a; \
  60. + ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(DESTDIR)$(PKG_LIB_DIR)/$(LIBNAME).la; \
  61. + ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(DESTDIR)$(PKG_DEVLIB_DIR)/$(LIBNAME).so; \
  62. fi
  63. else
  64. INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
  65. @@ -98,8 +98,8 @@
  67. INSTALL_LTLIB_STATIC = \
  68. cd $(TOPDIR)/$(LIBNAME)/.libs; \
  69. - ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \
  70. - ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_DEVLIB_DIR)
  71. + ../$(INSTALL) -m 755 -d $(DESTDIR)$(PKG_DEVLIB_DIR); \
  72. + ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(DESTDIR)$(PKG_DEVLIB_DIR)
  74. INSTALL_MAN = \
  75. @for d in $(MAN_PAGES); do \
  76. @@ -111,7 +111,7 @@
  77. -e 's/\\\f[0-9]//g' -e 's/ / /g;q'`; \
  78. do \
  79. [ -z "$$m" -o "$$m" = "\\" ] && continue; \
  80. - t=$(MAN_DEST)/$$m.$(MAN_SECTION); \
  81. + t=$(DESTDIR)$(MAN_DEST)/$$m.$(MAN_SECTION); \
  82. if $$first; then \
  83. if $(HAVE_ZIPPED_MANPAGES); then \
  84. $(ZIP) -9 -c $$d > $$d.gz; _sfx=.gz; \
  85. @@ -131,7 +131,7 @@
  86. INSTALL_LINGUAS = \
  87. @for l in $(LINGUAS) ""; do \
  88. if test -f "$$l.mo" ; then \
  89. - ldir=$(PKG_LOCALE_DIR)/$$l/LC_MESSAGES; \
  90. + ldir=$(DESTDIR)$(PKG_LOCALE_DIR)/$$l/LC_MESSAGES; \
  91. $(INSTALL) -m 755 -d $$ldir; \
  92. $(INSTALL) -m 644 $$l.mo $$ldir/$(PKG_NAME).mo; \
  93. fi; \
  94. --- ./Makefile.orig 2012-12-30 19:58:10.218286182 +0100
  95. +++ ./Makefile 2012-12-30 19:58:42.183036270 +0100
  96. @@ -89,8 +89,8 @@
  97. fi
  99. install: default $(addsuffix -install,$(SUBDIRS))
  100. - $(INSTALL) -m 755 -d $(PKG_DOC_DIR)
  101. - $(INSTALL) -m 644 README $(PKG_DOC_DIR)
  102. + $(INSTALL) -m 755 -d $(DESTDIR)$(PKG_DOC_DIR)
  103. + $(INSTALL) -m 644 README $(DESTDIR)$(PKG_DOC_DIR)
  105. install-dev: default $(addsuffix -install-dev,$(SUBDIRS))
  107. --- ./chacl/Makefile.orig 2012-12-30 20:00:09.965052538 +0100
  108. +++ ./chacl/Makefile 2012-12-30 20:00:33.905608325 +0100
  109. @@ -30,6 +30,6 @@
  110. include $(BUILDRULES)
  112. install: default
  113. - $(INSTALL) -m 755 -d $(PKG_BIN_DIR)
  114. - $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR)
  115. + $(INSTALL) -m 755 -d $(DESTDIR)$(PKG_BIN_DIR)
  116. + $(LTINSTALL) -m 755 $(LTCOMMAND) $(DESTDIR)$(PKG_BIN_DIR)
  117. install-dev install-lib:
  118. --- ./getfacl/Makefile.orig 2012-12-30 20:01:07.586372402 +0100
  119. +++ ./getfacl/Makefile 2012-12-30 20:01:30.414929275 +0100
  120. @@ -31,6 +31,6 @@
  121. include $(BUILDRULES)
  123. install: default
  124. - $(INSTALL) -m 755 -d $(PKG_BIN_DIR)
  125. - $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR)
  126. + $(INSTALL) -m 755 -d $(DESTDIR)$(PKG_BIN_DIR)
  127. + $(LTINSTALL) -m 755 $(LTCOMMAND) $(DESTDIR)$(PKG_BIN_DIR)
  128. install-dev install-lib:
  129. --- ./setfacl/Makefile.orig 2012-12-30 20:03:21.681503026 +0100
  130. +++ ./setfacl/Makefile 2012-12-30 20:03:50.574164225 +0100
  131. @@ -31,6 +31,6 @@
  132. include $(BUILDRULES)
  134. install: default
  135. - $(INSTALL) -m 755 -d $(PKG_BIN_DIR)
  136. - $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR)
  137. + $(INSTALL) -m 755 -d $(DESTDIR)$(PKG_BIN_DIR)
  138. + $(LTINSTALL) -m 755 $(LTCOMMAND) $(DESTDIR)$(PKG_BIN_DIR)
  139. install-dev install-lib:
  140. --- ./man/man1/Makefile.orig 2012-12-30 20:05:05.547903528 +0100
  141. +++ ./man/man1/Makefile 2012-12-30 20:06:05.113263619 +0100
  142. @@ -30,6 +30,6 @@
  143. include $(BUILDRULES)
  145. install : default
  146. - $(INSTALL) -m 755 -d $(MAN_DEST)
  147. + $(INSTALL) -m 755 -d $(DESTDIR)$(MAN_DEST)
  148. $(INSTALL_MAN)
  149. install-dev install-lib:
  150. --- ./man/man3/Makefile.orig 2012-12-30 20:05:11.448043609 +0100
  151. +++ ./man/man3/Makefile 2012-12-30 20:05:49.820907660 +0100
  152. @@ -30,6 +30,6 @@
  153. include $(BUILDRULES)
  155. install-dev : default
  156. - $(INSTALL) -m 755 -d $(MAN_DEST)
  157. + $(INSTALL) -m 755 -d $(DESTDIR)$(MAN_DEST)
  158. $(INSTALL_MAN)
  159. install install-lib:
  160. --- ./man/man5/Makefile.orig 2012-12-30 20:05:15.880144314 +0100
  161. +++ ./man/man5/Makefile 2012-12-30 20:05:35.016561275 +0100
  162. @@ -30,6 +30,6 @@
  163. include $(BUILDRULES)
  165. install : default
  166. - $(INSTALL) -m 755 -d $(MAN_DEST)
  167. + $(INSTALL) -m 755 -d $(DESTDIR)$(MAN_DEST)
  168. $(INSTALL_MAN)
  169. install-dev install-lib:
  170. --- ./doc/Makefile.orig 2012-12-30 20:07:45.935615652 +0100
  171. +++ ./doc/Makefile 2012-12-30 20:08:39.948873200 +0100
  172. @@ -31,12 +31,12 @@
  173. $(ZIP) --best -c < CHANGES > $@
  175. install: default
  176. - $(INSTALL) -m 755 -d $(PKG_DOC_DIR)
  177. - $(INSTALL) -m 644 PORTING CHANGES.gz $(PKG_DOC_DIR)
  178. + $(INSTALL) -m 755 -d $(DESTDIR)$(PKG_DOC_DIR)
  179. + $(INSTALL) -m 644 PORTING CHANGES.gz $(DESTDIR)$(PKG_DOC_DIR)
  180. ifeq ($(PKG_DISTRIBUTION), debian)
  181. - $(INSTALL) -S CHANGES.gz $(PKG_DOC_DIR)/changelog.gz
  182. + $(INSTALL) -S CHANGES.gz $(DESTDIR)$(PKG_DOC_DIR)/changelog.gz
  183. else
  184. - $(INSTALL) -m 644 COPYING COPYING.LGPL $(PKG_DOC_DIR)
  185. + $(INSTALL) -m 644 COPYING COPYING.LGPL $(DESTDIR)$(PKG_DOC_DIR)
  186. endif
  188. install-dev install-lib:
  189. --- ./include/Makefile.orig 2012-12-30 20:09:09.129564720 +0100
  190. +++ ./include/Makefile 2012-12-30 20:09:56.070611199 +0100
  191. @@ -31,10 +31,10 @@
  192. include $(BUILDRULES)
  194. install-dev: default
  195. - $(INSTALL) -m 755 -d $(PKG_INC_DIR)
  196. - $(INSTALL) -m 755 -d $(PKG_INC_DIR)/sys
  197. - $(INSTALL) -m 644 acl.h $(PKG_INC_DIR)/sys/acl.h
  198. - $(INSTALL) -m 755 -d $(PKG_INC_DIR)/acl
  199. - $(INSTALL) -m 644 libacl.h $(PKG_INC_DIR)/acl/libacl.h
  200. + $(INSTALL) -m 755 -d $(DESTDIR)$(PKG_INC_DIR)
  201. + $(INSTALL) -m 755 -d $(DESTDIR)$(PKG_INC_DIR)/sys
  202. + $(INSTALL) -m 644 acl.h $(DESTDIR)$(PKG_INC_DIR)/sys/acl.h
  203. + $(INSTALL) -m 755 -d $(DESTDIR)$(PKG_INC_DIR)/acl
  204. + $(INSTALL) -m 644 libacl.h $(DESTDIR)$(PKG_INC_DIR)/acl/libacl.h
  206. install install-lib: