Your message dated Sat, 24 Aug 2024 22:21:47 +0000
with message-id <e1shz8l-00enjo...@fasolo.debian.org>
and subject line Bug#1079306: Removed package(s) from unstable
has caused the Debian Bug report #1079187,
regarding openmx: Build fixes
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
1079187: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1079187
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Source: openmx
Source-Version: 3.8.5+dfsg1-1
Severity: normal
Tags: patch
Hi!
This package patches the upstream build system to include a dpkg make
fragment file so that it can pass build flags. This is rather
unorthodox, and makes the patch non-eligible for upstream submission.
And in addition, because the fragment file is getting included from a
subdir, which is an unsupported usage, this is causing errors such as:
,---
dpkg-buildapi: error: cannot read debian/control: No such file or directory
/bin/sh: 1: test: Illegal number:
`---
While checking how to fix this, I ended up noticing several other
issues, which I've fixed with the attached patch. I've only partially
tested it, because the packages currently FTBFS.
The patch does the following:
- Remove unused and wrongly set DEB_UPSTREAM_VERSION variable.
- Include dpkg/architecture.mk and dpkg/buildflags.mk and export all
build flags from debian/rules.
- Set -Dnosse into CFLAGS for DEB_HOST_ARCH_CPU other than amd64 from
debian/rules (instead of the upstream makefile, and instead of
using the wrong DEB_HOST_MULTIARCH variable).
- Change CC, FC and LIB variables to use CPPFLAGS, CFLAGS, FFLAGS and
LDFLAGS, instead of using explicit dpkg make fragments or programs.
Thanks,
Guillem
diff --git i/debian/patches/makefile.patch w/debian/patches/makefile.patch
index dd3b36d..1c66c10 100644
--- i/debian/patches/makefile.patch
+++ w/debian/patches/makefile.patch
@@ -7,35 +7,37 @@ Description: Adjust the makefile for the Debian build.
- Don't strip binary to be policy compliant.
Forwarded: not-needed
+---
+ source/makefile | 22 ++++++++++------------
+ 1 file changed, 10 insertions(+), 12 deletions(-)
+
--- a/source/makefile
+++ b/source/makefile
-@@ -135,11 +135,20 @@
+@@ -135,16 +135,14 @@
# LIB= -L/opt/acml5.3.0/ifort64_mp/lib -lacml_mp -liomp5 -Wl,-rpath=/opt/acml5.3.0/ifort64_mp/lib -Wl,-rpath=/opt/acml5.3.0/ifort64_mp/lib -L/opt/fftw-3.3.3/lib -lfftw3 -pgf90libs
#
--
--CC = mpicc -O3 -xHOST -ip -no-prec-div -openmp -I/opt/intel/mkl/include/fftw
--FC = mpif90 -O3 -xHOST -ip -no-prec-div -openmp
--LIB= -L/opt/intel/mkl/lib -mkl=parallel -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -lpthread -lifcore -lmpi -lmpi_f90 -lmpi_f77
--
-+include /usr/share/dpkg/default.mk
-+ifeq ($(DEB_HOST_MULTIARCH),amd64)
-+DEB_SSE =
-+else
-+DEB_SSE = -Dnosse
-+endif
-+
+#CC = mpicc -O3 -xHOST -ip -no-prec-div -openmp -I/opt/intel/mkl/include/fftw
+#FC = mpif90 -O3 -xHOST -ip -no-prec-div -openmp
+#LIB= -L/opt/intel/mkl/lib -mkl=parallel -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -lpthread -lifcore -lmpi -lmpi_f90 -lmpi_f77
+
-+CC = mpicc `dpkg-buildflags --get CPPFLAGS` `dpkg-buildflags --get CFLAGS` $(DEB_SSE) -fopenmp
-+FC = mpif90 `dpkg-buildflags --get CPPFLAGS` `dpkg-buildflags --get FFLAGS` -fopenmp
-+LIB = -lfftw3 -llapack -lblas `dpkg-buildflags --get LDFLAGS`
-
++CC = mpicc $(CPPFLAGS) $(CFLAGS) -fopenmp
++FC = mpif90 $(CPPFLAGS) $(FFLAGS) -fopenmp
++LIB = -lfftw3 -llapack -lblas $(LDFLAGS)
+-CC = mpicc -O3 -xHOST -ip -no-prec-div -openmp -I/opt/intel/mkl/include/fftw
+-FC = mpif90 -O3 -xHOST -ip -no-prec-div -openmp
+-LIB= -L/opt/intel/mkl/lib -mkl=parallel -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -lpthread -lifcore -lmpi -lmpi_f90 -lmpi_f77
+-
+-
+-
+-
+-
+-CFLAGS = -g
-@@ -250,7 +259,7 @@
+ OBJS = openmx.o openmx_common.o Input_std.o Inputtools.o \
+ init.o LU_inverse.o ReLU_inverse.o \
+@@ -250,7 +248,7 @@ UTIL = DosMain jx analysis_example esp
#
openmx: $(OBJS)
@@ -44,7 +46,7 @@ Forwarded: not-needed
#
#
-@@ -660,8 +669,8 @@
+@@ -660,8 +658,8 @@ Show_DFT_DATA.o: Show_DFT_DATA.c openmx_
#
install: $(PROG)
diff --git i/debian/rules w/debian/rules
index 02635a5..874d45b 100755
--- i/debian/rules
+++ w/debian/rules
@@ -4,9 +4,18 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+include /usr/share/dpkg/architecture.mk
+
+DPKG_EXPORT_BUILDFLAGS = 1
+
+ifneq ($(DEB_HOST_ARCH_CPU),amd64)
+export DEB_CFLAGS_MAINT_APPEND = -Dnosse
+endif
+
+include /usr/share/dpkg/buildflags.mk
include /usr/share/dpkg/pkg-info.mk
-DEB_UPSTREAM_VERSION=$DEB_{SOURCE,VERSION}
-export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
%:
--- End Message ---
--- Begin Message ---
Version: 3.8.5+dfsg1-1+rm
Dear submitter,
as the package openmx has just been removed from the Debian archive
unstable we hereby close the associated bug reports. We are sorry
that we couldn't deal with your issue properly.
For details on the removal, please see https://bugs.debian.org/1079306
The version of this package that was in Debian prior to this removal
can still be found using https://snapshot.debian.org/.
Please note that the changes have been done on the master archive and
will not propagate to any mirrors until the next dinstall run at the
earliest.
This message was generated automatically; if you believe that there is
a problem with it please contact the archive administrators by mailing
ftpmas...@ftp-master.debian.org.
Debian distribution maintenance software
pp.
Scott Kitterman (the ftpmaster behind the curtain)
--- End Message ---
--
debian-science-maintainers mailing list
debian-science-maintainers@alioth-lists.debian.net
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-science-maintainers
