diff options
| author |   Sebastien Fabbro <bicatali@gentoo.org> | 2013-05-23 19:03:15 +0000 |
|---|---|---|
| committer | Sebastien Fabbro <bicatali@gentoo.org> | 2013-05-23 19:03:15 +0000 |
| commit | 6041c5713869cfd120a62f214a711c76d70ece0a (patch) | |
| tree | 0bf8c52cedb486ab1f6111792f91d67b34977f47 /sci-astronomy | |
| parent | Version bump, bug 458350. (diff) | |
| download | historical-6041c5713869cfd120a62f214a711c76d70ece0a.tar.gz historical-6041c5713869cfd120a62f214a711c76d70ece0a.tar.bz2 historical-6041c5713869cfd120a62f214a711c76d70ece0a.zip | |
Fixed tests, thanks Roman Zilka, bug #470950
Package-Manager: portage-2.2.01.21938-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360
Diffstat (limited to 'sci-astronomy')
| -rw-r--r-- | sci-astronomy/sofa_c/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-astronomy/sofa_c/files/sofa_c-makefile.patch | 25 |
2 files changed, 23 insertions, 8 deletions
diff --git a/sci-astronomy/sofa_c/ChangeLog b/sci-astronomy/sofa_c/ChangeLog index 9ef4e33f4a5e..8e1f2c00da52 100644 --- a/sci-astronomy/sofa_c/ChangeLog +++ b/sci-astronomy/sofa_c/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-astronomy/sofa_c # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/sofa_c/ChangeLog,v 1.1 2013/04/23 15:57:06 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/sofa_c/ChangeLog,v 1.2 2013/05/23 19:03:15 bicatali Exp $ + + 23 May 2013; Sébastien Fabbro <bicatali@gentoo.org> + files/sofa_c-makefile.patch: + Fixed tests, thanks Roman Zilka, bug #470950 *sofa_c-20120301a (23 Apr 2013) diff --git a/sci-astronomy/sofa_c/files/sofa_c-makefile.patch b/sci-astronomy/sofa_c/files/sofa_c-makefile.patch index e0f0cb26af0b..b992d401d3fa 100644 --- a/sci-astronomy/sofa_c/files/sofa_c-makefile.patch +++ b/sci-astronomy/sofa_c/files/sofa_c-makefile.patch @@ -1,5 +1,5 @@ ---- makefile.orig 2013-04-23 08:51:44.357363792 -0700 -+++ makefile 2013-04-23 08:52:06.663480924 -0700 +--- makefile.orig 2013-05-22 20:51:58.398491342 +0000 ++++ makefile 2013-05-22 21:05:52.055466710 +0000 @@ -49,7 +49,7 @@ # Specify the installation home directory. @@ -36,7 +36,16 @@ # Name the SOFA/C testbed in its source and target locations. SOFA_TEST_NAME = t_sofa_c.c -@@ -285,29 +292,31 @@ +@@ -88,7 +95,7 @@ + # Name the SOFA/C includes in their source and target locations. + + SOFA_INC_NAMES = sofa.h sofam.h +-SOFA_INC = $(SOFA_INC_DIR)sofa.h $(SOFA_INC_DIR)sofam.h ++SOFA_INC = $(SOFA_INC_NAMES:%=$(SOFA_INC_DIR)%) + + # The list of SOFA/C library object files. + SOFA_OBS = iauA2af.o \ +@@ -285,29 +292,32 @@ #----------------------------------------------------------------------- # Build (but do not install) the library. @@ -66,8 +75,10 @@ + $(CCOMPC) $(CFLAGX) $(SOFA_TEST_NAME) $(SOFA_SHLIB_NAME).0.0 \ -lm -o $(SOFA_TEST) - ./$(SOFA_TEST) -+ LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):$(SOFA_LIB_DIR) ./$(SOFA_TEST) - rm -f $(SOFA_TEST) +- rm -f $(SOFA_TEST) ++ ln -s $(SOFA_SHLIB_NAME).0.0 $(SOFA_SHLIB_NAME).0 ++ LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):." ./$(SOFA_TEST) ++ rm -f $(SOFA_TEST) $(SOFA_SHLIB_NAME).0 # Test the installed library. -installcheck test: $(SOFA_TEST_NAME) $(SOFA_INC) $(SOFA_LIB) @@ -75,7 +86,7 @@ $(CCOMPC) $(CFLAGX) $(SOFA_TEST_NAME) -I$(SOFA_INC_DIR) \ -L$(SOFA_LIB_DIR) -lsofa_c -lm -o $(SOFA_TEST) ./$(SOFA_TEST) -@@ -315,11 +324,11 @@ +@@ -315,11 +325,11 @@ # Local clean up. clean realclean: @@ -89,7 +100,7 @@ # Create the installation directories if not already present. $(INSTALL_DIRS): -@@ -329,6 +338,10 @@ +@@ -329,6 +339,10 @@ $(SOFA_LIB_NAME): $(SOFA_OBS) ar ru $(SOFA_LIB_NAME) $? |