From bff543bb632933380da922cbfc07c67157d72d42 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 23 Jun 2024 00:11:31 +0100 Subject: gentoo auto-resync : 23:06:2024 - 00:11:30 --- sci-astronomy/sofa_c/Manifest | 1 - sci-astronomy/sofa_c/files/sofa_c-makefile.patch | 105 ----------------------- 2 files changed, 106 deletions(-) delete mode 100644 sci-astronomy/sofa_c/files/sofa_c-makefile.patch (limited to 'sci-astronomy/sofa_c') diff --git a/sci-astronomy/sofa_c/Manifest b/sci-astronomy/sofa_c/Manifest index 892db999444d..bf333d9d63ce 100644 --- a/sci-astronomy/sofa_c/Manifest +++ b/sci-astronomy/sofa_c/Manifest @@ -1,5 +1,4 @@ AUX sofa_c-20231011-makefile.patch 3335 BLAKE2B 6db237a3684ca2cf4661e03756c9b7443b21546b2d7019e4342e3e37c4e23b3087f0322ccc860b171c7cf1aef777d9a04665752a5270f0336e5d6c6359a16648 SHA512 8ae7ec5051069ba3fe5317fcefdb5d5deffbb8cfa6f80ee285e8eab095d35866d0ad26e8205626e0482dddef9db290c8310857b91ae178814898bd918b94066c -AUX sofa_c-makefile.patch 3345 BLAKE2B 4d137b742018c5b589d2dc2c834d3171c5caeb1778061cf0de07755cbc246d8bed1eb1d59f225813de77da25ea9d155192f2d4d6080316e2343c895173d6f064 SHA512 a38248d3912ef68aecbc2ed1b28181378b2c92a470b1447865f1cf9d9475f7fbc584ff1bcf7184e563f298b72b0284c81e4b905757208459cebb9b7cb4dbc26b DIST sofa_c-20231011.tar.gz 3055571 BLAKE2B 4a2771599af61f06cab76c83af8d8bac321258bd2145f7558be9a7afed3b5cefc13bea2a24d05f9a7481409e617f807f4e29173d87ab58a403808d43aae477a5 SHA512 8e7d67f7ac7a285a96160c96d16b1921ccb7a9324b83280b1594efcbbd7eb78c4d41898c1e5acfa5081842e4aeee15a96572d21b466bfda7ef7582c58624d376 EBUILD sofa_c-20231011.ebuild 753 BLAKE2B 0c75f0ed0dc7aa4a215bc7549799f0c9a8a36d29ee9f5d514297a08054bebc3da99e642d46482b79bfea603eed59d8917e063f046cd9b08896a055ddd1178d75 SHA512 b731e3f9108e928b3a5b6f3564b2211a0d225a97910e0adaad570ffce2946b0dca6b14d701c45c61095e2982e18979e97bc82860a09de8c73e8c73652265f004 MISC metadata.xml 977 BLAKE2B 1389565e20033490916bf9736c74d539ec0ac890a1cad5d7c579e203207a1d03cd0e5bb10a25f06767bd15da2afd90dd40e2b55982964f1b88649c51b1c4cae5 SHA512 255e0513f247fae86a7227afbc18d2b0269cef2f6648562572db48ca5a2501dfb7743c40ea7b91562a18c4ca312a10f3cf7b104c9cc25dfa986c3371a0247238 diff --git a/sci-astronomy/sofa_c/files/sofa_c-makefile.patch b/sci-astronomy/sofa_c/files/sofa_c-makefile.patch deleted file mode 100644 index 00c1a6ae735d..000000000000 --- a/sci-astronomy/sofa_c/files/sofa_c-makefile.patch +++ /dev/null @@ -1,105 +0,0 @@ ---- src/makefile.orig -+++ src/makefile -@@ -49,7 +49,7 @@ - - # Specify the installation home directory. - --INSTALL_DIR = $(HOME) -+INSTALL_DIR = $(DESTDIR)/usr - - # Specify the installation directory for the library. - -@@ -63,9 +63,9 @@ - # of your preferred C compiler (CCOMPC) and compilation flags (CFLAGF - # for functions, CFLAGX for executables) here. - --CCOMPC = gcc --CFLAGF = -c -pedantic -Wall -W -O --CFLAGX = -pedantic -Wall -W -O -+CCOMPC = $(CC) -+CFLAGF = $(CPPFLAGS) -I. -c -fPIC $(CFLAGS) -+CFLAGX = $(CPPFLAGS) -I. $(CFLAGS) - - #----YOU SHOULDN'T HAVE TO MODIFY ANYTHING BELOW THIS LINE--------- - -@@ -80,6 +80,11 @@ - SOFA_LIB_NAME = libsofa_c.a - SOFA_LIB = $(SOFA_LIB_DIR)$(SOFA_LIB_NAME) - -+# Name the SOFA/C library in its source and target locations. -+ -+SOFA_SHLIB_NAME = libsofa_c.so -+SOFA_SHLIB = $(SOFA_LIB_DIR)$(SOFA_SHLIB_NAME) -+ - # Name the SOFA/C testbed in its source and target locations. - - SOFA_TEST_NAME = t_sofa_c.c -@@ -88,7 +93,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. - -@@ -321,28 +326,31 @@ - #----------------------------------------------------------------------- - - # Build (but do not install) the library. --all : $(SOFA_LIB_NAME) -+all : $(SOFA_SHLIB_NAME) - -@ echo "" - -@ echo "*** Now type 'make test'" \ - " to install the library and run tests ***" - -@ echo "" - - # Install the library and header files. --install $(SOFA_LIB) : $(INSTALL_DIRS) $(SOFA_LIB_NAME) $(SOFA_INC) -- cp $(SOFA_LIB_NAME) $(SOFA_LIB_DIR) -+install: $(INSTALL_DIRS) $(SOFA_SHLIB_NAME) $(SOFA_INC) -+ cp $(SOFA_SHLIB_NAME).0.0 $(SOFA_LIB_DIR) -+ ln -s $(SOFA_SHLIB_NAME).0.0 $(SOFA_SHLIB).0 -+ ln -s $(SOFA_SHLIB_NAME).0 $(SOFA_SHLIB) -+ - - # Deinstall the library and header files. - uninstall: -- - $(RM) $(SOFA_LIB) $(SOFA_INC) -+ - $(RM) $(SOFA_LIB) $(SOFA_SHLIB)* $(SOFA_INC) - - # Test the build. --check: $(SOFA_TEST_NAME) $(SOFA_INC_NAMES) $(SOFA_LIB_NAME) -- $(CCOMPC) $(CFLAGX) $(SOFA_TEST_NAME) $(SOFA_LIB_NAME) \ -+check: $(SOFA_TEST_NAME) $(SOFA_INC_NAMES) $(SOFA_SHLIB_NAME) -+ $(CCOMPC) $(CFLAGX) $(SOFA_TEST_NAME) $(SOFA_SHLIB_NAME).0.0 \ - -lm -o $(SOFA_TEST) -- ./$(SOFA_TEST) -+ LD_LIBRARY_PATH="$${LD_LIBRARY_PATH}:." ./$(SOFA_TEST) - - # Test the installed library. --installcheck test: $(SOFA_TEST_NAME) $(SOFA_INC) $(SOFA_LIB) -+installcheck: $(SOFA_TEST_NAME) $(SOFA_INC) $(SOFA_LIB) - $(CCOMPC) $(CFLAGX) $(SOFA_TEST_NAME) -I$(SOFA_INC_DIR) \ - -L$(SOFA_LIB_DIR) -lsofa_c -lm -o $(SOFA_TEST) - ./$(SOFA_TEST) -@@ -353,7 +361,7 @@ - - # Delete all generated binaries in the current directory. - realclean distclean : clean -- - $(RM) $(SOFA_LIB_NAME) $(SOFA_TEST) -+ - $(RM) $(SOFA_LIB_NAME) $(SOFA_SHLIB_NAME)* $(SOFA_TEST) - - # Create the installation directories if not already present. - $(INSTALL_DIRS): -@@ -363,6 +371,10 @@ - $(SOFA_LIB_NAME): $(SOFA_OBS) - ar ru $(SOFA_LIB_NAME) $? - -+$(SOFA_SHLIB_NAME): $(SOFA_OBS) -+ $(CC) $(LDFLAGS) -shared -Wl,-soname,$(SOFA_SHLIB_NAME).0 $? -lm -o $(SOFA_SHLIB_NAME).0.0 -+ ln -sfn $(SOFA_SHLIB_NAME).0.0 $(SOFA_SHLIB_NAME).0 -+ - # Install the header files. - $(SOFA_INC) : $(INSTALL_DIRS) $(SOFA_INC_NAMES) - cp $(SOFA_INC_NAMES) $(SOFA_INC_DIR) -- cgit v1.2.3