From 491e32f0f604a6ab47b8c264e23afbd4ddf02755 Mon Sep 17 00:00:00 2001
From: aliriza <aliriza.keskin@pardus.org.tr>
Date: Fri, 10 Feb 2023 14:58:10 +0000
Subject: [PATCH] static libgcc

---
 dev/libs/gmp/ympbuild                         |  1 -
 sys/apps/coreutils/ympbuild                   |  2 ++
 .../patches/no-coreutils.patch                | 30 -------------------
 sys/kernel/initramfs-tools/ympbuild           |  7 ++---
 4 files changed, 4 insertions(+), 36 deletions(-)
 delete mode 100644 sys/kernel/initramfs-tools/patches/no-coreutils.patch

diff --git a/dev/libs/gmp/ympbuild b/dev/libs/gmp/ympbuild
index 41c19ee8..b0823433 100644
--- a/dev/libs/gmp/ympbuild
+++ b/dev/libs/gmp/ympbuild
@@ -12,7 +12,6 @@ md5sums=('0b82665c4a92fd2ade7440c13fcaa42b')
 arch=('x86_64')
 group=(dev.libs)
 uses=(cxx)
-cxx_depends=(gcc)
 
 cd $name-$version
 
diff --git a/sys/apps/coreutils/ympbuild b/sys/apps/coreutils/ympbuild
index 22dd01c4..d3c1ca60 100644
--- a/sys/apps/coreutils/ympbuild
+++ b/sys/apps/coreutils/ympbuild
@@ -18,6 +18,8 @@ group=(sys.apps)
 
 cd $name-$version
 
+export CFLAGS='-static-libgcc -static-libstdc++ -fPIC'
+
 setup(){
     ./configure --prefix=/usr \
         --libdir=/usr/lib64 \
diff --git a/sys/kernel/initramfs-tools/patches/no-coreutils.patch b/sys/kernel/initramfs-tools/patches/no-coreutils.patch
deleted file mode 100644
index 58cbe092..00000000
--- a/sys/kernel/initramfs-tools/patches/no-coreutils.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/hook-functions b/hook-functions
-index 95bd584..f18f1a8 100644
---- a/hook-functions
-+++ b/hook-functions
-@@ -200,7 +200,7 @@ copy_file() {
- 
- 			# Create a relative link so it always points
- 			# to the right place
--			ln -rs "${DESTDIR}/${link_target}" "${DESTDIR}/${target}"
-+			ln -s "${link_target}" "${DESTDIR}/${target}"
- 		fi
- 
- 		# Copy the link target if it doesn't already exist
-@@ -863,7 +863,7 @@ cache_run_scripts()
- 	[ ! -d "${initdir}" ] && return
- 
- 	true > "${initdir}/ORDER"
--	runlist=$(get_prereq_pairs | tsort)
-+	runlist=$(get_prereq_pairs | sort)
- 	for crs_x in ${runlist}; do
- 		[ -f "${initdir}/${crs_x}" ] || continue
- 		echo "${scriptdir}/${crs_x} \"\$@\"" >> "${initdir}/ORDER"
-@@ -901,6 +901,6 @@ run_scripts()
- 	initdir=${1}
- 	[ ! -d "${initdir}" ] && return
- 
--	runlist=$(get_prereq_pairs | tsort)
-+	runlist=$(get_prereq_pairs | sort)
- 	call_scripts "$scriptdir"
- }
diff --git a/sys/kernel/initramfs-tools/ympbuild b/sys/kernel/initramfs-tools/ympbuild
index dec06378..361044cc 100644
--- a/sys/kernel/initramfs-tools/ympbuild
+++ b/sys/kernel/initramfs-tools/ympbuild
@@ -11,15 +11,13 @@ source=("https://salsa.debian.org/kernel-team/initramfs-tools/-/archive/v$versio
         "patches/remove-zstd.patch"
         "patches/non-debian.patch"
         "patches/remove-logsave.patch"
-        "patches/no-coreutils.patch"
         "initramfs-tools.sysconf")
-depends=(eudev findutils)
+depends=(eudev findutils coreutils)
 makedepends=()
 md5sums=('a3765010fe0fc6a71fe900a798b759ea'
          'SKIP'
          'SKIP'
          'SKIP'
-         'SKIP'
          'SKIP')
 uses=()
 group=(sys.kernel)
@@ -30,8 +28,7 @@ cd $name-v$version
 prepare(){
     patch -Np1 < ../remove-zstd.patch
     patch -Np1 < ../remove-logsave.patch
-    patch -Np1 < ../non-debian.patch    
-    patch -Np1 < ../no-coreutils.patch
+    patch -Np1 < ../non-debian.patch
 }
 
 package(){