[packages/dietlibc] - updated to 0.35

qboosh qboosh at pld-linux.org
Thu Apr 10 22:31:48 CEST 2025 

commit 0f96c2be2c51d9ce5d66c31b65e12305920f9c7d
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Apr 10 22:29:34 2025 +0200

    - updated to 0.35

 dietlibc-getsubopt.patch |  8 +++----
 dietlibc-memalign.patch  | 22 ++++++++++-------
 dietlibc-nostrip.patch   | 61 ------------------------------------------------
 dietlibc-opt.patch       | 15 ++++++------
 dietlibc-syscalls.patch  | 10 ++++++++
 dietlibc.spec            | 34 ++++++++++++++-------------
 x32-fixes.patch          | 12 +++++-----
 7 files changed, 59 insertions(+), 103 deletions(-)
---
diff --git a/dietlibc.spec b/dietlibc.spec
index 61e3cbd..2e7a059 100644
--- a/dietlibc.spec
+++ b/dietlibc.spec
@@ -1,8 +1,9 @@
+#
 # Conditional build:
 %bcond_without	ssp	# stack-smashing protector
 %bcond_with	dynamic	# dynamic lib support
 
-%ifnarch %{ix86} %{x8664} arm
+%ifnarch %{ix86} %{x8664} %{arm}
 %undefine	with_dynamic
 %endif
 
@@ -10,20 +11,20 @@ Summary:	C library optimized for size
 Summary(pl.UTF-8):	Biblioteka standardowa C zoptymalizowana na rozmiar
 Summary(pt_BR.UTF-8):	libc pequena otimizada para tamanho
 Name:		dietlibc
-Version:	0.34
-Release:	3
+Version:	0.35
+Release:	1
 Epoch:		2
 License:	GPL v2
 Group:		Development/Libraries
 Source0:	http://www.fefe.de/dietlibc/%{name}-%{version}.tar.xz
-# Source0-md5:	4f04a6f642548cc5be716a6e0de6b631
+# Source0-md5:	100e0321b49fdfd2de8c63bc1e30aad8
 Patch0:		%{name}-ppc.patch
 Patch1:		%{name}-opt.patch
 Patch2:		%{name}-platform.patch
 Patch3:		%{name}-guard.patch
 Patch4:		%{name}-arm.patch
 Patch5:		%{name}-diet-m.patch
-Patch6:		%{name}-nostrip.patch
+Patch6:		%{name}-syscalls.patch
 Patch7:		%{name}-stackgap-instead-of-ssp.patch
 Patch9:		%{name}-memalign.patch
 Patch10:	%{name}-getsubopt.patch
@@ -33,6 +34,7 @@ Patch13:	x32-fixes.patch
 Patch14:	%{name}-no-vsyscall.patch
 Patch15:	absolute-cc-path.patch
 URL:		http://www.fefe.de/dietlibc/
+BuildRequires:	gcc >= 6:3.4
 BuildRequires:	rpmbuild(macros) >= 2.005
 BuildRequires:	sed >= 4.0
 %ifarch sparc sparcv9
@@ -118,11 +120,10 @@ statyczne.
 %patch -P14 -p1
 %patch -P15 -p1
 
-%if "%{cc_version}" < "3.4"
-%{__sed} -i -e '/CFLAGS/ s/-Wextra//' Makefile
-%endif
-
 %build
+# needed for build, but can't be compiled before lib
+%{__cc} %{rpmldflags} %{rpmcflags} %{rpmcppflags} -o json json.c
+
 export OPTFLAGS="%{rpmcflags}%{?with_ssp: -fno-stack-protector} -fno-strict-aliasing -Wa,--noexecstack"
 CC="%{__cc}"
 %ifarch sparc sparcv9
@@ -131,14 +132,16 @@ sparc32 \
 %{__make} -j1 all \
 	MYARCH=%{libarch} \
 	prefix=%{dietprefix} \
-	CC="${CC#*ccache }"
+	CC="${CC#*ccache }" \
+	STRIP=:
 
 %if %{with dynamic}
 # 'dyn' target is not SMP safe
 %{__make} -j1 dyn \
 	MYARCH=%{libarch} \
 	prefix=%{dietprefix} \
-	CC="${CC}"
+	CC="${CC}" \
+	STRIP=:
 %endif
 
 %install
@@ -153,11 +156,10 @@ sparc32 \
 	DESTDIR=$RPM_BUILD_ROOT \
 	prefix=%{dietprefix}
 
-mv $RPM_BUILD_ROOT%{dietprefix}/bin/* $RPM_BUILD_ROOT%{_bindir}
-mv $RPM_BUILD_ROOT%{dietprefix}/man/man1/* $RPM_BUILD_ROOT%{_mandir}/man1
-rm -rf $RPM_BUILD_ROOT%{dietprefix}/{bin,man}
-rm -f $RPM_BUILD_ROOT%{_bindir}/diet-dyn
-rm -f $RPM_BUILD_ROOT%{_bindir}/dnsd
+%{__mv} $RPM_BUILD_ROOT%{dietprefix}/bin/* $RPM_BUILD_ROOT%{_bindir}
+%{__mv} $RPM_BUILD_ROOT%{dietprefix}/man/man1/* $RPM_BUILD_ROOT%{_mandir}/man1
+%{__rm} -r $RPM_BUILD_ROOT%{dietprefix}/{bin,man}
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/dnsd
 
 cat > $RPM_BUILD_ROOT%{_bindir}/%{_target_cpu}-dietlibc-gcc <<'EOF'
 #!/bin/sh
diff --git a/dietlibc-getsubopt.patch b/dietlibc-getsubopt.patch
index 258f870..fd9b894 100644
--- a/dietlibc-getsubopt.patch
+++ b/dietlibc-getsubopt.patch
@@ -1,6 +1,6 @@
---- dietlibc-0.31/include/stdlib.h~	2009-03-19 14:33:16.000000000 +0100
-+++ dietlibc-0.31/include/stdlib.h	2009-03-19 14:46:17.000000000 +0100
-@@ -81,6 +81,16 @@
+--- dietlibc-0.35/include/stdlib.h.orig	2025-04-10 20:03:24.259669957 +0200
++++ dietlibc-0.35/include/stdlib.h	2025-04-10 20:05:28.765662117 +0200
+@@ -150,6 +150,16 @@ __attribute__((__warn_unused_result__))
  long int labs(long int i) __THROW __attribute__((__const__));
  __extension__ long long int llabs(long long int i) __THROW __attribute__((__const__));
  
@@ -15,8 +15,8 @@
 +#endif
 +
  #ifdef _XOPEN_SOURCE
+ __attribute__((__warn_unused_result__))
  int grantpt (int fd) __THROW;
- int unlockpt (int fd) __THROW;
 --- /dev/null	2009-03-05 20:33:59.000000000 +0100
 +++ dietlibc-0.31/lib/getsubopt.c	2009-03-19 14:55:18.000000000 +0100
 @@ -0,0 +1,73 @@
diff --git a/dietlibc-memalign.patch b/dietlibc-memalign.patch
index 9c6c90a..7a32a58 100644
--- a/dietlibc-memalign.patch
+++ b/dietlibc-memalign.patch
@@ -1,16 +1,22 @@
-diff -urNp -x '*.orig' dietlibc-0.34.org/include/stdlib.h dietlibc-0.34/include/stdlib.h
---- dietlibc-0.34.org/include/stdlib.h	2017-05-02 23:11:36.000000000 +0200
-+++ dietlibc-0.34/include/stdlib.h	2024-12-03 00:46:46.340653625 +0100
-@@ -13,6 +13,9 @@ void *calloc(size_t nmemb, size_t size)
- void *malloc(size_t size)  __THROW __attribute_malloc__;
- void free(void *ptr) __THROW;
+--- dietlibc-0.35/include/stdlib.h.orig	2024-10-02 18:52:52.000000000 +0200
++++ dietlibc-0.35/include/stdlib.h	2025-04-10 20:02:57.813146563 +0200
+@@ -22,6 +22,16 @@ __attribute__((__warn_unused_result__))
+ __attribute_alloc__(2)
  void *realloc(void *ptr, size_t size) __THROW __attribute_malloc__;
+ 
++__attribute__((__warn_unused_result__))
++__attribute_alloc__(2)
 +void *memalign(size_t alignment, size_t size) __THROW __attribute_malloc__;
++
 +int posix_memalign(void **memptr, size_t alignment, size_t size) __THROW __attribute_malloc__;
++
++__attribute__((__warn_unused_result__))
++__attribute_alloc__(1)
 +void *valloc(size_t size) __THROW __attribute_malloc__;
- 
++
  /* useful OpenBSD extension: */
- void* reallocarray(void* ptr, size_t nmemb, size_t size) __THROW __attribute_malloc__ __attribute_alloc2__(2,3);
+ __attribute__((__warn_unused_result__))
+ __attribute_alloc2__(2,3)
 diff -urNp -x '*.orig' dietlibc-0.34.org/lib/alloc.c dietlibc-0.34/lib/alloc.c
 --- dietlibc-0.34.org/lib/alloc.c	2016-02-05 21:17:39.000000000 +0100
 +++ dietlibc-0.34/lib/alloc.c	2024-12-03 00:46:46.340653625 +0100
diff --git a/dietlibc-nostrip.patch b/dietlibc-nostrip.patch
deleted file mode 100644
index 9c9d492..0000000
--- a/dietlibc-nostrip.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- dietlibc-0.34/Makefile.orig	2020-04-22 01:02:35.965574117 +0200
-+++ dietlibc-0.34/Makefile	2020-04-22 01:04:39.085029868 +0200
-@@ -184,7 +184,6 @@
- 
- $(OBJDIR)/%.o: %.c | $(OBJDIR)
- 	tcc -I. -Iinclude -c $< -o $@
--	-$(STRIP) -x -R .comment -R .note $@
- else
- $(OBJDIR)/pstart.o: start.S | $(OBJDIR)
- 	$(CCC) $(INC) $(CCFLAGS) -DPROFILING -c $< $(ASM_CFLAGS) -o $@
-@@ -194,11 +193,9 @@
- 
- $(OBJDIR)/pthread_%.o: libpthread/pthread_%.c | $(OBJDIR)
- 	$(CCC) $(INC) $(CCFLAGS) $(EXTRACFLAGS) -c $< -o $@
--	-$(STRIP) -x -R .comment -R .note $@
- 
- $(OBJDIR)/%.o: %.c | $(OBJDIR)
- 	$(CCC) $(INC) $(CCFLAGS) $(EXTRACFLAGS) -c $< -o $@ -D__dietlibc__
--	-$(STRIP) -x -R .comment -R .note $@
- endif
- 
- 
-@@ -282,18 +279,15 @@
- 
- $(PICODIR)/pthread_%.o: libpthread/pthread_%.c | $(PICODIR)
- 	$(CCC) $(INC) $(CCFLAGS) $(EXTRACFLAGS) -fPIC -D__DYN_LIB -c $< -o $@
--	$(STRIP) -x -R .comment -R .note $@
- 
- $(PICODIR)/%.o: %.c | $(PICODIR)
- 	$(CCC) $(INC) $(CCFLAGS) $(EXTRACFLAGS) -fPIC -D__DYN_LIB -c $< -o $@
--	$(STRIP) -x -R .comment -R .note $@
- 
- $(PICODIR)/dstart.o: start.S | $(PICODIR)
- 	$(CCC) $(INC) $(CCFLAGS) $(EXTRACFLAGS) -fPIC -D__DYN_LIB $(ASM_CFLAGS) -c $< -o $@
- 
- $(PICODIR)/dyn_so_start.o: dyn_start.c | $(PICODIR)
- 	$(CCC) $(INC) $(CCFLAGS) $(EXTRACFLAGS) -fPIC -D__DYN_LIB -D__DYN_LIB_SHARED -c $< -o $@
--	$(STRIP) -x -R .comment -R .note $@
- 
- DYN_LIBC_PIC = $(LIBOBJ) $(LIBSTDIOOBJ) $(LIBUGLYOBJ) \
- $(LIBCRUFTOBJ) $(LIBCRYPTOBJ) $(LIBSHELLOBJ) $(LIBREGEXOBJ)
-@@ -345,19 +339,15 @@
- 
- $(OBJDIR)/diet: $(OBJDIR)/start.o $(OBJDIR)/dyn_start.o diet.c $(OBJDIR)/dietlibc.a $(OBJDIR)/dyn_stop.o
- 	$(CCC) -isystem include $(CFLAGS) -nostdlib -o $@ $^ -DDIETHOME=\"$(DIETHOME)\" -DVERSION=\"$(VERSION)\" -lgcc
--	$(STRIP) -R .comment -R .note $@
- 
- $(OBJDIR)/diet-i: $(OBJDIR)/start.o $(OBJDIR)/dyn_start.o diet.c $(OBJDIR)/dietlibc.a $(OBJDIR)/dyn_stop.o
- 	$(CCC) -isystem include $(CFLAGS) -nostdlib -o $@ $^ -DDIETHOME=\"$(prefix)\" -DVERSION=\"$(VERSION)\" -DINSTALLVERSION -lgcc
--	$(STRIP) -R .comment -R .note $@
- 
- $(PICODIR)/diet-dyn: $(PICODIR)/start.o $(PICODIR)/dyn_start.o diet.c
- 	$(LD_UNSET) $(CCC) -isystem include $(CFLAGS) -fPIC -nostdlib -o $@ $^ -DDIETHOME=\"$(DIETHOME)\" -D__DYN_LIB -DVERSION=\"$(VERSION)\" -L$(PICODIR) -lc -lgcc $(PICODIR)/dyn_stop.o -Wl,-dynamic-linker=$(DIETHOME)/$(PICODIR)/libdl.so
--	$(STRIP) -R .command -R .note $@
- 
- $(PICODIR)/diet-dyn-i: $(PICODIR)/start.o $(PICODIR)/dyn_start.o diet.c
- 	$(LD_UNSET) $(CCC) -isystem include $(CFLAGS) -fPIC -nostdlib -o $@ $^ -DDIETHOME=\"$(prefix)\" -D__DYN_LIB -DVERSION=\"$(VERSION)\" -L$(PICODIR) -lc -lgcc $(PICODIR)/dyn_stop.o -Wl,-dynamic-linker=$(ILIBDIR)/libdl.so -DINSTALLVERSION
--	$(STRIP) -R .command -R .note $@
- 
- $(OBJDIR)/djb: $(OBJDIR)/compile $(OBJDIR)/load
- 
diff --git a/dietlibc-opt.patch b/dietlibc-opt.patch
index 5c1f737..2043433 100644
--- a/dietlibc-opt.patch
+++ b/dietlibc-opt.patch
@@ -1,16 +1,15 @@
-diff -urNp -x '*.orig' dietlibc-0.34.org/Makefile dietlibc-0.34/Makefile
---- dietlibc-0.34.org/Makefile	2018-02-10 19:27:23.000000000 +0100
-+++ dietlibc-0.34/Makefile	2024-12-03 00:46:28.132368197 +0100
-@@ -116,7 +116,7 @@ all: $(WHAT)
+--- dietlibc-0.35/Makefile.orig	2024-10-31 14:30:46.000000000 +0100
++++ dietlibc-0.35/Makefile	2025-04-10 19:58:11.446758284 +0200
+@@ -118,7 +118,7 @@ all: compile_commands.json $(WHAT)
  
  profiling: $(OBJDIR)/libgmon.a $(OBJDIR)/pstart.o
  
--DEFAULTCFLAGS=-pipe -nostdinc -D_REENTRANT $(EXTRACFLAGS)
-+DEFAULTCFLAGS=-pipe -nostdinc -D_REENTRANT $(EXTRACFLAGS) $(OPTFLAGS)
+-DEFAULTCFLAGS=-pipe -nostdinc -D_REENTRANT -ffreestanding $(EXTRACFLAGS)
++DEFAULTCFLAGS=-pipe -nostdinc -D_REENTRANT -ffreestanding $(EXTRACFLAGS) $(OPTFLAGS)
  CFLAGS=$(DEFAULTCFLAGS)
  CROSS=
  
-@@ -152,14 +152,6 @@ include $(ARCH)/Makefile.add
+@@ -154,14 +154,6 @@ include $(ARCH)/Makefile.add
  
  LIBMATHOBJ=$(patsubst %,$(OBJDIR)/%,$(LIBMATH))
  
@@ -23,8 +22,8 @@ diff -urNp -x '*.orig' dietlibc-0.34.org/Makefile dietlibc-0.34/Makefile
 -STRIP = :
 -endif
  CFLAGS += -W -Wall -Wextra -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -Wno-switch -Wno-unused -Wredundant-decls -Wshadow
+ #CFLAGS += -Wsuggest-attribute=malloc
  
- ASM_CFLAGS = -Wa,--noexecstack
 diff -urNp -x '*.orig' dietlibc-0.34.org/findcflags.sh dietlibc-0.34/findcflags.sh
 --- dietlibc-0.34.org/findcflags.sh	2014-04-19 17:07:32.000000000 +0200
 +++ dietlibc-0.34/findcflags.sh	2024-12-03 00:46:28.132368197 +0100
diff --git a/dietlibc-syscalls.patch b/dietlibc-syscalls.patch
new file mode 100644
index 0000000..9478810
--- /dev/null
+++ b/dietlibc-syscalls.patch
@@ -0,0 +1,10 @@
+--- dietlibc-0.35/i386/syscalls.h.orig	2024-01-09 14:26:54.000000000 +0100
++++ dietlibc-0.35/i386/syscalls.h	2025-04-10 21:35:50.086292303 +0200
+@@ -426,6 +426,7 @@
+ #define __NR_fspick 433
+ #define __NR_pidfd_open 434
+ #define __NR_clone3 435
++#define __NR_close_range 436
+ #define __NR_openat2 437
+ #define __NR_pidfd_getfd 438
+ #define __NR_faccessat2 439
diff --git a/x32-fixes.patch b/x32-fixes.patch
index 8d47a79..6b86c36 100644
--- a/x32-fixes.patch
+++ b/x32-fixes.patch
@@ -1,15 +1,15 @@
---- dietlibc-0.33/Makefile~	2015-01-01 13:33:23.000000000 +0000
-+++ dietlibc-0.33/Makefile	2015-01-01 14:02:17.398044560 +0000
-@@ -10,7 +10,7 @@
- 
- EXTRACFLAGS=
+--- dietlibc-0.35/Makefile.orig	2025-04-10 20:05:47.898891797 +0200
++++ dietlibc-0.35/Makefile	2025-04-10 20:18:46.754672373 +0200
+@@ -11,7 +11,7 @@ MAN1DIR=${prefix}/man/man1
+ EXTRACFLAGS=-ffunction-sections -fdata-sections
+ EXTRALDFLAGS=-Wl,--gc-sections -Wl,-z,noseparate-code
  
 -MYARCH:=$(shell uname -m | sed -e 's/i[4-9]86/i386/' -e 's/armv[3-7]t\?e\?[lb]/arm/')
 +MYARCH?=$(shell uname -m | sed -e 's/i[4-9]86/i386/' -e 's/armv[3-7]t\?e\?[lb]/arm/')
  
  # This extra-ugly cruft is here so make will not run uname and sed each
  # time it looks at $(OBJDIR).  This alone sped up running make when
-@@ -65,10 +65,14 @@
+@@ -75,10 +75,14 @@ else
  ifeq ($(MYARCH),armeb)
  ARCH=arm
  else
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/dietlibc.git/commitdiff/0f96c2be2c51d9ce5d66c31b65e12305920f9c7d

More information about the pld-cvs-commit mailing list