| 1 |
jlec 10/06/29 19:55:41 |
| 2 |
|
| 3 |
Modified: 6.1.3-dont-build-mmdb.patch |
| 4 |
Added: 6.1.3-noinstall.patch 6.1.3-destdir.patch |
| 5 |
Log: |
| 6 |
Change way of installation, fixed insecure runpaths |
| 7 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 sci-libs/ccp4-libs/files/6.1.3-dont-build-mmdb.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/ccp4-libs/files/6.1.3-dont-build-mmdb.patch?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/ccp4-libs/files/6.1.3-dont-build-mmdb.patch?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/ccp4-libs/files/6.1.3-dont-build-mmdb.patch?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: 6.1.3-dont-build-mmdb.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/files/6.1.3-dont-build-mmdb.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- 6.1.3-dont-build-mmdb.patch 2 Feb 2010 20:38:15 -0000 1.1 |
| 23 |
+++ 6.1.3-dont-build-mmdb.patch 29 Jun 2010 19:55:41 -0000 1.2 |
| 24 |
@@ -9,18 +9,3 @@ |
| 25 |
# maybe create shared library |
| 26 |
$(SHARE_LIB) |
| 27 |
|
| 28 |
---- lib/src/Makefile.in 2009-06-18 15:44:08.000000000 +0200 |
| 29 |
-+++ lib/src/Makefile.in.new 2009-08-11 12:17:53.000000000 +0200 |
| 30 |
-@@ -716,11 +716,9 @@ |
| 31 |
- rm -f $(DESTDIR)$(includedir)/mmdb/$$f; \ |
| 32 |
- done |
| 33 |
- |
| 34 |
--install : all install-ccp4HEADERS install-mmdbHEADERS |
| 35 |
-- $(INSTALL_DATA) `pwd`/$(LMMDB) $(libdir)/$(LMMDB) |
| 36 |
-+install : all install-ccp4HEADERS |
| 37 |
- $(INSTALL_DATA) `pwd`/$(LC) $(libdir)/$(LC) |
| 38 |
- $(INSTALL_DATA) `pwd`/$(LF) $(libdir)/$(LF) |
| 39 |
-- $(RANLIB) $(libdir)/$(LMMDB) |
| 40 |
- $(RANLIB) $(libdir)/$(LC) |
| 41 |
- $(RANLIB) $(libdir)/$(LF) |
| 42 |
- $(SHARE_INST) |
| 43 |
|
| 44 |
|
| 45 |
|
| 46 |
1.1 sci-libs/ccp4-libs/files/6.1.3-noinstall.patch |
| 47 |
|
| 48 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/ccp4-libs/files/6.1.3-noinstall.patch?rev=1.1&view=markup |
| 49 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/ccp4-libs/files/6.1.3-noinstall.patch?rev=1.1&content-type=text/plain |
| 50 |
|
| 51 |
Index: 6.1.3-noinstall.patch |
| 52 |
=================================================================== |
| 53 |
diff --git a/Makefile.in b/Makefile.in |
| 54 |
index ac552fe..fab1a87 100755 |
| 55 |
--- a/Makefile.in |
| 56 |
+++ b/Makefile.in |
| 57 |
@@ -30,8 +30,7 @@ lapacklib : FORCE |
| 58 |
|
| 59 |
cciflib : FORCE |
| 60 |
if test -n "$(ccifdir)"; then cd $(ccifdir); \ |
| 61 |
- $(MAKE) $(MFLAGS) $(MVARS); else true; fi; \ |
| 62 |
- $(MAKE) install |
| 63 |
+ $(MAKE) $(MFLAGS) $(MVARS); else true; fi |
| 64 |
|
| 65 |
cctbx: FORCE |
| 66 |
if test -n "$(cctbxdir)"; then cd $(top_srcdir)/$(cctbxdir); \ |
| 67 |
@@ -40,8 +39,7 @@ cctbx: FORCE |
| 68 |
libdir : FORCE lapacklib cciflib libccp4 clipper ssm diffractionImg |
| 69 |
|
| 70 |
libccp4: FORCE |
| 71 |
- cd lib/src; $(MAKE) $(MFLAGS) $(MVARS) ; \ |
| 72 |
- $(MAKE) install |
| 73 |
+ cd lib/src; $(MAKE) $(MFLAGS) $(MVARS) |
| 74 |
|
| 75 |
share : FORCE |
| 76 |
cd share; $(MAKE) $(MFLAGS) $(MVARS) |
| 77 |
@@ -51,18 +49,15 @@ ccp4i : FORCE |
| 78 |
|
| 79 |
clipper: FORCE fftw |
| 80 |
if test -n "$(clipperdir)"; then cd $(top_srcdir)/lib/clipper/clipper; \ |
| 81 |
- $(MAKE) -i $(MFLAGS) $(MVARS); else true; fi ; \ |
| 82 |
- $(MAKE) install |
| 83 |
+ $(MAKE) -i $(MFLAGS) $(MVARS); else true; fi |
| 84 |
|
| 85 |
diffractionImg: |
| 86 |
if test -n "$(diffimdir)"; then cd $(top_srcdir)/$(diffimdir); \ |
| 87 |
- $(MAKE) -i $(MFLAGS) $(MVARS); else true; fi ; \ |
| 88 |
- $(MAKE) install |
| 89 |
+ $(MAKE) -i $(MFLAGS) $(MVARS); else true; fi |
| 90 |
|
| 91 |
ssm: |
| 92 |
if test -n "$(ssmdir)"; then cd $(top_srcdir)/$(ssmdir); \ |
| 93 |
- $(MAKE) -i $(MFLAGS) $(MVARS); else true; fi ; \ |
| 94 |
- $(MAKE) install |
| 95 |
+ $(MAKE) -i $(MFLAGS) $(MVARS); else true; fi |
| 96 |
|
| 97 |
fftw: FORCE |
| 98 |
if test -n "$(fftwdir)"; then cd $(top_srcdir)/lib/fftw; \ |
| 99 |
@@ -79,7 +74,7 @@ unsupported : FORCE libdir |
| 100 |
$(MAKE) $(MFLAGS) $(MVARS); else true; fi |
| 101 |
|
| 102 |
datadir : FORCE libdir |
| 103 |
- cd lib/data; $(MAKE) $(MFLAGS) $(MVARS) |
| 104 |
+ cd lib/data; $(MAKE) $(MFLAGS) $(MVARS) font84.dat |
| 105 |
|
| 106 |
xwindir : FORCE libdir |
| 107 |
if test -f x-windows/Makefile; then cd x-windows; \ |
| 108 |
diff --git a/lib/ccif/Makefile.in b/lib/ccif/Makefile.in |
| 109 |
index 975f1d9..75eda9f 100755 |
| 110 |
--- a/lib/ccif/Makefile.in |
| 111 |
+++ b/lib/ccif/Makefile.in |
| 112 |
@@ -371,11 +371,11 @@ condition.h condition_list.h: $(srcdir)/condition.list $(srcdir)/condition.awk |
| 113 |
# |
| 114 |
|
| 115 |
install : all |
| 116 |
- $(INSTALL_DATA) `pwd`/$L $(libdir)/$L |
| 117 |
- $(INSTALL_DATA) `pwd`/$(CIFMMLIB) $(libdir)/$(CIFMMLIB) |
| 118 |
- $(RANLIB) $(libdir)/$L |
| 119 |
+ $(RANLIB) $L |
| 120 |
+ $(INSTALL_DATA) `pwd`/$L $(DESTDIR)/$(libdir)/$L |
| 121 |
+ $(INSTALL_DATA) `pwd`/$(CIFMMLIB) $(DESTDIR)$(libdir)/$(CIFMMLIB) |
| 122 |
if (test -f $(SHARED_LIB_NAME)); then \ |
| 123 |
- $(INSTALL_DATA) `pwd`/$(SHARED_LIB_NAME) $(libdir)/$(SHARED_LIB_NAME); \ |
| 124 |
+ $(INSTALL_DATA) `pwd`/$(SHARED_LIB_NAME) $(DESTDIR)/$(libdir)/$(SHARED_LIB_NAME); \ |
| 125 |
fi |
| 126 |
|
| 127 |
uninstall : |
| 128 |
diff --git a/lib/data/Makefile.in b/lib/data/Makefile.in |
| 129 |
index cc25c5c..7445ca5 100755 |
| 130 |
--- a/lib/data/Makefile.in |
| 131 |
+++ b/lib/data/Makefile.in |
| 132 |
@@ -30,9 +30,9 @@ font84.dat : fontpack $(srcdir)/font84.ascii |
| 133 |
|
| 134 |
install : all |
| 135 |
-rm -f font84.dat |
| 136 |
- test -f font84.ascii || $(LNS) $(srcdir)/font84.ascii . |
| 137 |
+ test -f font84.ascii || $(LNS) $(DESTIDIR)/$(srcdir)/font84.ascii . |
| 138 |
./fontpack |
| 139 |
- $(INSTALL) `pwd`/font84.dat $(libdir)/font84.dat |
| 140 |
+ $(INSTALL) `pwd`/font84.dat $(DESTDIR)/$(libdir)/font84.dat |
| 141 |
|
| 142 |
uninstall : |
| 143 |
-rm -f $(libdir)/font84.dat |
| 144 |
diff --git a/lib/src/Makefile.in b/lib/src/Makefile.in |
| 145 |
index c23f488..3a611f1 100755 |
| 146 |
--- a/lib/src/Makefile.in |
| 147 |
+++ b/lib/src/Makefile.in |
| 148 |
@@ -685,7 +685,7 @@ testlib : $(srcdir)/testlib.f $(LF) |
| 149 |
# |
| 150 |
|
| 151 |
install-ccp4HEADERS: $(ccp4_HEADERS) |
| 152 |
- if test ! -d $(DESTDIR)$(includedir)/ccp4; then mkdir $(DESTDIR)$(includedir)/ccp4; fi |
| 153 |
+ if test ! -d $(DESTDIR)$(includedir)/ccp4; then mkdir -p $(DESTDIR)$(includedir)/ccp4; fi |
| 154 |
@list='$(ccp4_HEADERS)'; for p in $$list; do \ |
| 155 |
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
| 156 |
f="`echo $$p | sed -e 's|^.*/||'`"; \ |
| 157 |
@@ -716,13 +716,11 @@ uninstall-mmdbHEADERS: |
| 158 |
rm -f $(DESTDIR)$(includedir)/mmdb/$$f; \ |
| 159 |
done |
| 160 |
|
| 161 |
-install : all install-ccp4HEADERS install-mmdbHEADERS |
| 162 |
- $(INSTALL_DATA) `pwd`/$(LMMDB) $(libdir)/$(LMMDB) |
| 163 |
- $(INSTALL_DATA) `pwd`/$(LC) $(libdir)/$(LC) |
| 164 |
- $(INSTALL_DATA) `pwd`/$(LF) $(libdir)/$(LF) |
| 165 |
- $(RANLIB) $(libdir)/$(LMMDB) |
| 166 |
- $(RANLIB) $(libdir)/$(LC) |
| 167 |
- $(RANLIB) $(libdir)/$(LF) |
| 168 |
+install : all install-ccp4HEADERS |
| 169 |
+ $(RANLIB) $(LC) |
| 170 |
+ $(RANLIB) $(LF) |
| 171 |
+ $(INSTALL_DATA) `pwd`/$(LC) $(DESTDIR)/$(libdir)/$(LC) |
| 172 |
+ $(INSTALL_DATA) `pwd`/$(LF) $(DESTDIR)/$(libdir)/$(LF) |
| 173 |
$(SHARE_INST) |
| 174 |
|
| 175 |
uninstall : uninstall-ccp4HEADERS uninstall-mmdbHEADERS |
| 176 |
diff --git a/lib/ssm/Makefile.in b/lib/ssm/Makefile.in |
| 177 |
index 27d3aa2..0a14fe5 100755 |
| 178 |
--- a/lib/ssm/Makefile.in |
| 179 |
+++ b/lib/ssm/Makefile.in |
| 180 |
@@ -375,12 +375,12 @@ distclean-libtool: |
| 181 |
uninstall-info-am: |
| 182 |
install-library_includeHEADERS: $(library_include_HEADERS) |
| 183 |
@$(NORMAL_INSTALL) |
| 184 |
- test -z "$(library_includedir)" || $(mkdir_p) "$(DESTDIR)$(library_includedir)" |
| 185 |
+ test -z "$(library_includedir)" || $(mkdir_p) "$(DESTDIR)$(library_includedir)/ssm" |
| 186 |
@list='$(library_include_HEADERS)'; for p in $$list; do \ |
| 187 |
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
| 188 |
f=$(am__strip_dir) \ |
| 189 |
- echo " $(library_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(library_includedir)/$$f'"; \ |
| 190 |
- $(library_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(library_includedir)/$$f"; \ |
| 191 |
+ echo " $(library_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(library_includedir)/ssm/$$f'"; \ |
| 192 |
+ $(library_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(library_includedir)/ssm/$$f"; \ |
| 193 |
done |
| 194 |
|
| 195 |
uninstall-library_includeHEADERS: |
| 196 |
|
| 197 |
|
| 198 |
|
| 199 |
1.1 sci-libs/ccp4-libs/files/6.1.3-destdir.patch |
| 200 |
|
| 201 |
<<Binary file>> |
Archives