Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package di for openSUSE:Factory checked in
at 2025-02-11 21:23:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/di (Old)
and /work/SRC/openSUSE:Factory/.di.new.19470 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "di"
Tue Feb 11 21:23:32 2025 rev:2 rq:1244853 version:5.0.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/di/di.changes 2025-02-10 17:55:37.777710429
+0100
+++ /work/SRC/openSUSE:Factory/.di.new.19470/di.changes 2025-02-11
21:25:00.775214823 +0100
@@ -1,0 +2,6 @@
+Mon Feb 10 19:44:29 UTC 2025 - Andreas Stieger <andreas.stie...@gmx.de>
+
+- Update to 5.0.6:
+ * build system fixes and compiler warning fixes
+
+-------------------------------------------------------------------
Old:
----
di-5.0.5.tar.gz
New:
----
di-5.0.6.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ di.spec ++++++
--- /var/tmp/diff_new_pack.VEWwfr/_old 2025-02-11 21:25:01.959263775 +0100
+++ /var/tmp/diff_new_pack.VEWwfr/_new 2025-02-11 21:25:01.963263940 +0100
@@ -19,7 +19,7 @@
%define sover 5
Name: di
-Version: 5.0.5
+Version: 5.0.6
Release: 0
Summary: Disk Information Utility
License: Zlib
++++++ di-5.0.5.tar.gz -> di-5.0.6.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/di-5.0.5/CMakeLists.txt new/di-5.0.6/CMakeLists.txt
--- old/di-5.0.5/CMakeLists.txt 2025-02-08 16:42:35.000000000 +0100
+++ new/di-5.0.6/CMakeLists.txt 2025-02-10 14:40:37.000000000 +0100
@@ -32,6 +32,10 @@
endif()
endif()
+if (NOT DEFINED DI_BUILD_SYS OR DI_BUILD_SYS STREQUAL "")
+ set (DI_BUILD_SYS cmake)
+endif()
+
###
# check to make sure cmake-install-prefix is set
if (NOT DEFINED CMAKE_INSTALL_PREFIX OR CMAKE_INSTALL_PREFIX STREQUAL "")
@@ -71,6 +75,19 @@
include (CheckVariableExists)
include (CheckPrototypeDefinition)
+# MacOS cmake uses a path for the compiler that doesn't
+# have the proper include paths built in.
+# /Library/Developer/CommandLineTools/usr/bin/cc
+# I consider this a bug.
+# I don't know what the path for the xcode compiler is, but it
+# probably starts with /Library/Developer
+# this is only used for getting the xdc member types, so
+# it doesn't matter much which compiler, just need one that works.
+set (MYCC ${CMAKE_C_COMPILER})
+if (APPLE AND ${CMAKE_C_COMPILER} MATCHES "^/Library/Developer/")
+ set (MYCC /usr/bin/clang)
+endif()
+
#### compile options
macro (checkAddCompileFlag flag)
@@ -131,6 +148,8 @@
checkAddCompileFlag ("-Wno-documentation-unknown-command")
checkAddCompileFlag ("-Wno-documentation")
checkAddCompileFlag ("-Wno-unsafe-buffer-usage")
+# llvm-19 creating errors about *printf
+checkAddCompileFlag ("-Wno-used-but-marked-unused")
###
# LFS_CFLAGS, LFS_LDFLAGS, LFS_LIBS
@@ -167,7 +186,7 @@
#### build compile options
-if (DI_BUILD STREQUAL "")
+if (NOT DEFINED DI_BUILD OR DI_BUILD STREQUAL "")
set (DI_BUILD "Release")
endif()
@@ -469,8 +488,14 @@
macro (memberxdr structnm membernm)
message ("-- Determining ${structnm} ${membernm} xdr type")
- file (WRITE ${membernm}.c "#include <rpcsvc/rquota.h>
-int main (int argc, char *argv []) { return 0; }
+ file (WRITE ${membernm}.c "
+#include <rpcsvc/rquota.h>
+
+int
+main (int argc, char *argv [])
+{
+ return 0;
+}
")
set (tinc ".")
if (NOT ${TIRPC_INCLUDE_DIRS} STREQUAL "")
@@ -479,7 +504,7 @@
execute_process (
OUTPUT_FILE ${membernm}.out
ERROR_QUIET
- COMMAND ${CMAKE_C_COMPILER} -I ${tinc} -E ${membernm}.c
+ COMMAND ${MYCC} -I ${tinc} -E ${membernm}.c
)
unset (tinc)
if (EXISTS ${membernm}.out)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/di-5.0.5/Makefile new/di-5.0.6/Makefile
--- old/di-5.0.5/Makefile 2025-02-08 16:04:02.000000000 +0100
+++ new/di-5.0.6/Makefile 2025-02-09 19:01:50.000000000 +0100
@@ -211,6 +211,7 @@
-DCMAKE_C_COMPILER=$(COMP) \
-DCMAKE_INSTALL_PREFIX="$(PREFIX)" \
-DDI_BUILD:STATIC=$(DI_BUILD) \
+ -DDI_BUILD_SYS:STATIC=make-cmake \
-S . -B $(BUILDDIR) -Werror=deprecated
# internal use
@@ -222,6 +223,7 @@
-DCMAKE_C_COMPILER=$(COMP) \
-DCMAKE_INSTALL_PREFIX="$(PREFIX)" \
-DDI_BUILD:STATIC=$(DI_BUILD) \
+ -DDI_BUILD_SYS:STATIC=make-cmake \
-G "MSYS Makefiles" \
-S . -B $(BUILDDIR) -Werror=deprecated
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/di-5.0.5/VERSION.txt new/di-5.0.6/VERSION.txt
--- old/di-5.0.5/VERSION.txt 2025-02-08 00:24:30.000000000 +0100
+++ new/di-5.0.6/VERSION.txt 2025-02-09 16:16:37.000000000 +0100
@@ -1,5 +1,5 @@
-DI_VERSION=5.0.5
-DI_LIBVERSION=5.0.5
+DI_VERSION=5.0.6
+DI_LIBVERSION=5.0.6
DI_SOVERSION=5
DI_RELEASE_STATUS=production
export DI_VERSION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/di-5.0.5/config.h.in new/di-5.0.6/config.h.in
--- old/di-5.0.5/config.h.in 2025-01-31 17:56:39.000000000 +0100
+++ new/di-5.0.6/config.h.in 2025-02-09 19:32:22.000000000 +0100
@@ -214,10 +214,10 @@
#endif /* MKC_STANDARD_DEFS */
#if ! defined (DI_PREFIX)
-# error "PREFIX is not set"
+# error "DI_PREFIX is not set"
#endif
-#define DI_BUILD_SYS "cmake"
+#define DI_BUILD_SYS "${DI_BUILD_SYS}"
#define DI_LOCALE_DIR DI_PREFIX "/share/locale"
#define DI_INTERNAL 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/di-5.0.5/didiskutil.c new/di-5.0.6/didiskutil.c
--- old/di-5.0.5/didiskutil.c 2025-01-31 17:11:08.000000000 +0100
+++ new/di-5.0.6/didiskutil.c 2025-02-09 19:52:09.000000000 +0100
@@ -310,6 +310,7 @@
convertNFSMountOptions (long flags, long wsize, long rsize, di_disk_info_t
*diptr)
{
#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunknown-warning-option"
#pragma clang diagnostic ignored "-Wunused-but-set-variable"
char *p;
char *end;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/di-5.0.5/dimath.h new/di-5.0.6/dimath.h
--- old/di-5.0.5/dimath.h 2025-01-31 00:10:10.000000000 +0100
+++ new/di-5.0.6/dimath.h 2025-02-09 17:38:59.000000000 +0100
@@ -66,6 +66,7 @@
#if _use_math == DI_GMP
# pragma clang diagnostic push
+# pragma clang diagnostic ignored "-Wunknown-warning-option"
# pragma clang diagnostic ignored "-Wsign-conversion"
# pragma clang diagnostic ignored "-Wreserved-identifier"
# pragma gcc diagnostic push
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/di-5.0.5/diquota.c new/di-5.0.6/diquota.c
--- old/di-5.0.5/diquota.c 2025-02-08 00:56:49.000000000 +0100
+++ new/di-5.0.6/diquota.c 2025-02-09 17:47:17.000000000 +0100
@@ -80,6 +80,7 @@
#if _hdr_rpc_rpc
/* tirpc is a separate library, but defines reserved symbols */
# pragma clang diagnostic push
+# pragma clang diagnostic ignored "-Wunknown-warning-option"
# pragma clang diagnostic ignored "-Wreserved-identifier"
# include <rpc/rpc.h>
# pragma clang diagnostic pop
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/di-5.0.5/mkc_config/di-env.mkc
new/di-5.0.6/mkc_config/di-env.mkc
--- old/di-5.0.5/mkc_config/di-env.mkc 2025-02-04 00:40:21.000000000 +0100
+++ new/di-5.0.6/mkc_config/di-env.mkc 2025-02-09 16:23:03.000000000 +0100
@@ -24,33 +24,28 @@
addcflag -Werror=return-type
addcflag -Wunreachable-code
-if notusingcplusplus == _MKCONFIG_USING_GNU_LD Y && ! ==
_MKCONFIG_USING_CPLUSPLUS Y
- addcflag -Wdeclaration-after-statement
- addcflag -Wmissing-prototypes
-endif
+addcflag -Wdeclaration-after-statement
+addcflag -Wmissing-prototypes
-if UsingGCC == _MKCONFIG_USING_GCC Y
- addcflag -Wmaybe-uninitialized
- addcflag -Wno-unused-but-set-variable
- addcflag -Wno-stringop-overflow
- addcflag -Wno-stringop-truncation
- addcflag -Wno-format-truncation
-endif
-if UsingCLANG == _MKCONFIG_USING_CLANG Y
- addcflag -Wno-extra-semi-stmt
- addcflag -Wno-unsafe-buffer-usage
- addcflag -Wno-poison-system-directories
- addcflag -Wno-shift-sign-overflow
- addcflag -Wno-pragma-pack
- addcflag -Wno-ignored-attributes
- addcflag -Wno-reserved-id-macro
- addcflag -Wno-implicit-int-conversion
- addcflag -Wno-switch-enum
- addcflag -Wno-gnu-zero-variadic-macro-arguments
- addcflag -Wno-documentation-deprecated-sync
- addcflag -Wno-documentation-unknown-command
- addcflag -Wno-documentation
-endif
+addcflag -Wmaybe-uninitialized
+addcflag -Wno-unused-but-set-variable
+addcflag -Wno-stringop-overflow
+addcflag -Wno-stringop-truncation
+addcflag -Wno-format-truncation
+addcflag -Wno-extra-semi-stmt
+addcflag -Wno-unsafe-buffer-usage
+addcflag -Wno-poison-system-directories
+addcflag -Wno-shift-sign-overflow
+addcflag -Wno-pragma-pack
+addcflag -Wno-ignored-attributes
+addcflag -Wno-reserved-id-macro
+addcflag -Wno-implicit-int-conversion
+addcflag -Wno-switch-enum
+addcflag -Wno-gnu-zero-variadic-macro-arguments
+addcflag -Wno-documentation-deprecated-sync
+addcflag -Wno-documentation-unknown-command
+addcflag -Wno-documentation
+addcflag -Wno-used-but-marked-unused
env DI_FORTIFY
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/di-5.0.5/mkc_config/di.mkc
new/di-5.0.6/mkc_config/di.mkc
--- old/di-5.0.5/mkc_config/di.mkc 2025-02-04 02:46:52.000000000 +0100
+++ new/di-5.0.6/mkc_config/di.mkc 2025-02-09 19:43:57.000000000 +0100
@@ -286,7 +286,7 @@
include
#if ! defined (DI_PREFIX)
-# error "PREFIX is not set"
+# error "DI_PREFIX is not set"
#endif
#define DI_BUILD_SYS "mkconfig"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/di-5.0.5/utils/chklibnm.sh
new/di-5.0.6/utils/chklibnm.sh
--- old/di-5.0.5/utils/chklibnm.sh 2025-02-08 00:44:16.000000000 +0100
+++ new/di-5.0.6/utils/chklibnm.sh 2025-02-09 19:28:39.000000000 +0100
@@ -9,6 +9,14 @@
rc=$?
# there is another os that uses lib64, but I don't recall which one
# at the moment...
+ if [ $rc -ne 0 ]; then
+ grep -l 'Calculate Linux' /etc/os-release > /dev/null 2>&1
+ rc=$?
+ fi
+ if [ $rc -ne 0 ]; then
+ grep -l 'Arch Linux' /etc/os-release > /dev/null 2>&1
+ rc=$?
+ fi
fi
if [ $rc -eq 0 ]; then
