| 1 |
bicatali 13/05/23 19:03:15 |
| 2 |
|
| 3 |
Modified: sofa_c-makefile.patch |
| 4 |
Log: |
| 5 |
Fixed tests, thanks Roman Zilka, bug #470950 |
| 6 |
|
| 7 |
(Portage version: 2.2.01.21938-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 sci-astronomy/sofa_c/files/sofa_c-makefile.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-astronomy/sofa_c/files/sofa_c-makefile.patch?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-astronomy/sofa_c/files/sofa_c-makefile.patch?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-astronomy/sofa_c/files/sofa_c-makefile.patch?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: sofa_c-makefile.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sci-astronomy/sofa_c/files/sofa_c-makefile.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- sofa_c-makefile.patch 23 Apr 2013 15:57:06 -0000 1.1 |
| 23 |
+++ sofa_c-makefile.patch 23 May 2013 19:03:15 -0000 1.2 |
| 24 |
@@ -1,5 +1,5 @@ |
| 25 |
---- makefile.orig 2013-04-23 08:51:44.357363792 -0700 |
| 26 |
-+++ makefile 2013-04-23 08:52:06.663480924 -0700 |
| 27 |
+--- makefile.orig 2013-05-22 20:51:58.398491342 +0000 |
| 28 |
++++ makefile 2013-05-22 21:05:52.055466710 +0000 |
| 29 |
@@ -49,7 +49,7 @@ |
| 30 |
|
| 31 |
# Specify the installation home directory. |
| 32 |
@@ -36,7 +36,16 @@ |
| 33 |
# Name the SOFA/C testbed in its source and target locations. |
| 34 |
|
| 35 |
SOFA_TEST_NAME = t_sofa_c.c |
| 36 |
-@@ -285,29 +292,31 @@ |
| 37 |
+@@ -88,7 +95,7 @@ |
| 38 |
+ # Name the SOFA/C includes in their source and target locations. |
| 39 |
+ |
| 40 |
+ SOFA_INC_NAMES = sofa.h sofam.h |
| 41 |
+-SOFA_INC = $(SOFA_INC_DIR)sofa.h $(SOFA_INC_DIR)sofam.h |
| 42 |
++SOFA_INC = $(SOFA_INC_NAMES:%=$(SOFA_INC_DIR)%) |
| 43 |
+ |
| 44 |
+ # The list of SOFA/C library object files. |
| 45 |
+ SOFA_OBS = iauA2af.o \ |
| 46 |
+@@ -285,29 +292,32 @@ |
| 47 |
#----------------------------------------------------------------------- |
| 48 |
|
| 49 |
# Build (but do not install) the library. |
| 50 |
@@ -66,8 +75,10 @@ |
| 51 |
+ $(CCOMPC) $(CFLAGX) $(SOFA_TEST_NAME) $(SOFA_SHLIB_NAME).0.0 \ |
| 52 |
-lm -o $(SOFA_TEST) |
| 53 |
- ./$(SOFA_TEST) |
| 54 |
-+ LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):$(SOFA_LIB_DIR) ./$(SOFA_TEST) |
| 55 |
- rm -f $(SOFA_TEST) |
| 56 |
+- rm -f $(SOFA_TEST) |
| 57 |
++ ln -s $(SOFA_SHLIB_NAME).0.0 $(SOFA_SHLIB_NAME).0 |
| 58 |
++ LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):." ./$(SOFA_TEST) |
| 59 |
++ rm -f $(SOFA_TEST) $(SOFA_SHLIB_NAME).0 |
| 60 |
|
| 61 |
# Test the installed library. |
| 62 |
-installcheck test: $(SOFA_TEST_NAME) $(SOFA_INC) $(SOFA_LIB) |
| 63 |
@@ -75,7 +86,7 @@ |
| 64 |
$(CCOMPC) $(CFLAGX) $(SOFA_TEST_NAME) -I$(SOFA_INC_DIR) \ |
| 65 |
-L$(SOFA_LIB_DIR) -lsofa_c -lm -o $(SOFA_TEST) |
| 66 |
./$(SOFA_TEST) |
| 67 |
-@@ -315,11 +324,11 @@ |
| 68 |
+@@ -315,11 +325,11 @@ |
| 69 |
|
| 70 |
# Local clean up. |
| 71 |
clean realclean: |
| 72 |
@@ -89,7 +100,7 @@ |
| 73 |
|
| 74 |
# Create the installation directories if not already present. |
| 75 |
$(INSTALL_DIRS): |
| 76 |
-@@ -329,6 +338,10 @@ |
| 77 |
+@@ -329,6 +339,10 @@ |
| 78 |
$(SOFA_LIB_NAME): $(SOFA_OBS) |
| 79 |
ar ru $(SOFA_LIB_NAME) $? |
Archives