summaryrefslogtreecommitdiff
path: root/sci-libs/silo/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-02-02 01:39:05 +0000
committerV3n3RiX <venerix@koprulu.sector>2022-02-02 01:39:05 +0000
commitfcc5224904648a8e6eb528d7603154160a20022f (patch)
tree3bfce096b38a9cea8eed13fc70c1526c456e9abd /sci-libs/silo/files
parent2fd57282f0262ca084e05b0f2c63fbada395d02b (diff)
gentoo resync : 02.02.2022
Diffstat (limited to 'sci-libs/silo/files')
-rw-r--r--sci-libs/silo/files/silo-4.11-autoreconf.patch35
-rw-r--r--sci-libs/silo/files/silo-4.11-widgets.patch11
2 files changed, 11 insertions, 35 deletions
diff --git a/sci-libs/silo/files/silo-4.11-autoreconf.patch b/sci-libs/silo/files/silo-4.11-autoreconf.patch
deleted file mode 100644
index 371b346e921c..000000000000
--- a/sci-libs/silo/files/silo-4.11-autoreconf.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Author: Alastair McKinstry <mckinstry@debian.org>
-Description: Fixes needed for autoreconf to work on Debian
- When autoreconf is run, VL_LIB_READLINE is lost from aclocal, so included in config/
- Also include AX_CHECK_COMPLER_FLAG() which is not in autoconf (just autoconf-archive)
- AX_CHECK_COMPILER_FLAGS() is obsolete
-Last-Updated: 2021-01-14
-Forwarded: no
-Link: https://sources.debian.org/patches/silo-llnl/4.11-2/autoreconf.patch/
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -195,6 +195,8 @@
- dnl This allows multiple src-dir builds within one host.
- AC_PREFIX_DEFAULT("SILO_TOP_SRC_DIR")
-
-+AC_PROG_F77
-+
- dnl
- dnl Handle the python module right away to determine if we need shared libs.
- dnl Ordinarily, we default to static libs
-@@ -618,10 +620,10 @@
- # it is an argument to the -D argument. So, I think this is
- # just totally bogus!
- # Default to large file support
--AX_CHECK_COMPILER_FLAGS("-D_LARGEFILE_SOURCE",CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE";)
--AX_CHECK_COMPILER_FLAGS("-D_LARGEFILE64_SOURCE",CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE";)
--AX_CHECK_COMPILER_FLAGS("-D_FILE_OFFSET_BITS=64",CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64";)
--AX_CHECK_COMPILER_FLAGS("-Wdeclaration-after-statement",CFLAGS="$CFLAGS -Wdeclaration-after-statement";)
-+AX_CHECK_COMPILE_FLAG("-D_LARGEFILE_SOURCE",CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE";)
-+AX_CHECK_COMPILE_FLAG("-D_LARGEFILE64_SOURCE",CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE";)
-+AX_CHECK_COMPILE_FLAG("-D_FILE_OFFSET_BITS=64",CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64";)
-+AX_CHECK_COMPILE_FLAG("-Wdeclaration-after-statement",CFLAGS="$CFLAGS -Wdeclaration-after-statement";)
-
- #
- # Note: regardless of what the stuff above regarding large file support
diff --git a/sci-libs/silo/files/silo-4.11-widgets.patch b/sci-libs/silo/files/silo-4.11-widgets.patch
new file mode 100644
index 000000000000..46ef1834ca22
--- /dev/null
+++ b/sci-libs/silo/files/silo-4.11-widgets.patch
@@ -0,0 +1,11 @@
+On a minimal QT installation, widgets may not necessarily be
+added and it needs to be explicitely done. Modifying ./configure
+directly given tarball lacks some files to run eautoreconf.
+
+https://bugs.gentoo.org/831361
+--- a/configure
++++ b/configure
+@@ -25748,2 +25748,3 @@
+ qtHaveModule(testlib): QT += testlib
++qtHaveModule(widgets): QT += widgets
+ percent.target = %