mrrl

commit f2175c2fadafca64be11ce01b0732a62d7ad28f3
parent 6218be7e09ae888f772b545d87de1c29453ae4e3
Author: Jan Pobříslo <ccx@te2000.cz>
Date:   Thu, 22 Feb 2024 11:39:04 +0100

Try to build diffutils statically.

Diffstat:
M
packages/core-system-conf
 | 
2
+-
M
packages/core-system-init
 | 
4
++--
M
packages/core-system-rc
 | 
4
++--
M
packages/default.environment
 | 
12
++++++------
M
packages/diffutils
 | 
1
+
M
packages/linux
 | 
2
+-
M
packages/userspace.environment
 | 
10
+++++-----
M
templates/pkg/diffutils
 | 
1
+

8 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/packages/core-system-conf b/packages/core-system-conf
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+diffutils.d35e4e8e48d29a02b6cbcd333264bdcd19909b87f3bbe166e8818e5259807616
+#+diffutils.59a2cfba235443cb1eead8ed5daa49cc2c715760303cb5fd327a76dd9f35d2cb
 #+gnu-make.bbedb14014ab588f0ab243514063e15292122dda5cdaba9d9228794cd29223e8
 #+aat.dac7e03c0094b2baceb86107ea28767c29f0d4f47199f345af67a68b6f5971b6
 #+fileset.53c8d430675a470c92c2e25a96ba3033e844896a4cd4f1a37f49f2eae85d2ab9
diff --git a/packages/core-system-init b/packages/core-system-init
@@ -5,9 +5,9 @@
 #+s6-portable-utils.e604cd8783990cd0ee387b6587f13ca703b1cb7c379604025b6f6b9cec010e42
 #+s6-linux-init.e1efa661fba55d47641c4d9e25287ad4e1eb11a3fb356ba49c6e25fa00454f9f
 #+execline.2b6771a97e608e8ea516f66a4a674b89756398b937095f8aaa4ae93a57361d1b
-#+core-system-rc.b4542706316c17ff7081b6d6e153288caa168e0e979d013325f0294227c0b8d5
+#+core-system-rc.7612bcf43eebe2a6c92a66b0a2d91cf7771f031916b7ffe5291c1847c673dbaf
 
-s6rcdb=/home/ccx/versions/core-system-rc.b4542706316c17ff7081b6d6e153288caa168e0e979d013325f0294227c0b8d5/s6-rc-db
+s6rcdb=/home/ccx/versions/core-system-rc.7612bcf43eebe2a6c92a66b0a2d91cf7771f031916b7ffe5291c1847c673dbaf/s6-rc-db
 prefix=/home/ccx/versions/$pthbs_package
 pkgdir="$pthbs_destdir/$prefix"
 
diff --git a/packages/core-system-rc b/packages/core-system-rc
@@ -3,9 +3,9 @@
 #+busybox-diffutils.09a86e0926aa135f720fe2faea4a282a067037f179fcbcc3435d39fbadadbaa1
 #+s6-rc.857023dce97de954bcc54ae5e98fa6037d6ee735b11f5f9312bc98e22f88bb19
 #+fileset.53c8d430675a470c92c2e25a96ba3033e844896a4cd4f1a37f49f2eae85d2ab9
-#+core-system-conf.118024e237c8631f041bc913091814bd0cd2f51baf23840259921ad280a2fd2e
+#+core-system-conf.245243fa86deb404906a97fbd59ff1f4b497c017f6dc741d9bd86665984d17d3
 
-conf=/home/ccx/versions/core-system-conf.118024e237c8631f041bc913091814bd0cd2f51baf23840259921ad280a2fd2e/core-system-conf
+conf=/home/ccx/versions/core-system-conf.245243fa86deb404906a97fbd59ff1f4b497c017f6dc741d9bd86665984d17d3/core-system-conf
 prefix=/home/ccx/versions/$pthbs_package
 pkgdir="$pthbs_destdir/$prefix"
 mkdir -p "$pkgdir/s6-rc-source"
diff --git a/packages/default.environment b/packages/default.environment
@@ -1,7 +1,7 @@
 #+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
 #+gnu-make.bbedb14014ab588f0ab243514063e15292122dda5cdaba9d9228794cd29223e8
 #+musl-cross-make.b9db57cdb678b30c666e97c2f7cee49945285f62d7fec93faccafdfa08f888be
-#+diffutils.d35e4e8e48d29a02b6cbcd333264bdcd19909b87f3bbe166e8818e5259807616
+#+diffutils.59a2cfba235443cb1eead8ed5daa49cc2c715760303cb5fd327a76dd9f35d2cb
 #+patch.0663cc31802d557caec3f961aa8a2aa5b3be801eb710422a6db5cabc98c86743
 #+flex.09185c8d98f1b3bb8c9d8ba8edeb2519432caca0b2a03ca6aaebb400b9d0c8d6
 #+bison.9b1654e6b4708f282e427b1a38361394911ef62d1a46aceedce8fd54d5a7839b
@@ -23,8 +23,8 @@
 #+fileset.53c8d430675a470c92c2e25a96ba3033e844896a4cd4f1a37f49f2eae85d2ab9
 #+logincaps.92956247ee9e2c41db6f0d9d224291cf834068fb4fd944ee67f9c048e2885a02
 #+snaprep.f0c30481946d0ab3404518791e5790b1294ddd16dbe55354a8915e02ec96e3e4
-#+core-system-conf.118024e237c8631f041bc913091814bd0cd2f51baf23840259921ad280a2fd2e
-#+core-system-rc.b4542706316c17ff7081b6d6e153288caa168e0e979d013325f0294227c0b8d5
+#+core-system-conf.245243fa86deb404906a97fbd59ff1f4b497c017f6dc741d9bd86665984d17d3
+#+core-system-rc.7612bcf43eebe2a6c92a66b0a2d91cf7771f031916b7ffe5291c1847c673dbaf
 #+core-system-scripts.fc242040077e92fe7c2a024bcee4459d580471947f88e22b7f051fe69c180a75
-#+core-system-init.6a42513f5660f37c6b5a05443b902be62e0aaad80f233326e94694a7b9c08e91
-#+linux.49f1a1cf701be753ee69f9458e6636c6cc9a0f66915bf1d3986a457f9e033da6-
\ No newline at end of file
+#+core-system-init.73d35b07e1a29dc1fbeb5ca50e9aca0196020833156a7e2c66bfcbedaddec79a
+#+linux.12de11526aec3c18cf8c7231df2e0c12d84def3ad556589eaf1b2e821202a5ad+
\ No newline at end of file
diff --git a/packages/diffutils b/packages/diffutils
@@ -41,6 +41,7 @@ autotools() {
 }
 
 
+export LDFLAGS="-static"
 autotools diffutils-3.10 --disable-nls --enable-static --disable-shared
 
 
diff --git a/packages/linux b/packages/linux
@@ -2,7 +2,7 @@
 #+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
 #+gnu-make.bbedb14014ab588f0ab243514063e15292122dda5cdaba9d9228794cd29223e8
 #+musl-cross-make.b9db57cdb678b30c666e97c2f7cee49945285f62d7fec93faccafdfa08f888be
-#+diffutils.d35e4e8e48d29a02b6cbcd333264bdcd19909b87f3bbe166e8818e5259807616
+#+diffutils.59a2cfba235443cb1eead8ed5daa49cc2c715760303cb5fd327a76dd9f35d2cb
 #+patch.0663cc31802d557caec3f961aa8a2aa5b3be801eb710422a6db5cabc98c86743
 #+flex.09185c8d98f1b3bb8c9d8ba8edeb2519432caca0b2a03ca6aaebb400b9d0c8d6
 #+bison.9b1654e6b4708f282e427b1a38361394911ef62d1a46aceedce8fd54d5a7839b
diff --git a/packages/userspace.environment b/packages/userspace.environment
@@ -1,7 +1,7 @@
 #+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
 #+gnu-make.bbedb14014ab588f0ab243514063e15292122dda5cdaba9d9228794cd29223e8
 #+musl-cross-make.b9db57cdb678b30c666e97c2f7cee49945285f62d7fec93faccafdfa08f888be
-#+diffutils.d35e4e8e48d29a02b6cbcd333264bdcd19909b87f3bbe166e8818e5259807616
+#+diffutils.59a2cfba235443cb1eead8ed5daa49cc2c715760303cb5fd327a76dd9f35d2cb
 #+patch.0663cc31802d557caec3f961aa8a2aa5b3be801eb710422a6db5cabc98c86743
 #+flex.09185c8d98f1b3bb8c9d8ba8edeb2519432caca0b2a03ca6aaebb400b9d0c8d6
 #+bison.9b1654e6b4708f282e427b1a38361394911ef62d1a46aceedce8fd54d5a7839b
@@ -23,7 +23,7 @@
 #+fileset.53c8d430675a470c92c2e25a96ba3033e844896a4cd4f1a37f49f2eae85d2ab9
 #+logincaps.92956247ee9e2c41db6f0d9d224291cf834068fb4fd944ee67f9c048e2885a02
 #+snaprep.f0c30481946d0ab3404518791e5790b1294ddd16dbe55354a8915e02ec96e3e4
-#+core-system-conf.118024e237c8631f041bc913091814bd0cd2f51baf23840259921ad280a2fd2e
-#+core-system-rc.b4542706316c17ff7081b6d6e153288caa168e0e979d013325f0294227c0b8d5
+#+core-system-conf.245243fa86deb404906a97fbd59ff1f4b497c017f6dc741d9bd86665984d17d3
+#+core-system-rc.7612bcf43eebe2a6c92a66b0a2d91cf7771f031916b7ffe5291c1847c673dbaf
 #+core-system-scripts.fc242040077e92fe7c2a024bcee4459d580471947f88e22b7f051fe69c180a75
-#+core-system-init.6a42513f5660f37c6b5a05443b902be62e0aaad80f233326e94694a7b9c08e91-
\ No newline at end of file
+#+core-system-init.73d35b07e1a29dc1fbeb5ca50e9aca0196020833156a7e2c66bfcbedaddec79a+
\ No newline at end of file
diff --git a/templates/pkg/diffutils b/templates/pkg/diffutils
@@ -3,6 +3,7 @@
 #@untar:-J:sha256:90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e:.
 {%- endblock %}
 {% block at_script %}
+export LDFLAGS="-static"
 autotools diffutils-3.10 --disable-nls --enable-static --disable-shared
 {% endblock %}
 {% block genlinks_begin %}