| 1 |
jlec 10/04/28 19:56:18 |
| 2 |
|
| 3 |
Added: 0.9.0-Makefile.patch |
| 4 |
Log: |
| 5 |
Version Bump, #317261 |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 sci-libs/cbflib/files/0.9.0-Makefile.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/cbflib/files/0.9.0-Makefile.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/cbflib/files/0.9.0-Makefile.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: 0.9.0-Makefile.patch |
| 15 |
=================================================================== |
| 16 |
diff --git a/Makefile_LINUX_gcc42 b/Makefile_LINUX_gcc42 |
| 17 |
index 52c5286..5d922a7 100644 |
| 18 |
--- a/Makefile_LINUX_gcc42 |
| 19 |
+++ b/Makefile_LINUX_gcc42 |
| 20 |
@@ -282,7 +282,7 @@ SHAR = /usr/bin/shar |
| 21 |
# |
| 22 |
# Program to use to create archives |
| 23 |
# |
| 24 |
-AR = /usr/bin/ar |
| 25 |
+AR = ar |
| 26 |
|
| 27 |
# |
| 28 |
# Program to use to add an index to an archive |
| 29 |
@@ -292,13 +292,13 @@ RANLIB = /usr/bin/ranlib |
| 30 |
# |
| 31 |
# Program to use to decompress a data file |
| 32 |
# |
| 33 |
-DECOMPRESS = /usr/bin/bunzip2 |
| 34 |
+DECOMPRESS = bunzip2 |
| 35 |
|
| 36 |
|
| 37 |
# |
| 38 |
# Program to use to compress a data file |
| 39 |
# |
| 40 |
-COMPRESS = /usr/bin/bzip2 |
| 41 |
+COMPRESS = bzip2 |
| 42 |
|
| 43 |
# |
| 44 |
# Program to use to generate a signature |
| 45 |
@@ -486,9 +486,9 @@ F90SOURCE = $(SRC)/fcb_atol_wcnt.f90 \ |
| 46 |
$(SRC)/fcb_read_image.f90 \ |
| 47 |
$(SRC)/fcb_read_line.f90 \ |
| 48 |
$(SRC)/fcb_read_xds_i2.f90 \ |
| 49 |
- $(SRC)/fcb_skip_whitespace.f90 \ |
| 50 |
- $(EXAMPLES)/test_fcb_read_image.f90 \ |
| 51 |
- $(EXAMPLES)/test_xds_binary.f90 |
| 52 |
+ $(SRC)/fcb_skip_whitespace.f90 |
| 53 |
+# $(EXAMPLES)/test_fcb_read_image.f90 \ |
| 54 |
+# $(EXAMPLES)/test_xds_binary.f90 |
| 55 |
|
| 56 |
|
| 57 |
# |
| 58 |
@@ -849,7 +849,7 @@ endif |
| 59 |
$(SOLIB)/libcbf.so: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB) |
| 60 |
$(CC) $(CFLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(SOURCE) |
| 61 |
mv *.o $(SOLIB) |
| 62 |
- $(CC) -o $@ $(SOLIB)/*.o $(SOLDFLAGS) $(EXTRALIBS) |
| 63 |
+ $(CC) $(LDFLAGS) -Wl,-soname,libcbf.so.$(VERSION) $(SOCFLAGS) $(SOLDFLAGS) -o $@ $(SOLIB)/*.o $(EXTRALIBS) |
| 64 |
|
| 65 |
# |
| 66 |
# IMG library |
| 67 |
@@ -864,7 +864,7 @@ endif |
| 68 |
|
| 69 |
$(SOLIB)/libimg.so: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB) |
| 70 |
$(CC) $(CFLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(EXAMPLES)/img.c |
| 71 |
- $(CC) -o $@ img.o $(SOLDFLAGS) |
| 72 |
+ $(CC) $(LDFLAGS) -Wl,-soname,libimg.so.$(VERSION) $(SOCFLAGS) $(SOLDFLAGS) -o $@ img.o |
| 73 |
rm img.o |
| 74 |
|
| 75 |
# |
| 76 |
@@ -891,7 +891,7 @@ endif |
| 77 |
$(SOLIB)/libfcb.so: $(F90SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB) |
| 78 |
ifneq ($(F90C),) |
| 79 |
$(F90C) $(F90FLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(F90SOURCE) |
| 80 |
- $(F90C) $(F90FLAGS) -o $@ *.o $(SOLDFLAGS) |
| 81 |
+ $(F90C) $(LDFLAGS) -Wl,-soname,libfcb.so.$(VERSION) $(SOCFLAGS) $(SOLDFLAGS) $(F90FLAGS) -o $@ *.o |
| 82 |
rm *.o |
| 83 |
else |
| 84 |
echo "Define F90C to build $(SOLIB)/libfcb.so" |
Archives