Archives
Archives
| From: | "Justin Lecher (jlec)" <jlec@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in sci-libs/cbflib/files: 0.8.1-as-needed.patch 0.8.1-parallel.patch |
| Date: | Sat, 06 Feb 2010 19:35:14 |
| Message-Id: | E1NdqQy-0006bC-HI@stork.gentoo.org |
| 1 | jlec 10/02/06 19:35:12 |
| 2 | |
| 3 | Added: 0.8.1-as-needed.patch 0.8.1-parallel.patch |
| 4 | Log: |
| 5 | Fix for parallel and as-needed build issues |
| 6 | (Portage version: 2.2_rc62/cvs/Linux x86_64) |
| 7 | |
| 8 | Revision Changes Path |
| 9 | 1.1 sci-libs/cbflib/files/0.8.1-as-needed.patch |
| 10 | |
| 11 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/cbflib/files/0.8.1-as-needed.patch?rev=1.1&view=markup |
| 12 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/cbflib/files/0.8.1-as-needed.patch?rev=1.1&content-type=text/plain |
| 13 | |
| 14 | Index: 0.8.1-as-needed.patch |
| 15 | =================================================================== |
| 16 | diff --git a/Makefile_LINUX_gcc42 b/Makefile_LINUX_gcc42 |
| 17 | index e5912ce..20f8a4d 100644 |
| 18 | --- a/Makefile_LINUX_gcc42 |
| 19 | +++ b/Makefile_LINUX_gcc42 |
| 20 | @@ -844,7 +845,7 @@ endif |
| 21 | |
| 22 | $(SOLIB)/libcbf.so: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB) |
| 23 | $(CC) $(CFLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(SOURCE) |
| 24 | - $(CC) -o $@ *.o $(SOLDFLAGS) |
| 25 | + $(CC) $(SOLDFLAGS) -o $@ *.o |
| 26 | rm *.o |
| 27 | |
| 28 | # |
| 29 | @@ -860,7 +861,7 @@ endif |
| 30 | |
| 31 | $(SOLIB)/libimg.so: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB) |
| 32 | $(CC) $(CFLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(EXAMPLES)/img.c |
| 33 | - $(CC) -o $@ *.o $(SOLDFLAGS) |
| 34 | + $(CC) $(SOLDFLAGS) -o $@ *.o |
| 35 | rm *.o |
| 36 | |
| 37 | # |
| 38 | @@ -887,7 +888,7 @@ endif |
| 39 | $(SOLIB)/libfcb.so: $(F90SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB) |
| 40 | ifneq ($(F90C),) |
| 41 | $(F90C) $(F90FLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(F90SOURCE) |
| 42 | - $(F90C) -o $@ *.o $(SOLDFLAGS) |
| 43 | + $(F90C) $(SOLDFLAGS) -o $@ *.o |
| 44 | rm *.o |
| 45 | else |
| 46 | echo "Define F90C to build $(SOLIB)/libfcb.so" |
| 47 | |
| 48 | |
| 49 | |
| 50 | 1.1 sci-libs/cbflib/files/0.8.1-parallel.patch |
| 51 | |
| 52 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/cbflib/files/0.8.1-parallel.patch?rev=1.1&view=markup |
| 53 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/cbflib/files/0.8.1-parallel.patch?rev=1.1&content-type=text/plain |
| 54 | |
| 55 | Index: 0.8.1-parallel.patch |
| 56 | =================================================================== |
| 57 | diff --git a/Makefile_LINUX_gcc42 b/Makefile_LINUX_gcc42 |
| 58 | index e5912ce..be4a28a 100644 |
| 59 | --- a/Makefile_LINUX_gcc42 |
| 60 | +++ b/Makefile_LINUX_gcc42 |
| 61 | @@ -648,7 +648,8 @@ all:: $(BIN)/test_xds_binary \ |
| 62 | $(BIN)/test_fcb_read_image |
| 63 | endif |
| 64 | |
| 65 | -shared: $(SOLIB)/libcbf.so $(SOLIB)/libfcb.so $(SOLIB)/libimg.so |
| 66 | +shared: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB) \ |
| 67 | + $(SOLIB)/libcbf.so $(SOLIB)/libfcb.so $(SOLIB)/libimg.so |
| 68 | |
| 69 | javawrapper: shared $(JAVADIR) $(JAVADIR)/cbflib-$(VERSION).jar $(SOLIB)/libcbf_wrap.so |