| 1 |
jlec 10/07/05 11:36:51 |
| 2 |
|
| 3 |
Modified: 0.9.0-Makefile.patch |
| 4 |
Log: |
| 5 |
Don't install obj files #326933; add python support |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64, RepoMan options: --force) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 sci-libs/cbflib/files/0.9.0-Makefile.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cbflib/files/0.9.0-Makefile.patch?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cbflib/files/0.9.0-Makefile.patch?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cbflib/files/0.9.0-Makefile.patch?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: 0.9.0-Makefile.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/cbflib/files/0.9.0-Makefile.patch,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- 0.9.0-Makefile.patch 28 Apr 2010 19:56:18 -0000 1.1 |
| 22 |
+++ 0.9.0-Makefile.patch 5 Jul 2010 11:36:51 -0000 1.2 |
| 23 |
@@ -1,8 +1,20 @@ |
| 24 |
diff --git a/Makefile_LINUX_gcc42 b/Makefile_LINUX_gcc42 |
| 25 |
-index 52c5286..5d922a7 100644 |
| 26 |
+index 52c5286..5c894a0 100644 |
| 27 |
--- a/Makefile_LINUX_gcc42 |
| 28 |
+++ b/Makefile_LINUX_gcc42 |
| 29 |
-@@ -282,7 +282,7 @@ SHAR = /usr/bin/shar |
| 30 |
+@@ -250,7 +250,10 @@ |
| 31 |
+ |
| 32 |
+ |
| 33 |
+ # Version string |
| 34 |
+-VERSION = 0.9.0 |
| 35 |
++MAJOR = 0 |
| 36 |
++MINOR = 9 |
| 37 |
++MICRO = 0 |
| 38 |
++VERSION = ${MAJOR}.${MINOR}.${MICRO} |
| 39 |
+ |
| 40 |
+ |
| 41 |
+ # |
| 42 |
+@@ -282,7 +285,7 @@ SHAR = /usr/bin/shar |
| 43 |
# |
| 44 |
# Program to use to create archives |
| 45 |
# |
| 46 |
@@ -11,7 +23,7 @@ |
| 47 |
|
| 48 |
# |
| 49 |
# Program to use to add an index to an archive |
| 50 |
-@@ -292,13 +292,13 @@ RANLIB = /usr/bin/ranlib |
| 51 |
+@@ -292,13 +295,13 @@ RANLIB = /usr/bin/ranlib |
| 52 |
# |
| 53 |
# Program to use to decompress a data file |
| 54 |
# |
| 55 |
@@ -27,7 +39,7 @@ |
| 56 |
|
| 57 |
# |
| 58 |
# Program to use to generate a signature |
| 59 |
-@@ -486,9 +486,9 @@ F90SOURCE = $(SRC)/fcb_atol_wcnt.f90 \ |
| 60 |
+@@ -486,9 +489,9 @@ F90SOURCE = $(SRC)/fcb_atol_wcnt.f90 \ |
| 61 |
$(SRC)/fcb_read_image.f90 \ |
| 62 |
$(SRC)/fcb_read_line.f90 \ |
| 63 |
$(SRC)/fcb_read_xds_i2.f90 \ |
| 64 |
@@ -40,30 +52,53 @@ |
| 65 |
|
| 66 |
|
| 67 |
# |
| 68 |
-@@ -849,7 +849,7 @@ endif |
| 69 |
- $(SOLIB)/libcbf.so: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB) |
| 70 |
+@@ -663,7 +666,7 @@ all:: $(BIN)/test_xds_binary \ |
| 71 |
+ $(BIN)/test_fcb_read_image |
| 72 |
+ endif |
| 73 |
+ |
| 74 |
+-shared: $(SOLIB)/libcbf.so $(SOLIB)/libfcb.so $(SOLIB)/libimg.so |
| 75 |
++shared: $(SOLIB)/libcbf.so.${VERSION} $(SOLIB)/libfcb.so.${VERSION} $(SOLIB)/libimg.so.${VERSION} |
| 76 |
+ |
| 77 |
+ javawrapper: shared $(JAVADIR) $(JAVADIR)/cbflib-$(VERSION).jar $(SOLIB)/libcbf_wrap.so |
| 78 |
+ |
| 79 |
+@@ -846,10 +849,11 @@ ifneq ($(RANLIB),) |
| 80 |
+ $(RANLIB) $@ |
| 81 |
+ endif |
| 82 |
+ |
| 83 |
+-$(SOLIB)/libcbf.so: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB) |
| 84 |
++$(SOLIB)/libcbf.so.${VERSION}: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB) |
| 85 |
$(CC) $(CFLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(SOURCE) |
| 86 |
mv *.o $(SOLIB) |
| 87 |
- $(CC) -o $@ $(SOLIB)/*.o $(SOLDFLAGS) $(EXTRALIBS) |
| 88 |
+ $(CC) $(LDFLAGS) -Wl,-soname,libcbf.so.$(VERSION) $(SOCFLAGS) $(SOLDFLAGS) -o $@ $(SOLIB)/*.o $(EXTRALIBS) |
| 89 |
++ ln -sf libcbf.so.$(VERSION) $(SOLIB)/libcbf.so |
| 90 |
|
| 91 |
# |
| 92 |
# IMG library |
| 93 |
-@@ -864,7 +864,7 @@ endif |
| 94 |
+@@ -862,9 +866,10 @@ ifneq ($(RANLIB),) |
| 95 |
+ endif |
| 96 |
+ rm img.o |
| 97 |
|
| 98 |
- $(SOLIB)/libimg.so: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB) |
| 99 |
+-$(SOLIB)/libimg.so: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB) |
| 100 |
++$(SOLIB)/libimg.so.${VERSION}: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB) |
| 101 |
$(CC) $(CFLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(EXAMPLES)/img.c |
| 102 |
- $(CC) -o $@ img.o $(SOLDFLAGS) |
| 103 |
+ $(CC) $(LDFLAGS) -Wl,-soname,libimg.so.$(VERSION) $(SOCFLAGS) $(SOLDFLAGS) -o $@ img.o |
| 104 |
++ ln -sf libimg.so.$(VERSION) $(SOLIB)/libimg.so |
| 105 |
rm img.o |
| 106 |
|
| 107 |
# |
| 108 |
-@@ -891,7 +891,7 @@ endif |
| 109 |
- $(SOLIB)/libfcb.so: $(F90SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB) |
| 110 |
+@@ -888,10 +893,11 @@ else |
| 111 |
+ echo "Define F90C to build $(LIB)/libfcb.a" |
| 112 |
+ endif |
| 113 |
+ |
| 114 |
+-$(SOLIB)/libfcb.so: $(F90SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB) |
| 115 |
++$(SOLIB)/libfcb.so.${VERSION}: $(F90SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB) |
| 116 |
ifneq ($(F90C),) |
| 117 |
$(F90C) $(F90FLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(F90SOURCE) |
| 118 |
- $(F90C) $(F90FLAGS) -o $@ *.o $(SOLDFLAGS) |
| 119 |
-+ $(F90C) $(LDFLAGS) -Wl,-soname,libfcb.so.$(VERSION) $(SOCFLAGS) $(SOLDFLAGS) $(F90FLAGS) -o $@ *.o |
| 120 |
++ $(F90C) $(LDFLAGS) -Wl,-soname,libfcb.so.$(VERSION) $(SOCFLAGS) $(SOLDFLAGS) $(F90FLAGS) -o $@ *.o |
| 121 |
++ ln -sf libfcb.so.$(VERSION) $(SOLIB)/libfcb.so |
| 122 |
rm *.o |
| 123 |
else |
| 124 |
echo "Define F90C to build $(SOLIB)/libfcb.so" |
Archives