Archives
Archives
| From: | "Justin Lecher (jlec)" <jlec@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in sci-chemistry/namd/files: namd-2.7-iml-dec.patch namd-2.7-ldflags.patch |
| Date: | Thu, 24 Jun 2010 20:37:12 |
| Message-Id: | 20100624203703.67F8C2CF4F@corvid.gentoo.org |
| 1 | jlec 10/06/24 20:37:03 |
| 2 | |
| 3 | Added: namd-2.7-iml-dec.patch namd-2.7-ldflags.patch |
| 4 | Log: |
| 5 | respect LDFLAGS and declarations |
| 6 | (Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 | |
| 8 | Revision Changes Path |
| 9 | 1.1 sci-chemistry/namd/files/namd-2.7-iml-dec.patch |
| 10 | |
| 11 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/namd/files/namd-2.7-iml-dec.patch?rev=1.1&view=markup |
| 12 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/namd/files/namd-2.7-iml-dec.patch?rev=1.1&content-type=text/plain |
| 13 | |
| 14 | Index: namd-2.7-iml-dec.patch |
| 15 | =================================================================== |
| 16 | diff --git a/src/flipbinpdb.c b/src/flipbinpdb.c |
| 17 | index 94b71ba..01a2529 100644 |
| 18 | --- a/src/flipbinpdb.c |
| 19 | +++ b/src/flipbinpdb.c |
| 20 | @@ -9,6 +9,7 @@ |
| 21 | #include <sys/mman.h> |
| 22 | #include <fcntl.h> |
| 23 | #include <stdio.h> |
| 24 | +#include <stdlib.h> |
| 25 | |
| 26 | #ifndef MAP_FILE |
| 27 | #define MAP_FILE 0 |
| 28 | diff --git a/src/flipdcd.c b/src/flipdcd.c |
| 29 | index 8ec85b7..1c23433 100644 |
| 30 | --- a/src/flipdcd.c |
| 31 | +++ b/src/flipdcd.c |
| 32 | @@ -13,6 +13,7 @@ |
| 33 | #include <sys/mman.h> |
| 34 | #include <fcntl.h> |
| 35 | #include <stdio.h> |
| 36 | +#include <stdlib.h> |
| 37 | |
| 38 | #ifndef MAP_FILE |
| 39 | #define MAP_FILE 0 |
| 40 | |
| 41 | |
| 42 | |
| 43 | 1.1 sci-chemistry/namd/files/namd-2.7-ldflags.patch |
| 44 | |
| 45 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/namd/files/namd-2.7-ldflags.patch?rev=1.1&view=markup |
| 46 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/namd/files/namd-2.7-ldflags.patch?rev=1.1&content-type=text/plain |
| 47 | |
| 48 | Index: namd-2.7-ldflags.patch |
| 49 | =================================================================== |
| 50 | diff --git a/Makefile b/Makefile |
| 51 | index fd20f12..0821bed 100644 |
| 52 | --- a/Makefile |
| 53 | +++ b/Makefile |
| 54 | @@ -339,7 +339,7 @@ all: $(BINARIES) $(LIBCUDARTSO) |
| 55 | |
| 56 | namd2: $(INCDIR) $(DSTDIR) $(OBJS) $(LIBS) |
| 57 | $(MAKEBUILDINFO) |
| 58 | - $(CHARMC) -verbose -ld++-option \ |
| 59 | + $(CHARMC) $(LDFLAGS) -verbose -ld++-option \ |
| 60 | "$(COPTI)$(CHARMINC) $(COPTI)$(INCDIR) $(COPTI)$(SRCDIR) $(CXXOPTS)" \ |
| 61 | -module NeighborLB -module commlib -language charm++ \ |
| 62 | $(BUILDINFO).o \ |
| 63 | @@ -394,23 +394,23 @@ charmrun.exe: |
| 64 | $(COPY) $(CHARM)/bin/charmrun.exe charmrun.exe |
| 65 | |
| 66 | psfgen: $(DSTDIR) $(SBOBJS) $(PLUGINOBJS) |
| 67 | - $(CC) $(SBCFLAGS) -o psfgen $(SBOBJS) $(PLUGINOBJS) $(TCLLIB) $(TCLAPPLIB) -lm |
| 68 | + $(CC) $(SBCFLAGS) $(LDFLAGS) -o psfgen $(SBOBJS) $(PLUGINOBJS) $(TCLLIB) $(TCLAPPLIB) -lm |
| 69 | |
| 70 | psfgen.exe: $(DSTDIR) $(SBOBJS) $(PLUGINOBJS) $(TCLDLL) |
| 71 | $(CC) $(SBCFLAGS) -o psfgen $(SBOBJS) $(PLUGINOBJS) $(TCLLIB) $(TCLAPPLIB) -lm |
| 72 | |
| 73 | flipdcd: $(SRCDIR)/flipdcd.c |
| 74 | - $(CC) $(CFLAGS) -o $@ $(SRCDIR)/flipdcd.c || \ |
| 75 | + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(SRCDIR)/flipdcd.c || \ |
| 76 | echo "#!/bin/sh\necho unavailable on this platform" > $@; \ |
| 77 | chmod +x $@ |
| 78 | |
| 79 | flipbinpdb: $(SRCDIR)/flipbinpdb.c |
| 80 | - $(CC) $(CFLAGS) -o $@ $(SRCDIR)/flipbinpdb.c || \ |
| 81 | + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(SRCDIR)/flipbinpdb.c || \ |
| 82 | echo "#!/bin/sh\necho unavailable on this platform" > $@; \ |
| 83 | chmod +x $@ |
| 84 | |
| 85 | fixdcd: $(SRCDIR)/fixdcd.c |
| 86 | - $(CC) $(CFLAGS) -o fixdcd $(SRCDIR)/fixdcd.c |
| 87 | + $(CC) $(CFLAGS) $(LDFLAGS) -o fixdcd $(SRCDIR)/fixdcd.c |
| 88 | |
| 89 | dumpdcd: $(SRCDIR)/dumpdcd.c |
| 90 | $(CC) $(CFLAGS) -o dumpdcd $(SRCDIR)/dumpdcd.c |