| 1 |
jlec 10/02/03 22:35:33 |
| 2 |
|
| 3 |
Added: ldflags.patch 2.7.5-bundled-lib.patch |
| 4 |
Log: |
| 5 |
Version bump, fixing 238302 |
| 6 |
(Portage version: 2.2_rc62/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 sci-chemistry/rasmol/files/ldflags.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/rasmol/files/ldflags.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/rasmol/files/ldflags.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: ldflags.patch |
| 15 |
=================================================================== |
| 16 |
--- src/Makefile 2009-06-04 14:25:15.000000000 +0200 |
| 17 |
+++ src/Makefile.new 2009-06-04 14:27:35.000000000 +0200 |
| 18 |
@@ -1175,7 +1175,7 @@ |
| 19 |
|
| 20 |
rasmol: $(OBJS) $(DEPLIBS) |
| 21 |
$(RM) $@ |
| 22 |
- $(CCLINK) -o $@ $(LDOPTIONS) $(OBJS) $(LOCAL_LIBRARIES) $(LDLIBS) $(EXTRA_LOAD_FLAGS) |
| 23 |
+ $(CCLINK) $(LDOPTIONS) $(LDFLAGS) -o $@ $(OBJS) $(LOCAL_LIBRARIES) $(LDLIBS) $(EXTRA_LOAD_FLAGS) |
| 24 |
|
| 25 |
install:: rasmol |
| 26 |
@if [ -d $(DESTDIR)$(BINDIR) ]; then \ |
| 27 |
|
| 28 |
|
| 29 |
|
| 30 |
1.1 sci-chemistry/rasmol/files/2.7.5-bundled-lib.patch |
| 31 |
|
| 32 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/rasmol/files/2.7.5-bundled-lib.patch?rev=1.1&view=markup |
| 33 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/rasmol/files/2.7.5-bundled-lib.patch?rev=1.1&content-type=text/plain |
| 34 |
|
| 35 |
Index: 2.7.5-bundled-lib.patch |
| 36 |
=================================================================== |
| 37 |
--- Imakefile 2009-07-20 16:08:43.000000000 +0200 |
| 38 |
+++ Imakefile.new 2009-07-25 14:07:08.000000000 +0200 |
| 39 |
@@ -276,17 +276,10 @@ |
| 40 |
|
| 41 |
#ifndef USE_XFORMSLIB |
| 42 |
DEFINES = $(GTKCFLAGS) $(GUIDEF) -DRASMOLDIR=\"$(RASMOLDIR)\" $(DEPTHDEF) $(LOCALEDEF) \ |
| 43 |
- -D_USE_RASMOL_H_ $(GUIOPTION) -I$(CBFLIB_INCLUDE_DIR) \ |
| 44 |
- -I$(CQRLIB_INCLUDE_DIR) \ |
| 45 |
- -I$(CVECTOR_INCLUDE_DIR) \ |
| 46 |
- -I$(NEARTREE_INCLUDE_DIR) |
| 47 |
+ -D_USE_RASMOL_H_ $(GUIOPTION) -IEPREFIX/usr/include -IEPREFIX/usr/include/cbflib |
| 48 |
#else |
| 49 |
DEFINES = $(GTKCFLAGS) $(GUIDEF) -DRASMOLDIR=\"$(RASMOLDIR)\" $(DEPTHDEF) $(LOCALEDEF) \ |
| 50 |
- -D_USE_RASMOL_H_ $(GUIOPTION) -I$(CBFLIB_INCLUDE_DIR) \ |
| 51 |
- -I$(CQRLIB_INCLUDE_DIR) \ |
| 52 |
- -I$(CVECTOR_INCLUDE_DIR) \ |
| 53 |
- -I$(NEARTREE_INCLUDE_DIR) \ |
| 54 |
- -I$(XFORMSLIB_INCLUDE_DIR) |
| 55 |
+ -D_USE_RASMOL_H_ $(GUIOPTION) -IEPREFIX/usr/include -IEPREFIX/usr/include/cbflib |
| 56 |
#endif |
| 57 |
|
| 58 |
|
| 59 |
@@ -312,11 +305,11 @@ |
| 60 |
# Additional RS6000 AIX MITSHM Library |
| 61 |
# LDLIBS = -lm -lXi -lXextSam $(XLIB) |
| 62 |
|
| 63 |
-LDLIBS = -lm -lXi $(XLIB) $(EXTRA_LIBRARIES) $(XFORMSLIB) $(GTKLIBS) \ |
| 64 |
- $(CBFLIB_LDLIB) \ |
| 65 |
- $(CQRLIB_LDLIB) \ |
| 66 |
- $(CVECTOR_LDLIB) \ |
| 67 |
- $(NEARTREE_LDLIB) $(XFORMSLIB_LDLIB) |
| 68 |
+LDLIBS = -lm -lXi $(XLIB) $(EXTRA_LIBRARIES) -lforms $(GTKLIBS) \ |
| 69 |
+ -lcbf \ |
| 70 |
+ -lCQRlib \ |
| 71 |
+ -lCVector \ |
| 72 |
+ -lCNearTree -lforms -lgfortran |
| 73 |
|
| 74 |
|
| 75 |
# |
| 76 |
@@ -420,11 +413,11 @@ |
| 77 |
$(NEARTREE_DIR)/CNearTree.c: $(NEARTREE_DIR) |
| 78 |
#endif |
| 79 |
|
| 80 |
-$(OBJS): $(EXTPKGDIR) $(CBFLIB_OBJDEP) \ |
| 81 |
- $(CQRLIB_OBJDEP) \ |
| 82 |
- $(CVECTOR_OBJDEP) \ |
| 83 |
- $(NEARTREE_OBJDEP) \ |
| 84 |
- $(XFORMSLIB_OBJDEP) |
| 85 |
+# $(OBJS): $(EXTPKGDIR) $(CBFLIB_OBJDEP) \ |
| 86 |
+# $(CQRLIB_OBJDEP) \ |
| 87 |
+# $(CVECTOR_OBJDEP) \ |
| 88 |
+# $(NEARTREE_OBJDEP) \ |
| 89 |
+# $(XFORMSLIB_OBJDEP) |
| 90 |
|
| 91 |
|
| 92 |
gtkwin.c: gtkui.h |
| 93 |
--- Makefile.in 2009-07-14 18:39:18.000000000 +0200 |
| 94 |
+++ Makefile.in.new 2009-07-25 14:08:11.000000000 +0200 |
| 95 |
@@ -165,7 +165,7 @@ |
| 96 |
|
| 97 |
all: postdownload rasmol rastxt |
| 98 |
|
| 99 |
-rasmol: postdownload $(X11OBJS) $(CBFLIBDIR)/lib/libcbf.a |
| 100 |
+rasmol: postdownload $(X11OBJS) |
| 101 |
$(CC) -o rasmol $(LFLAGS) $(X11OBJS) $(X11LIBS) |
| 102 |
chmod 755 rasmol |
Archives