From d29d35d22c47eed852d95cd7ea5b313d1c51929d Mon Sep 17 00:00:00 2001 From: Thomas Deutschmann Date: Thu, 21 Mar 2019 21:50:46 +0100 Subject: Fix compilation of dmraid Fixes: https://bugs.gentoo.org/642988 Fixes: https://bugs.gentoo.org/644094 Signed-off-by: Thomas Deutschmann --- .../dmraid-1.0.0.rc16-3-staticlink.patch | 18 ++++ .../dmraid-1.0.0_rc16-parallel-make.patch | 11 +++ .../dmraid-1.0.0_rc16-return-all-sets.patch | 11 +++ .../dmraid-1.0.0_rc16-static-build-fixes.patch | 110 +++++++++++++++++++++ .../dmraid-1.0.0_rc16-undo-p-rename.patch | 13 +++ .../dmraid/dmraid-1.0.0.rc16-3-staticlink.patch | 18 ---- patches/dmraid/dmraid-1.0.0_rc16-as-needed2.patch | 11 --- .../dmraid/dmraid-1.0.0_rc16-return-all-sets.patch | 11 --- .../dmraid-1.0.0_rc16-static-build-fixes.patch | 110 --------------------- .../dmraid/dmraid-1.0.0_rc16-undo-p-rename.patch | 13 --- 10 files changed, 163 insertions(+), 163 deletions(-) create mode 100644 patches/dmraid/1.0.0.rc16-3/dmraid-1.0.0.rc16-3-staticlink.patch create mode 100644 patches/dmraid/1.0.0.rc16-3/dmraid-1.0.0_rc16-parallel-make.patch create mode 100644 patches/dmraid/1.0.0.rc16-3/dmraid-1.0.0_rc16-return-all-sets.patch create mode 100644 patches/dmraid/1.0.0.rc16-3/dmraid-1.0.0_rc16-static-build-fixes.patch create mode 100644 patches/dmraid/1.0.0.rc16-3/dmraid-1.0.0_rc16-undo-p-rename.patch delete mode 100644 patches/dmraid/dmraid-1.0.0.rc16-3-staticlink.patch delete mode 100644 patches/dmraid/dmraid-1.0.0_rc16-as-needed2.patch delete mode 100644 patches/dmraid/dmraid-1.0.0_rc16-return-all-sets.patch delete mode 100644 patches/dmraid/dmraid-1.0.0_rc16-static-build-fixes.patch delete mode 100644 patches/dmraid/dmraid-1.0.0_rc16-undo-p-rename.patch (limited to 'patches') diff --git a/patches/dmraid/1.0.0.rc16-3/dmraid-1.0.0.rc16-3-staticlink.patch b/patches/dmraid/1.0.0.rc16-3/dmraid-1.0.0.rc16-3-staticlink.patch new file mode 100644 index 00000000..a80870f6 --- /dev/null +++ b/patches/dmraid/1.0.0.rc16-3/dmraid-1.0.0.rc16-3-staticlink.patch @@ -0,0 +1,18 @@ +diff -ruN dmraid-vanilla/1.0.0.rc16-3/dmraid/tools/Makefile.in dmraid/1.0.0.rc16-3/dmraid/tools/Makefile.in +--- dmraid-vanilla/1.0.0.rc16-3/dmraid/tools/Makefile.in 2010-05-31 13:18:31.000000000 +0200 ++++ dmraid/1.0.0.rc16-3/dmraid/tools/Makefile.in 2012-01-03 10:14:01.665000034 +0100 +@@ -46,10 +46,10 @@ + DMEVENTTOOLLIBS = -ldevmapper-event_dietc + endif + else +-# DMRAIDLIBS += -ldevmapper +-# ifeq ("@STATIC_LINK@", "no") +-# DMEVENTTOOLLIBS = -ldevmapper-event +-# endif ++ DMRAIDLIBS += -ldevmapper ++ ifeq ("@STATIC_LINK@", "no") ++ DMEVENTTOOLLIBS = -ldevmapper-event ++ endif + endif + + # DMRAIDLIBS += -lselinux diff --git a/patches/dmraid/1.0.0.rc16-3/dmraid-1.0.0_rc16-parallel-make.patch b/patches/dmraid/1.0.0.rc16-3/dmraid-1.0.0_rc16-parallel-make.patch new file mode 100644 index 00000000..8c893745 --- /dev/null +++ b/patches/dmraid/1.0.0.rc16-3/dmraid-1.0.0_rc16-parallel-make.patch @@ -0,0 +1,11 @@ +--- dmraid/1.0.0.rc16-3/dmraid/lib/Makefile.in.orig 2016-09-20 12:54:09.416628404 +0200 ++++ dmraid/1.0.0.rc16-3/dmraid/lib/Makefile.in 2016-09-20 12:55:06.343698229 +0200 +@@ -79,7 +79,7 @@ + -Wl,-soname,$(notdir $@).$(DMRAID_LIB_MAJOR) \ + $(DEVMAPPEREVENT_LIBS) $(DEVMAPPER_LIBS) $(DL_LIBS) $(LIBS) + +-$(LIB_EVENTS_SHARED): $(OBJECTS2) ++$(LIB_EVENTS_SHARED): $(OBJECTS2) $(LIB_SHARED) + $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJECTS2) \ + -shared -Wl,--discard-all -Wl,--no-undefined -Wl,-soname,$(notdir $@) \ + $(LIB_SHARED) $(DEVMAPPEREVENT_LIBS) $(DEVMAPPER_LIBS) $(PTHREAD_LIBS) $(LIBS) diff --git a/patches/dmraid/1.0.0.rc16-3/dmraid-1.0.0_rc16-return-all-sets.patch b/patches/dmraid/1.0.0.rc16-3/dmraid-1.0.0_rc16-return-all-sets.patch new file mode 100644 index 00000000..1e6c7132 --- /dev/null +++ b/patches/dmraid/1.0.0.rc16-3/dmraid-1.0.0_rc16-return-all-sets.patch @@ -0,0 +1,11 @@ +--- a/1.0.0.rc16/lib/metadata/metadata.c 2009-11-27 21:57:50.182129589 -0800 ++++ b/1.0.0.rc16/lib/metadata/metadata.c 2009-11-27 21:57:58.950964293 -0800 +@@ -839,7 +839,7 @@ + */ + if (T_GROUP(rs)) { + _discover_partitions(lc, &rs->sets); +- return; ++ continue; + } + + /* diff --git a/patches/dmraid/1.0.0.rc16-3/dmraid-1.0.0_rc16-static-build-fixes.patch b/patches/dmraid/1.0.0.rc16-3/dmraid-1.0.0_rc16-static-build-fixes.patch new file mode 100644 index 00000000..29881170 --- /dev/null +++ b/patches/dmraid/1.0.0.rc16-3/dmraid-1.0.0_rc16-static-build-fixes.patch @@ -0,0 +1,110 @@ +--- tools/Makefile.in.old 2010-05-31 07:18:31.000000000 -0400 ++++ tools/Makefile.in 2010-12-13 13:15:22.000000000 -0500 +@@ -60,17 +60,23 @@ + ifeq ("@KLIBC@", "no") + ifeq ("@STATIC_LINK@", "no") + LDFLAGS += -rdynamic ++ MYLIBOBJ=$(top_builddir)/lib/libdmraid.so + else + LDFLAGS += -static ++ MYLIBOBJ=$(top_builddir)/lib/libdmraid.a ++ DMRAIDLIBS += \ ++ $(DEVMAPPEREVENT_LIBS) \ ++ $(DEVMAPPER_LIBS) \ ++ $(DL_LIBS) + endif + endif + + .PHONY: install_dmraid_tools + +-dmraid: $(OBJECTS) $(top_builddir)/lib/libdmraid.a ++dmraid: $(OBJECTS) $(MYLIBOBJ) + $(CC) -o $@ $(OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib $(DMRAIDLIBS) $(LIBS) + +-dmevent_tool: $(OBJECTS2) $(top_builddir)/lib/libdmraid.a ++dmevent_tool: $(OBJECTS2) $(MYLIBOBJ) + $(CC) -o $@ $(OBJECTS2) $(INCLUDES) $(LDFLAGS) -L$(top_builddir)/lib \ + $(DMEVENTTOOLLIBS) $(DMRAIDLIBS) $(LIBS) + +--- lib/Makefile.in.old 2010-10-27 07:31:46.000000000 -0400 ++++ lib/Makefile.in 2010-12-13 13:04:16.000000000 -0500 +@@ -60,11 +60,11 @@ + USRLIB_RELPATH = $(shell echo $(abspath $(usrlibdir) $(libdir)) | \ + $(AWK) -f $(top_srcdir)/tools/relpath.awk) + +-TARGETS = $(LIB_STATIC) ++TARGETS = $(LIB_STATIC) $(LIB_SHARED) $(LIB_EVENTS_SHARED) + + ifeq ("@KLIBC@", "no") + ifeq ("@STATIC_LINK@", "no") +- TARGETS += $(LIB_SHARED) $(LIB_EVENTS_SHARED) ++ TARGETS = $(LIB_SHARED) $(LIB_EVENTS_SHARED) + endif + endif + +--- configure.in 2010-05-31 07:18:30.000000000 -0400 ++++ configure.in.new 2010-12-07 13:30:40.000000000 -0500 +@@ -155,6 +155,15 @@ + Default is dynamic linking]), + [STATIC_LINK=$enableval], [STATIC_LINK=no]) + ++if test "x$STATIC_LINK" != "xno"; then ++ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then ++ AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) ++ fi ++ PKG_CONFIG="${PKG_CONFIG} --static" ++ ac_cv_env_PKG_CONFIG_set=set ++fi ++PKG_PROG_PKG_CONFIG([0.2]) ++ + dnl Enables shared libdmraid + AC_ARG_ENABLE(shared_lib, + AC_HELP_STRING([--enable-shared_lib], [Use this to generate shared +@@ -248,23 +257,31 @@ + AC_HELP_STRING([--with-devmapper-prefix=PFX], + [Where is devmapper library installed]), + [DEVMAPPER_LIBS="-L$withval/lib" +- DEVMAPPER_CFLAGS="-I$withval/include"], ++ DEVMAPPER_CFLAGS="-I$withval/include" ++ dmprefix=$withval], + [DEVMAPPER_LIBS= +- DEVMAPPER_CFLAGS=]) +-save_LDFLAGS=$LDFLAGS +-save_CPPFLAGS=$CPPFLAGS +-LDFLAGS="$LDFLAGS $DEVMAPPER_LIBS" +-CPPFLAGS="$CPPFLAGS $DEVMAPPER_CFLAGS" +-AC_CHECK_LIB(devmapper-event, dm_event_handler_create, +- [DEVMAPPEREVENT_LIBS="$DEVMAPPER_LIBS -ldevmapper-event"], +- [AC_MSG_ERROR([device-mapper-event library is either missing or is too old and badly linked])]) +-AC_CHECK_LIB(devmapper, dm_task_set_name, +- [DEVMAPPER_LIBS="$DEVMAPPER_LIBS -ldevmapper"], +- [AC_MSG_ERROR([device-mapper library is missing])]) +-AC_CHECK_HEADERS(libdevmapper.h libdevmapper-event.h,, +- [AC_MSG_ERROR([Missing headers device-mapper headers])]) +-CPPFLAGS=$save_CPPFLAGS +-LDFLAGS=$save_LDFLAGS ++ DEVMAPPER_CFLAGS= ++ dmprefix=no]) ++if test "x$dmprefix" = xno ; then ++ PKG_CHECK_MODULES([DEVMAPPER],[devmapper], ++ [PKG_CHECK_MODULES([DEVMAPPEREVENT],[devmapper-event]) ++ ]) ++else ++ save_LDFLAGS=$LDFLAGS ++ save_CPPFLAGS=$CPPFLAGS ++ LDFLAGS="$LDFLAGS $DEVMAPPER_LIBS" ++ CPPFLAGS="$CPPFLAGS $DEVMAPPER_CFLAGS" ++ AC_CHECK_LIB(devmapper-event, dm_event_handler_create, ++ [DEVMAPPEREVENT_LIBS="$DEVMAPPER_LIBS -ldevmapper-event"], ++ [AC_MSG_ERROR([device-mapper-event library is either missing or is too old and badly linked])]) ++ AC_CHECK_LIB(devmapper, dm_task_set_name, ++ [DEVMAPPER_LIBS="$DEVMAPPER_LIBS -ldevmapper"], ++ [AC_MSG_ERROR([device-mapper library is missing])]) ++ AC_CHECK_HEADERS(libdevmapper.h libdevmapper-event.h,, ++ [AC_MSG_ERROR([Missing headers device-mapper headers])]) ++ CPPFLAGS=$save_CPPFLAGS ++ LDFLAGS=$save_LDFLAGS ++fi + + VERSION=$srcdir/tools/VERSION + DMRAID_LIB_MAJOR=$(cut -d. -f1 $VERSION) \ No newline at end of file diff --git a/patches/dmraid/1.0.0.rc16-3/dmraid-1.0.0_rc16-undo-p-rename.patch b/patches/dmraid/1.0.0.rc16-3/dmraid-1.0.0_rc16-undo-p-rename.patch new file mode 100644 index 00000000..6636b056 --- /dev/null +++ b/patches/dmraid/1.0.0.rc16-3/dmraid-1.0.0_rc16-undo-p-rename.patch @@ -0,0 +1,13 @@ +Author: Giuseppe Iuculano +Description: Removed "p" from device name. A proper upgrade script is needed before using it. +--- a/1.0.0.rc15/lib/format/partition/dos.c ++++ b/1.0.0.rc15/lib/format/partition/dos.c +@@ -31,7 +31,7 @@ _name(struct lib_context *lc, struct rai + { + const char *base = get_basename(lc, rd->di->path); + +- return type ? snprintf(str, len, "%s%s%u", base, OPT_STR_PARTCHAR(lc), ++ return type ? snprintf(str, len, "%s%u", base, + partition) : snprintf(str, len, "%s", base); + } + diff --git a/patches/dmraid/dmraid-1.0.0.rc16-3-staticlink.patch b/patches/dmraid/dmraid-1.0.0.rc16-3-staticlink.patch deleted file mode 100644 index a80870f6..00000000 --- a/patches/dmraid/dmraid-1.0.0.rc16-3-staticlink.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -ruN dmraid-vanilla/1.0.0.rc16-3/dmraid/tools/Makefile.in dmraid/1.0.0.rc16-3/dmraid/tools/Makefile.in ---- dmraid-vanilla/1.0.0.rc16-3/dmraid/tools/Makefile.in 2010-05-31 13:18:31.000000000 +0200 -+++ dmraid/1.0.0.rc16-3/dmraid/tools/Makefile.in 2012-01-03 10:14:01.665000034 +0100 -@@ -46,10 +46,10 @@ - DMEVENTTOOLLIBS = -ldevmapper-event_dietc - endif - else --# DMRAIDLIBS += -ldevmapper --# ifeq ("@STATIC_LINK@", "no") --# DMEVENTTOOLLIBS = -ldevmapper-event --# endif -+ DMRAIDLIBS += -ldevmapper -+ ifeq ("@STATIC_LINK@", "no") -+ DMEVENTTOOLLIBS = -ldevmapper-event -+ endif - endif - - # DMRAIDLIBS += -lselinux diff --git a/patches/dmraid/dmraid-1.0.0_rc16-as-needed2.patch b/patches/dmraid/dmraid-1.0.0_rc16-as-needed2.patch deleted file mode 100644 index cf301886..00000000 --- a/patches/dmraid/dmraid-1.0.0_rc16-as-needed2.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 1.0.0.rc16/make.tmpl.in 2010-08-16 10:22:32.000000000 -0400 -+++ 1.0.0.rc16/make.tmpl.in 2010-08-16 10:42:49.000000000 -0400 -@@ -136,7 +136,7 @@ - - %.so: $(OBJECTS) - $(CC) -shared -Wl,-soname,$(notdir $@).$(DMRAID_LIB_VERSION) \ -- -Wl,--version-script,.export.sym $(OBJECTS) -o $@ -ldevmapper-event -+ $(LDFLAGS) -Wl,--version-script,.export.sym $(OBJECTS) -o $@ -ldevmapper-event -ldl - - $(LIB_STATIC): $(OBJECTS) - $(RM) $@ diff --git a/patches/dmraid/dmraid-1.0.0_rc16-return-all-sets.patch b/patches/dmraid/dmraid-1.0.0_rc16-return-all-sets.patch deleted file mode 100644 index 1e6c7132..00000000 --- a/patches/dmraid/dmraid-1.0.0_rc16-return-all-sets.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/1.0.0.rc16/lib/metadata/metadata.c 2009-11-27 21:57:50.182129589 -0800 -+++ b/1.0.0.rc16/lib/metadata/metadata.c 2009-11-27 21:57:58.950964293 -0800 -@@ -839,7 +839,7 @@ - */ - if (T_GROUP(rs)) { - _discover_partitions(lc, &rs->sets); -- return; -+ continue; - } - - /* diff --git a/patches/dmraid/dmraid-1.0.0_rc16-static-build-fixes.patch b/patches/dmraid/dmraid-1.0.0_rc16-static-build-fixes.patch deleted file mode 100644 index 29881170..00000000 --- a/patches/dmraid/dmraid-1.0.0_rc16-static-build-fixes.patch +++ /dev/null @@ -1,110 +0,0 @@ ---- tools/Makefile.in.old 2010-05-31 07:18:31.000000000 -0400 -+++ tools/Makefile.in 2010-12-13 13:15:22.000000000 -0500 -@@ -60,17 +60,23 @@ - ifeq ("@KLIBC@", "no") - ifeq ("@STATIC_LINK@", "no") - LDFLAGS += -rdynamic -+ MYLIBOBJ=$(top_builddir)/lib/libdmraid.so - else - LDFLAGS += -static -+ MYLIBOBJ=$(top_builddir)/lib/libdmraid.a -+ DMRAIDLIBS += \ -+ $(DEVMAPPEREVENT_LIBS) \ -+ $(DEVMAPPER_LIBS) \ -+ $(DL_LIBS) - endif - endif - - .PHONY: install_dmraid_tools - --dmraid: $(OBJECTS) $(top_builddir)/lib/libdmraid.a -+dmraid: $(OBJECTS) $(MYLIBOBJ) - $(CC) -o $@ $(OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib $(DMRAIDLIBS) $(LIBS) - --dmevent_tool: $(OBJECTS2) $(top_builddir)/lib/libdmraid.a -+dmevent_tool: $(OBJECTS2) $(MYLIBOBJ) - $(CC) -o $@ $(OBJECTS2) $(INCLUDES) $(LDFLAGS) -L$(top_builddir)/lib \ - $(DMEVENTTOOLLIBS) $(DMRAIDLIBS) $(LIBS) - ---- lib/Makefile.in.old 2010-10-27 07:31:46.000000000 -0400 -+++ lib/Makefile.in 2010-12-13 13:04:16.000000000 -0500 -@@ -60,11 +60,11 @@ - USRLIB_RELPATH = $(shell echo $(abspath $(usrlibdir) $(libdir)) | \ - $(AWK) -f $(top_srcdir)/tools/relpath.awk) - --TARGETS = $(LIB_STATIC) -+TARGETS = $(LIB_STATIC) $(LIB_SHARED) $(LIB_EVENTS_SHARED) - - ifeq ("@KLIBC@", "no") - ifeq ("@STATIC_LINK@", "no") -- TARGETS += $(LIB_SHARED) $(LIB_EVENTS_SHARED) -+ TARGETS = $(LIB_SHARED) $(LIB_EVENTS_SHARED) - endif - endif - ---- configure.in 2010-05-31 07:18:30.000000000 -0400 -+++ configure.in.new 2010-12-07 13:30:40.000000000 -0500 -@@ -155,6 +155,15 @@ - Default is dynamic linking]), - [STATIC_LINK=$enableval], [STATIC_LINK=no]) - -+if test "x$STATIC_LINK" != "xno"; then -+ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then -+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) -+ fi -+ PKG_CONFIG="${PKG_CONFIG} --static" -+ ac_cv_env_PKG_CONFIG_set=set -+fi -+PKG_PROG_PKG_CONFIG([0.2]) -+ - dnl Enables shared libdmraid - AC_ARG_ENABLE(shared_lib, - AC_HELP_STRING([--enable-shared_lib], [Use this to generate shared -@@ -248,23 +257,31 @@ - AC_HELP_STRING([--with-devmapper-prefix=PFX], - [Where is devmapper library installed]), - [DEVMAPPER_LIBS="-L$withval/lib" -- DEVMAPPER_CFLAGS="-I$withval/include"], -+ DEVMAPPER_CFLAGS="-I$withval/include" -+ dmprefix=$withval], - [DEVMAPPER_LIBS= -- DEVMAPPER_CFLAGS=]) --save_LDFLAGS=$LDFLAGS --save_CPPFLAGS=$CPPFLAGS --LDFLAGS="$LDFLAGS $DEVMAPPER_LIBS" --CPPFLAGS="$CPPFLAGS $DEVMAPPER_CFLAGS" --AC_CHECK_LIB(devmapper-event, dm_event_handler_create, -- [DEVMAPPEREVENT_LIBS="$DEVMAPPER_LIBS -ldevmapper-event"], -- [AC_MSG_ERROR([device-mapper-event library is either missing or is too old and badly linked])]) --AC_CHECK_LIB(devmapper, dm_task_set_name, -- [DEVMAPPER_LIBS="$DEVMAPPER_LIBS -ldevmapper"], -- [AC_MSG_ERROR([device-mapper library is missing])]) --AC_CHECK_HEADERS(libdevmapper.h libdevmapper-event.h,, -- [AC_MSG_ERROR([Missing headers device-mapper headers])]) --CPPFLAGS=$save_CPPFLAGS --LDFLAGS=$save_LDFLAGS -+ DEVMAPPER_CFLAGS= -+ dmprefix=no]) -+if test "x$dmprefix" = xno ; then -+ PKG_CHECK_MODULES([DEVMAPPER],[devmapper], -+ [PKG_CHECK_MODULES([DEVMAPPEREVENT],[devmapper-event]) -+ ]) -+else -+ save_LDFLAGS=$LDFLAGS -+ save_CPPFLAGS=$CPPFLAGS -+ LDFLAGS="$LDFLAGS $DEVMAPPER_LIBS" -+ CPPFLAGS="$CPPFLAGS $DEVMAPPER_CFLAGS" -+ AC_CHECK_LIB(devmapper-event, dm_event_handler_create, -+ [DEVMAPPEREVENT_LIBS="$DEVMAPPER_LIBS -ldevmapper-event"], -+ [AC_MSG_ERROR([device-mapper-event library is either missing or is too old and badly linked])]) -+ AC_CHECK_LIB(devmapper, dm_task_set_name, -+ [DEVMAPPER_LIBS="$DEVMAPPER_LIBS -ldevmapper"], -+ [AC_MSG_ERROR([device-mapper library is missing])]) -+ AC_CHECK_HEADERS(libdevmapper.h libdevmapper-event.h,, -+ [AC_MSG_ERROR([Missing headers device-mapper headers])]) -+ CPPFLAGS=$save_CPPFLAGS -+ LDFLAGS=$save_LDFLAGS -+fi - - VERSION=$srcdir/tools/VERSION - DMRAID_LIB_MAJOR=$(cut -d. -f1 $VERSION) \ No newline at end of file diff --git a/patches/dmraid/dmraid-1.0.0_rc16-undo-p-rename.patch b/patches/dmraid/dmraid-1.0.0_rc16-undo-p-rename.patch deleted file mode 100644 index 6636b056..00000000 --- a/patches/dmraid/dmraid-1.0.0_rc16-undo-p-rename.patch +++ /dev/null @@ -1,13 +0,0 @@ -Author: Giuseppe Iuculano -Description: Removed "p" from device name. A proper upgrade script is needed before using it. ---- a/1.0.0.rc15/lib/format/partition/dos.c -+++ b/1.0.0.rc15/lib/format/partition/dos.c -@@ -31,7 +31,7 @@ _name(struct lib_context *lc, struct rai - { - const char *base = get_basename(lc, rd->di->path); - -- return type ? snprintf(str, len, "%s%s%u", base, OPT_STR_PARTCHAR(lc), -+ return type ? snprintf(str, len, "%s%u", base, - partition) : snprintf(str, len, "%s", base); - } - -- cgit v1.2.3-65-gdbad