From 7e2c13899f156ecac4d7f89211b5c2b515c6148d Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Tue, 28 Jan 2014 19:51:39 +0100 Subject: [PATCH] - added dynamic patch, now builds with dynamic --- dietlibc-dynamic.patch | 25 +++++++++++++++++++++++++ dietlibc.spec | 8 ++++---- 2 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 dietlibc-dynamic.patch diff --git a/dietlibc-dynamic.patch b/dietlibc-dynamic.patch new file mode 100644 index 0000000..d4a9f39 --- /dev/null +++ b/dietlibc-dynamic.patch @@ -0,0 +1,25 @@ +--- dietlibc-0.33/i386/dyn_syscalls.S.orig 2014-01-28 17:41:38.966558564 +0100 ++++ dietlibc-0.33/i386/dyn_syscalls.S 2014-01-28 17:58:01.516517331 +0100 +@@ -195,7 +195,6 @@ + #include "../syscalls.s/n_sigpending.S" + #include "../syscalls.s/n_sigprocmask.S" + #include "../syscalls.s/n_sigsuspend.S" +-#include "../syscalls.s/nice.S" + #include "../syscalls.s/pause.S" + #include "../syscalls.s/personality.S" + #include "../syscalls.s/query_module.S" +@@ -400,4 +401,3 @@ + #include "__longjmp.S" + #include "setjmp.S" + +-#include "syscalls.s/__guard.S" +--- dietlibc-0.33/x86_64/dyn_syscalls.S.orig 2012-01-24 19:24:30.000000000 +0100 ++++ dietlibc-0.33/x86_64/dyn_syscalls.S 2014-01-28 17:58:08.859850356 +0100 +@@ -141,7 +141,6 @@ + #include "../syscalls.s/n_sigprocmask.S" + #include "../syscalls.s/n_sigsuspend.S" + #include "../syscalls.s/nanosleep.S" +-#include "../syscalls.s/nice.S" + #include "../syscalls.s/open.S" + #include "../syscalls.s/pause.S" + #include "../syscalls.s/personality.S" diff --git a/dietlibc.spec b/dietlibc.spec index f75a767..9c5406f 100644 --- a/dietlibc.spec +++ b/dietlibc.spec @@ -1,7 +1,7 @@ # # Conditional build: -%bcond_without ssp # disable stack-smashing protector 'coz dietlibc will not work with it! -%bcond_with dynamic # dynamic lib support +%bcond_without ssp # stack-smashing protector +%bcond_without dynamic # dynamic lib support %ifnarch %{ix86} %{x8664} arm %undefine with_dynamic @@ -31,7 +31,7 @@ Patch8: %{name}-nostrip.patch Patch9: %{name}-stackgap-instead-of-ssp.patch Patch10: %{name}-fflush-null.patch Patch11: %{name}-_syscall-no-arch.patch - +Patch12: %{name}-dynamic.patch Patch13: %{name}-strcoll.patch Patch14: umount-arch.patch Patch15: %{name}-memalign.patch @@ -118,7 +118,7 @@ statyczne. %{!?with_ssp:%patch9 -p1} %patch10 -p1 %patch11 -p1 - +%patch12 -p1 %patch13 -p1 %patch14 -p1 %patch15 -p1 -- 2.44.0