public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Conrad Kostecki" <conikost@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/sofa_c/files/
Date: Sat, 22 Jun 2024 18:54:36 +0000 (UTC)	[thread overview]
Message-ID: <1719082241.6f3cf0037b7704fd05655618249a75a518875777.conikost@gentoo> (raw)

commit:     6f3cf0037b7704fd05655618249a75a518875777
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Jun 18 17:28:32 2024 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Jun 22 18:50:41 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f3cf003

sci-astronomy/sofa_c: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 sci-astronomy/sofa_c/files/sofa_c-makefile.patch | 105 -----------------------
 1 file changed, 105 deletions(-)

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)


             reply	other threads:[~2024-06-22 18:54 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-06-22 18:54 Conrad Kostecki [this message]
  -- strict thread matches above, loose matches on Subject: below --
2017-07-06 21:31 [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/sofa_c/files/ Sebastien Fabbro

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1719082241.6f3cf0037b7704fd05655618249a75a518875777.conikost@gentoo \
    --to=conikost@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox