mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 03:30:05 +02:00
CFITSIO - Added symlinks in build: fix (#4847)
* First ctfitsio draft Co-authored-by: Gabriele Baldassarre <gabriele.baldassarre@mrm-mccann.com> Co-authored-by: Jérôme Duval <jerome.duval@gmail.com>
This commit is contained in:
Gabriele Baldassarre
committed by
GitHub
GitHub
parent
b0342d8c28
commit
a888fe5c01
@@ -8,9 +8,10 @@ LICENSE="CFITSIO"
|
||||
REVISION="2"
|
||||
SOURCE_URI="http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="418516f10ee1e0f1b520926eeca6b77ce639bed88804c7c545e74f26b3edf4ef"
|
||||
PATCHES="cfitsio-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="!x86_gcc2 x86 x86_64 ?arm ?ppc ?sparc"
|
||||
SECONDARY_ARCHITECTURES="x86 x86_64"
|
||||
ARCHITECTURES="!x86_gcc2 x86_64 ?arm ?ppc ?sparc"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
PROVIDES="
|
||||
cfitsio$secondaryArchSuffix = $portVersion
|
||||
@@ -19,27 +20,51 @@ PROVIDES="
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libbz2$secondaryArchSuffix
|
||||
lib:libcrypto$secondaryArchSuffix
|
||||
lib:libcurl$secondaryArchSuffix
|
||||
lib:libgfortran$secondaryArchSuffix
|
||||
lib:libnghttp2$secondaryArchSuffix
|
||||
lib:libssl$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PROVIDES_devel="
|
||||
cfitsio${secondaryArchSuffix}_devel = $portVersion
|
||||
devel:libcfitsio = $portVersion
|
||||
devel:libcfitsio$secondaryArchSuffix = $portVersion
|
||||
"
|
||||
REQUIRES_devel="
|
||||
cfitsio$secondaryArchSuffix == $portVersion
|
||||
cfitsio$secondaryArchSuffix == $portVersion base
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libbz2$secondaryArchSuffix
|
||||
lib:libcrypto$secondaryArchSuffix
|
||||
lib:libcurl$secondaryArchSuffix
|
||||
lib:libgfortran$secondaryArchSuffix
|
||||
lib:libnghttp2$secondaryArchSuffix
|
||||
lib:libssl$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PROVIDES_utils="
|
||||
cfitsio${secondaryArchSuffix}_utils = $portVersion
|
||||
cmd:fpack$secondaryArchSuffix = $portVersion
|
||||
cmd:funpack$secondaryArchSuffix = $portVersion
|
||||
"
|
||||
REQUIRES_utils="
|
||||
cfitsio$secondaryArchSuffix == $portVersion base
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libbz2$secondaryArchSuffix
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libbz2$secondaryArchSuffix
|
||||
devel:libgfortran$secondaryArchSuffix
|
||||
devel:libcurl$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:aclocal
|
||||
cmd:autoreconf
|
||||
cmd:awk
|
||||
cmd:cmp
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:gfortran$secondaryArchSuffix
|
||||
cmd:make
|
||||
@@ -51,19 +76,27 @@ TEST_REQUIRES="
|
||||
|
||||
BUILD()
|
||||
{
|
||||
WITHSSE=""
|
||||
if [ $effectiveTargetArchitecture == x86_64 ]; then
|
||||
GCC5FLAGS="--enable-x86-64"
|
||||
fi
|
||||
WITHSSE="--enable-ssse3"
|
||||
fi
|
||||
|
||||
runConfigure ./configure --enable-reentrant --enable-ssse3 --with-bzip2
|
||||
sed -e 's|LDFLAGS=.*|LDFLAGS="$LDFLAGS"|g' -i configure.in
|
||||
|
||||
autoreconf -vfi
|
||||
runConfigure ./configure --enable-reentrant --with-bzip2 $WITHSSE
|
||||
|
||||
make $jobArgs
|
||||
make utils $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install
|
||||
|
||||
rm -f $libDir/libcfitsio.a
|
||||
|
||||
prepareInstalledDevelLib libcfitsio
|
||||
fixPkgconfig
|
||||
|
||||
@@ -73,10 +106,14 @@ INSTALL()
|
||||
|
||||
# devel package
|
||||
packageEntries devel $developDir
|
||||
|
||||
# util package
|
||||
packageEntries utils $binDir
|
||||
}
|
||||
|
||||
TEST()
|
||||
{
|
||||
export LIBRARY_PATH=".:$LIBRARY_PATH"
|
||||
make testprog
|
||||
testprog > testprog.lis
|
||||
diff testprog.lis testprog.out
|
||||
|
||||
106
sci-libs/cfitsio/patches/cfitsio-3.47.patchset
Normal file
106
sci-libs/cfitsio/patches/cfitsio-3.47.patchset
Normal file
@@ -0,0 +1,106 @@
|
||||
From 9ec0e9d76c475bb5d951c57fccb2579064146296 Mon Sep 17 00:00:00 2001
|
||||
From: Gabriele Baldassarre <gabriele@gabrielebaldassarre.com>
|
||||
Date: Mon, 6 Apr 2020 16:18:48 +0000
|
||||
Subject: Added Haiku support to autotools
|
||||
|
||||
|
||||
diff --git a/configure.in b/configure.in
|
||||
index 69cabc1..4887824 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -146,6 +146,11 @@ case $host in
|
||||
ARCH="hp"
|
||||
EXT="hpu"
|
||||
;;
|
||||
+ *haiku*)
|
||||
+ # Haiku can be arm, i386 or x86_64
|
||||
+ ARCH=`uname -p`
|
||||
+ EXT="haiku"
|
||||
+ ;;
|
||||
*irix*)
|
||||
ARCH="sgi"
|
||||
EXT="sgi"
|
||||
@@ -315,6 +320,11 @@ case $host in
|
||||
AC_DEFINE(_LARGEFILE_SOURCE)
|
||||
AC_DEFINE(_FILE_OFFSET_BITS,64)
|
||||
;;
|
||||
+ *haiku*)
|
||||
+ # For large file support:
|
||||
+ AC_DEFINE(_LARGEFILE_SOURCE)
|
||||
+ AC_DEFINE(_FILE_OFFSET_BITS,64)
|
||||
+ ;;
|
||||
*mingw32*)
|
||||
AC_MSG_CHECKING([for large file support])
|
||||
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <stdio.h>],
|
||||
@@ -421,6 +431,11 @@ case $EXT in
|
||||
CFITSIO_SHLIB="lib\${PACKAGE}\${SHLIB_SUFFIX}.\${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}"
|
||||
CFITSIO_SHLIB_SONAME="lib\${PACKAGE}\${SHLIB_SUFFIX}.\${CFITSIO_SONAME}"
|
||||
;;
|
||||
+ haiku)
|
||||
+ SHLIB_LD=":"
|
||||
+ CFITSIO_SHLIB="lib\${PACKAGE}\${SHLIB_SUFFIX}.\${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}"
|
||||
+ CFITSIO_SHLIB_SONAME="lib\${PACKAGE}\${SHLIB_SUFFIX}.\${CFITSIO_SONAME}"
|
||||
+ ;;
|
||||
osf)
|
||||
SHLIB_LD="ld -shared -expect_unresolved '*'"
|
||||
LD_FLAGS="-taso"
|
||||
--
|
||||
2.26.0
|
||||
|
||||
|
||||
From 51552ef99510116d7760a60a6997013c0356af3d Mon Sep 17 00:00:00 2001
|
||||
From: Gabriele Baldassarre <gabriele@gabrielebaldassarre.com>
|
||||
Date: Fri, 10 Apr 2020 16:49:23 +0000
|
||||
Subject: Removed nonworking and undocumented utils
|
||||
|
||||
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index 2ee3f74..65282d5 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -119,7 +119,7 @@ install: lib${PACKAGE}.a ${INSTALL_DIRS}
|
||||
done
|
||||
/bin/cp fitsio.h fitsio2.h longnam.h drvrsmem.h ${CFITSIO_INCLUDE}
|
||||
/bin/cp cfitsio.pc ${CFITSIO_LIB}/pkgconfig
|
||||
- @for task in ${FPACK_UTILS} ${UTILS}; do \
|
||||
+ @for task in ${FPACK_UTILS}; do \
|
||||
if [ -f $$task ]; then \
|
||||
if [ ! -d ${CFITSIO_BIN} ]; then mkdir -p ${CFITSIO_BIN}; fi; \
|
||||
echo "/bin/cp $$task ${CFITSIO_BIN}"; \
|
||||
@@ -134,7 +134,7 @@ UTILS = cookbook fitscopy imcopy smem speed testprog
|
||||
|
||||
FPACK_UTILS = fpack funpack
|
||||
|
||||
-utils: ${FPACK_UTILS} ${UTILS}
|
||||
+utils: ${FPACK_UTILS}
|
||||
|
||||
swapproc.o: swapproc.c
|
||||
${CC} -c ${CFLAGS} ${CPPFLAGS} ${SSE_FLAGS} ${DEFS} $<
|
||||
--
|
||||
2.26.0
|
||||
|
||||
|
||||
From d2fdc7fefb349b12497e55a6b17144e1535ba97f Mon Sep 17 00:00:00 2001
|
||||
From: Gabriele Baldassarre <gabriele@gabrielebaldassarre.com>
|
||||
Date: Sun, 19 Apr 2020 17:11:04 +0000
|
||||
Subject: Added network in search-libs
|
||||
|
||||
|
||||
diff --git a/configure.in b/configure.in
|
||||
index 4887824..dcc61f1 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -643,8 +643,8 @@ AC_CHECK_FUNC(fmemopen, AC_DEFINE(HAVE_FMEMOPEN), [AC_MSG_WARN(Disabling support
|
||||
# ==================== END OF SHARED MEMORY DRIVER SECTION ================
|
||||
# ================= test for the unix networking functions ================
|
||||
|
||||
-AC_SEARCH_LIBS([gethostbyname], [nsl], cfitsio_have_nsl=1, cfitsio_have_nsl=0)
|
||||
-AC_SEARCH_LIBS([connect], [socket], cfitsio_have_socket=1,
|
||||
+AC_SEARCH_LIBS([gethostbyname], [nsl network], cfitsio_have_nsl=1, cfitsio_have_nsl=0)
|
||||
+AC_SEARCH_LIBS([connect], [socket network], cfitsio_have_socket=1,
|
||||
cfitsio_have_socket=0, [-lnsl])
|
||||
|
||||
if test "$cfitsio_have_nsl" = 1 -a "$cfitsio_have_socket" = 1; then
|
||||
--
|
||||
2.26.0
|
||||
|
||||
Reference in New Issue
Block a user