commit 5f59382d0ba0102be3ca995b1bb54658d04e9f8a
Author: Jakub Bogusz <[email protected]>
Date: Thu Dec 19 20:33:20 2024 +0100
- fixed x32 build
hdf-opt.patch | 17 ++++++++++++++---
hdf.spec | 8 ++++----
2 files changed, 18 insertions(+), 7 deletions(-)
---
diff --git a/hdf.spec b/hdf.spec
index 37ce21c..bb060cd 100644
--- a/hdf.spec
+++ b/hdf.spec
@@ -147,6 +147,10 @@ Dokumentacja javadoc do interfejsu HDF do Javy (JHI).
%patch -P3 -p1
%patch -P5 -p1
+%ifarch x32
+ln -s linux-gnu config/linux-gnux32
+%endif
+
%build
%{__libtoolize}
%{__aclocal}
@@ -159,12 +163,8 @@ Dokumentacja javadoc do interfejsu HDF do Javy (JHI).
%else
%define gfortran %{_target_cpu}-pld-linux-gfortran
%endif
-%define gfortran_version %(%{gfortran} -dumpversion)
%configure \
F77="%{gfortran}" \
-%if "%{_ver_ge '%{gfortran_version}' '10.0'}" == "1"
- XXXFFLAGS="%{rpmcflags} -fallow-argument-mismatch" \
-%endif
--enable-fortran \
%{?with_java:--enable-java} \
--enable-shared \
diff --git a/hdf-opt.patch b/hdf-opt.patch
index ddb4752..08c1c7d 100644
--- a/hdf-opt.patch
+++ b/hdf-opt.patch
@@ -16,7 +16,7 @@
case $F77_BASENAME in
- gfortran)
-+ *gfortran*)
++ *gfortran)
if test $cc_vers_major -ge 10; then
FFLAGS="$FFLAGS -fallow-argument-mismatch"
else
@@ -54,5 +54,16 @@
PROFILE_FFLAGS="-pg"
;;
esac
---- ../BUILD/hdf-4.2.16-2/config/gnu-fflags.orig 2024-12-18
20:41:47.971906652 +0100
-+++ ../BUILD/hdf-4.2.16-2/config/gnu-fflags 2024-12-18 20:54:55.677639283
+0100
+--- hdf-4.2.16-2/config/linux-gnu.orig 2023-03-02 20:23:25.000000000 +0100
++++ hdf-4.2.16-2/config/linux-gnu 2024-12-19 19:46:41.375974527 +0100
+@@ -46,6 +46,10 @@ else
+ f95*|pgf90*)
+ ;;
+
++ *gfortran)
++ F77_BASENAME=gfortran
++ ;;
++
+ *)
+ # Figure out which compiler we are using: pgf90 or Absoft f95
+ RM='rm -f'
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/hdf.git/commitdiff/5f59382d0ba0102be3ca995b1bb54658d04e9f8a
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
