* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/sofa_c/, sci-astronomy/sofa_c/files/
@ 2016-02-29 22:16 Sebastien Fabbro
0 siblings, 0 replies; 2+ messages in thread
From: Sebastien Fabbro @ 2016-02-29 22:16 UTC (permalink / raw
To: gentoo-commits
commit: df61d4ce347c741e58f74b088ed257fd5182ca0e
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 29 20:44:13 2016 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Mon Feb 29 23:12:59 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df61d4ce
sci-astronomy/sofa_c: Version bump and cleanup
Package-Manager: portage-2.2.27
sci-astronomy/sofa_c/Manifest | 2 +-
sci-astronomy/sofa_c/files/sofa_c-makefile.patch | 56 ++++++++++------------
..._c-20120301a.ebuild => sofa_c-20150209a.ebuild} | 14 +++---
3 files changed, 33 insertions(+), 39 deletions(-)
diff --git a/sci-astronomy/sofa_c/Manifest b/sci-astronomy/sofa_c/Manifest
index cead38f..078a0f3 100644
--- a/sci-astronomy/sofa_c/Manifest
+++ b/sci-astronomy/sofa_c/Manifest
@@ -1 +1 @@
-DIST sofa_c-20120301_a.tar.gz 1267551 SHA256 3534538b4abda067ef07f1aaef869f3b72ddc7f246447558b708d2968e63e66f SHA512 00da8e834e790922200c25b55cba3b48e49770cbada2271e4b7720f5170a422c9a47e6ebd1c51787256e88aaa656c347f21add14fbc353a9346d395ea3eda2c2 WHIRLPOOL d4f13d08b6ff1f67c808ba09858cd0f77664031ea466b71fc65f48f09bd216cd384db7660b574385d1c65ddcbdd5f894a2631335be557ffb29f1b8703d517a46
+DIST sofa_c-20150209_a.tar.gz 1685051 SHA256 b542c5e4ca42d91ada3c66e8d5b86eb9dec085bf1a07d058c01920c6c0b1174a SHA512 45524228db30c388315ce76c1d85db422fac09da3c3ed1442e362a6a2b4a10d27c19ea4a2d51c854280102a99706663622e0375b4afbf096b79877e7602fec4c WHIRLPOOL f4b084145cb3b9c2d722885ed89d2b8298d8fa4a21da25778852d76d20342331c3e7e2c6e28b3d0df04bc9bdf6fc921fe0e60f545ca91dcf69fe86316252006f
diff --git a/sci-astronomy/sofa_c/files/sofa_c-makefile.patch b/sci-astronomy/sofa_c/files/sofa_c-makefile.patch
index b992d40..3a942e3 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-05-22 20:51:58.398491342 +0000
-+++ makefile 2013-05-22 21:05:52.055466710 +0000
+--- src/makefile.orig
++++ src/makefile
@@ -49,7 +49,7 @@
# Specify the installation home directory.
@@ -9,7 +9,7 @@
# Specify the installation directory for the library.
-@@ -63,9 +63,10 @@
+@@ -63,9 +63,9 @@
# of your preferred C compiler (CCOMPC) and compilation flags (CFLAGF
# for functions, CFLAGX for executables) here.
@@ -17,17 +17,15 @@
-CFLAGF = -c -pedantic -Wall -W -O
-CFLAGX = -pedantic -Wall -W -O
+CCOMPC = $(CC)
-+CFLAGF = -c -pedantic -Wall -W -fPIC $(CFLAGS)
-+CFLAGX = -pedantic -Wall -W $(CFLAGS)
-+
++CFLAGF = $(CPPFLAGS) -I. -c -fPIC $(CFLAGS)
++CFLAGX = $(CPPFLAGS) -I. $(CFLAGS)
#----YOU SHOULDN'T HAVE TO MODIFY ANYTHING BELOW THIS LINE---------
-@@ -80,6 +81,12 @@
+@@ -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
@@ -36,7 +34,7 @@
# Name the SOFA/C testbed in its source and target locations.
SOFA_TEST_NAME = t_sofa_c.c
-@@ -88,7 +95,7 @@
+@@ -88,7 +93,7 @@
# Name the SOFA/C includes in their source and target locations.
SOFA_INC_NAMES = sofa.h sofam.h
@@ -44,8 +42,8 @@
+SOFA_INC = $(SOFA_INC_NAMES:%=$(SOFA_INC_DIR)%)
# The list of SOFA/C library object files.
- SOFA_OBS = iauA2af.o \
-@@ -285,29 +292,32 @@
+
+@@ -321,28 +326,31 @@
#-----------------------------------------------------------------------
# Build (but do not install) the library.
@@ -63,22 +61,21 @@
+ 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.
- deinstall:
-- rm -f $(SOFA_LIB) $(SOFA_INC)
-+ rm -f $(SOFA_LIB) $(SOFA_SHLIB)* $(SOFA_INC)
+ 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)
+-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)
-- 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
++ LD_LIBRARY_PATH="$${LD_LIBRARY_PATH}:." ./$(SOFA_TEST)
# Test the installed library.
-installcheck test: $(SOFA_TEST_NAME) $(SOFA_INC) $(SOFA_LIB)
@@ -86,27 +83,22 @@
$(CCOMPC) $(CFLAGX) $(SOFA_TEST_NAME) -I$(SOFA_INC_DIR) \
-L$(SOFA_LIB_DIR) -lsofa_c -lm -o $(SOFA_TEST)
./$(SOFA_TEST)
-@@ -315,11 +325,11 @@
+@@ -353,7 +361,7 @@
- # Local clean up.
- clean realclean:
-- rm -f $(SOFA_OBS) $(SOFA_LIB_NAME)
-+ rm -f $(SOFA_OBS) $(SOFA_LIB_NAME) $(SOFA_SHLIB_NAME)
-
- # Clean up and deinstall.
- distclean:
-- rm -f $(SOFA_OBS) $(SOFA_LIB_NAME) $(SOFA_INC) $(SOFA_LIB)
-+ rm -f $(SOFA_OBS) $(SOFA_LIB_NAME) $(SOFA_INC) $(SOFA_LIB) $(SOFA_SHLIB_NAME)
+ # 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):
-@@ -329,6 +339,10 @@
+@@ -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 $?
-+
++ $(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)
diff --git a/sci-astronomy/sofa_c/sofa_c-20120301a.ebuild b/sci-astronomy/sofa_c/sofa_c-20150209a.ebuild
similarity index 77%
rename from sci-astronomy/sofa_c/sofa_c-20120301a.ebuild
rename to sci-astronomy/sofa_c/sofa_c-20150209a.ebuild
index 55d0acf..39ee91a 100644
--- a/sci-astronomy/sofa_c/sofa_c-20120301a.ebuild
+++ b/sci-astronomy/sofa_c/sofa_c-20150209a.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
-inherit eutils flag-o-matic multilib
+inherit toolchain-funcs
YYYY=${PV:0:4}
MMDD=${PV:4:4}
@@ -22,16 +22,18 @@ IUSE="doc"
RDEPEND=""
DEPEND=""
+PATCHES=( "${FILESDIR}/${PN}-makefile.patch" )
+
S="${WORKDIR}/sofa/${MYPV}/c/src"
src_prepare() {
- epatch "${FILESDIR}"/${PN}-makefile.patch
+ default
sed -i -e "s:/lib:/$(get_libdir):" makefile || die
- replace-flags -O? -O1
+ tc-export CC
}
src_install() {
- emake DESTDIR="${ED}" -j1 install
+ emake DESTDIR="${ED}" install
cd ..
dodoc 00READ.ME
use doc && dodoc doc/*.lis doc/*.pdf
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/sofa_c/, sci-astronomy/sofa_c/files/
@ 2024-05-31 6:52 Arthur Zamarin
0 siblings, 0 replies; 2+ messages in thread
From: Arthur Zamarin @ 2024-05-31 6:52 UTC (permalink / raw
To: gentoo-commits
commit: 7b6316fc05397413bc3d08cb6dd13ae23adb30ce
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri May 31 06:51:25 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri May 31 06:51:55 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b6316fc
sci-astronomy/sofa_c: add 20231011, EAPI=8
Closes: https://bugs.gentoo.org/794757
Closes: https://bugs.gentoo.org/924304
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sci-astronomy/sofa_c/Manifest | 1 +
.../sofa_c/files/sofa_c-20231011-makefile.patch | 105 +++++++++++++++++++++
sci-astronomy/sofa_c/sofa_c-20231011.ebuild | 37 ++++++++
3 files changed, 143 insertions(+)
diff --git a/sci-astronomy/sofa_c/Manifest b/sci-astronomy/sofa_c/Manifest
index c35bfcf6b0ab..300957f6ed2b 100644
--- a/sci-astronomy/sofa_c/Manifest
+++ b/sci-astronomy/sofa_c/Manifest
@@ -1 +1,2 @@
DIST sofa_c-20170420.tar.gz 1780577 BLAKE2B 80912027893957345e080f02eed059f764970bbf6b89d6979c355a65d6d144edc8073b6a6436d11d36009eab05f5d9ccad0270a7feef117e576055be6d8489d5 SHA512 f2dd806243e3aec51ea03a54e10e533d4c3c1a69d032d5f3ddd7cd823a75aeed8033491c91366813b8d8e5c0b66e0fd582e6ede03aa7b136311fdd7a4ebf20d3
+DIST sofa_c-20231011.tar.gz 3055571 BLAKE2B 4a2771599af61f06cab76c83af8d8bac321258bd2145f7558be9a7afed3b5cefc13bea2a24d05f9a7481409e617f807f4e29173d87ab58a403808d43aae477a5 SHA512 8e7d67f7ac7a285a96160c96d16b1921ccb7a9324b83280b1594efcbbd7eb78c4d41898c1e5acfa5081842e4aeee15a96572d21b466bfda7ef7582c58624d376
diff --git a/sci-astronomy/sofa_c/files/sofa_c-20231011-makefile.patch b/sci-astronomy/sofa_c/files/sofa_c-20231011-makefile.patch
new file mode 100644
index 000000000000..9e923db1604a
--- /dev/null
+++ b/sci-astronomy/sofa_c/files/sofa_c-20231011-makefile.patch
@@ -0,0 +1,105 @@
+--- a/makefile
++++ b/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 -O
+-CFLAGX = -pedantic -Wall -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.
+
+@@ -347,28 +352,30 @@
+ #-----------------------------------------------------------------------
+
+ # 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) \
+- -I. -lm -o $(SOFA_TEST)
+- ./$(SOFA_TEST)
++check: $(SOFA_TEST_NAME) $(SOFA_INC_NAMES) $(SOFA_SHLIB_NAME)
++ $(CCOMPC) $(CFLAGX) $(SOFA_TEST_NAME) $(SOFA_SHLIB_NAME).0.0 \
++ -lm -o $(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)
+@@ -379,7 +386,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):
+@@ -389,6 +396,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)
diff --git a/sci-astronomy/sofa_c/sofa_c-20231011.ebuild b/sci-astronomy/sofa_c/sofa_c-20231011.ebuild
new file mode 100644
index 000000000000..fc542d499085
--- /dev/null
+++ b/sci-astronomy/sofa_c/sofa_c-20231011.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+YYYY=${PV:0:4}
+MMDD=${PV:4:4}
+MYPV=${YYYY}${MMDD}
+
+DESCRIPTION="Library for algorithms for models in fundamental astronomy"
+HOMEPAGE=" http://www.iausofa.org/current_C.html"
+SRC_URI="http://www.iausofa.org/${YYYY}_${MMDD}_C/${PN}-${MYPV}.tar.gz"
+S="${WORKDIR}/sofa/${MYPV}/c/src"
+
+LICENSE="SOFA"
+SLOT=0
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-makefile.patch
+)
+
+src_prepare() {
+ default
+ sed -e "s:/lib:/$(get_libdir):" -i makefile || die
+ tc-export CC
+}
+
+src_install() {
+ emake DESTDIR="${ED}" install
+ cd ..
+ dodoc 00READ.ME
+ use doc && dodoc doc/*.lis doc/*.pdf
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-05-31 6:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-31 6:52 [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/sofa_c/, sci-astronomy/sofa_c/files/ Arthur Zamarin
-- strict thread matches above, loose matches on Subject: below --
2016-02-29 22:16 Sebastien Fabbro
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox