| 1 |
markusle 08/10/11 17:29:21 |
| 2 |
|
| 3 |
Modified: apbs-1.0.0-install-fix.patch |
| 4 |
Added: apbs-1.0.0-LDFLAGS.patch |
| 5 |
Log: |
| 6 |
Version bump to pull in updated patch fixing bad install location for docs (see bug #241316). Added patch for ignored LDFLAGS. |
| 7 |
(Portage version: 2.2_rc11/cvs/Linux 2.6.26-SENTINEL-2 i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 sci-chemistry/apbs/files/apbs-1.0.0-install-fix.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/apbs/files/apbs-1.0.0-install-fix.patch?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/apbs/files/apbs-1.0.0-install-fix.patch?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/apbs/files/apbs-1.0.0-install-fix.patch?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: apbs-1.0.0-install-fix.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/files/apbs-1.0.0-install-fix.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- apbs-1.0.0-install-fix.patch 29 Apr 2008 22:21:20 -0000 1.1 |
| 23 |
+++ apbs-1.0.0-install-fix.patch 11 Oct 2008 17:29:21 -0000 1.2 |
| 24 |
@@ -1,7 +1,16 @@ |
| 25 |
diff -Naur apbs-1.0.0-source/Makefile.am apbs-1.0.0-source.new/Makefile.am |
| 26 |
--- apbs-1.0.0-source/Makefile.am 2008-04-17 16:44:51.000000000 -0400 |
| 27 |
-+++ apbs-1.0.0-source.new/Makefile.am 2008-04-28 18:51:14.000000000 -0400 |
| 28 |
-@@ -28,7 +28,10 @@ |
| 29 |
++++ apbs-1.0.0-source.new/Makefile.am 2008-10-11 13:02:42.000000000 -0400 |
| 30 |
+@@ -16,6 +16,8 @@ |
| 31 |
+ |
| 32 |
+ SUBDIRS = contrib src bin @apbs_do_tools@ |
| 33 |
+ |
| 34 |
++example_dir = $(datarootdir)/@PACKAGE@ |
| 35 |
++ |
| 36 |
+ distclean-local: clean-local |
| 37 |
+ |
| 38 |
+ clean-local: clean-ac |
| 39 |
+@@ -28,7 +30,10 @@ |
| 40 |
-rm -f ./bin/apbs |
| 41 |
|
| 42 |
install-data-local: |
| 43 |
@@ -9,10 +18,10 @@ |
| 44 |
- -cp -rf examples ${prefix}/share |
| 45 |
- -cp -rf doc ${prefix}/share |
| 46 |
- -cp -rf tools ${prefix}/share |
| 47 |
-+ mkdir -p $(DESTDIR)${prefix}/share/GENTOO_PKG_NAME/examples |
| 48 |
-+ mkdir -p $(DESTDIR)${prefix}/share/GENTOO_PKG_NAME/tools |
| 49 |
-+ -rm -f doc/LICENSE.txt |
| 50 |
-+ -rm -f tools/manip/*.pyc |
| 51 |
-+ -cp -rf doc $(DESTDIR)${prefix}/share |
| 52 |
-+ -cp -rf examples $(DESTDIR)${prefix}/share/GENTOO_PKG_NAME/ |
| 53 |
-+ -cp -rf tools $(DESTDIR)${prefix}/share/GENTOO_PKG_NAME/ |
| 54 |
++ $(mkinstalldirs) $(DESTDIR)$(docdir) |
| 55 |
++ $(mkinstalldirs) $(DESTDIR)$(example_dir)/examples |
| 56 |
++ $(mkinstalldirs) $(DESTDIR)$(example_dir)/tools |
| 57 |
++ rm -f doc/LICENSE.txt doc/README |
| 58 |
++ -cp -rf doc $(DESTDIR)$(docdir)/html |
| 59 |
++ -cp -rf examples/* $(DESTDIR)$(example_dir)/examples |
| 60 |
++ -cp -rf tools/* $(DESTDIR)$(example_dir)/tools |
| 61 |
|
| 62 |
|
| 63 |
|
| 64 |
1.1 sci-chemistry/apbs/files/apbs-1.0.0-LDFLAGS.patch |
| 65 |
|
| 66 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/apbs/files/apbs-1.0.0-LDFLAGS.patch?rev=1.1&view=markup |
| 67 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/apbs/files/apbs-1.0.0-LDFLAGS.patch?rev=1.1&content-type=text/plain |
| 68 |
|
| 69 |
Index: apbs-1.0.0-LDFLAGS.patch |
| 70 |
=================================================================== |
| 71 |
diff -Naur apbs-1.0.0-source/tools/python/Makefile.am apbs-1.0.0-source.new/tools/python/Makefile.am |
| 72 |
--- apbs-1.0.0-source/tools/python/Makefile.am 2008-04-17 16:41:08.000000000 -0400 |
| 73 |
+++ apbs-1.0.0-source.new/tools/python/Makefile.am 2008-10-11 11:54:17.000000000 -0400 |
| 74 |
@@ -15,5 +15,5 @@ |
| 75 |
|
| 76 |
noinst_PROGRAMS = _apbslib.so |
| 77 |
_apbslib_so_SOURCES = apbslib.c |
| 78 |
-_apbslib_so_LINK = $(PY_CC) $(PY_LINKFLAGS) -o $@ $(PY_SHARED) |
| 79 |
+_apbslib_so_LINK = $(PY_CC) $(PY_LINKFLAGS) $(LDFLAGS) -o $@ $(PY_SHARED) |
| 80 |
_apbslib_so_LDADD = ${top_builddir}/bin/.libs/libapbsmainroutines.a ${top_builddir}/src/aaa_lib/.libs/libapbs.a ${top_builddir}/contrib/lib/libmaloc.a $(PY_LDFLAGS) |
| 81 |
diff -Naur apbs-1.0.0-source/tools/python/vgrid/Makefile.am apbs-1.0.0-source.new/tools/python/vgrid/Makefile.am |
| 82 |
--- apbs-1.0.0-source/tools/python/vgrid/Makefile.am 2008-04-17 16:41:08.000000000 -0400 |
| 83 |
+++ apbs-1.0.0-source.new/tools/python/vgrid/Makefile.am 2008-10-11 12:02:02.000000000 -0400 |
| 84 |
@@ -15,6 +15,6 @@ |
| 85 |
if PY_PRESENT |
| 86 |
noinst_PROGRAMS = _vgrid.so |
| 87 |
_vgrid_so_SOURCES = vgridlib.c |
| 88 |
- _vgrid_so_LINK = $(PY_CC) $(PY_LINKFLAGS) -o $@ $(PY_SHARED) |
| 89 |
+ _vgrid_so_LINK = $(PY_CC) $(PY_LINKFLAGS) $(LDFLAGS) -o $@ $(PY_SHARED) |
| 90 |
_vgrid_so_LDADD = ${top_builddir}/bin/.libs/libapbsmainroutines.a ${top_builddir}/src/aaa_lib/.libs/libapbs.a $(PY_LDFLAGS) ${top_builddir}/contrib/lib/libmaloc.a @lib_list@ |
| 91 |
endif |
Archives