pthbs

commit 8d243b76a40b173e2ec7493312cde3362f23a86c
parent 95004da40c9dbbe8501731fce0c166f31efb0ee9
Author: Jan Pobříslo <ccx@te2000.cz>
Date:   Thu, 22 Feb 2024 13:14:55 +0100

Try to link flex statically despite libtool

Diffstat:
M
packages/bison
 | 
2
+-
M
packages/default.environment
 | 
8
++++----
M
packages/flex
 | 
3
++-
M
packages/linux
 | 
4
++--
M
packages/userspace.environment
 | 
4
++--
M
templates/pkg/flex
 | 
3
++-

6 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/packages/bison b/packages/bison
@@ -4,7 +4,7 @@
 #+busybox.a41e637082cdc82c38a093db7af3615cc2f417a0e8034f7a7ba88d64e852e101
 #+busybox-diffutils.28aa9a4a515da839eaf2e9873bccf363e8eb4829bff3307d2f000204690dfc82
 #+m4.b4d536e5f08f9c11575bfc61d943c9714bc556ed473eedb0520288720ff13871
-#+flex.80c943d393d8e8f977df315e6eef2405cc467608edfc036520546f51f79ba606
+#+flex.7b04266c765678562eba707b9f5c6ed36e09ff1d1bbb9b67ac5f69bdccb333d1
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
 
 autotools() {
diff --git a/packages/default.environment b/packages/default.environment
@@ -3,8 +3,8 @@
 #+musl-cross-make.6377e568aa49eae6525f0f5ed4a7d2505704941ef74850d2f208da7b12c7865d
 #+diffutils.4df6cafc1ee70d9980acd1171b336257f4c9f8200e82bdedc9ef8bf2a54c490f
 #+patch.7db533886b0c97e42c2299ae6ba70110cbf5a1275cd8af96c451d3aef41b37cd
-#+flex.80c943d393d8e8f977df315e6eef2405cc467608edfc036520546f51f79ba606
-#+bison.1e77c9a9664b0f73e9ba311eaac0546031d026b9642d1ab56c5ae67a44b657ad
+#+flex.7b04266c765678562eba707b9f5c6ed36e09ff1d1bbb9b67ac5f69bdccb333d1
+#+bison.0e105559f3b96f9bfad01e4b5dc3f59028c200fb375ae1fa53d3ac43da123d43
 #+rsync.ee43ca0ffae53f31361524ff243380e0894111d5feb39b4a086f0a6456257601
 #+execline.6517da512872650389469658b167fe4251ee2080cc2bae333f8b3047a9e0bc73
 #+s6.90b0bd64b6e79d23a47fc43068b026125a8770d99bce8172d8b2898715c806fa
@@ -27,4 +27,4 @@
 #+core-system-rc.41a4b72e1f805c1285fdfc17917a55490d98cc5d893b88b976b8ade0836274a1
 #+core-system-scripts.a6948d0ca8f36e41bf5f0ec5acc13bc2fc6c9787282984ff089482ee5c587a9d
 #+core-system-init.c55889e425a8c194b5a6954cd9345290f68caacbdbfff152b79eb7eff67607b1
-#+linux.f938eeb3075dc9de68ed066b8beec8e1c95a04920417dc303fbaab4779220293-
\ No newline at end of file
+#+linux.6ffeec737ae8f68072d328acc908e381480caaa28cce292584946ec42addf5a5+
\ No newline at end of file
diff --git a/packages/flex b/packages/flex
@@ -62,7 +62,8 @@ check_static() {
 
 
 export CPPFLAGS="-D_GNU_SOURCE -DSTDC_HEADERS"
-autotools_static flex-2.6.4 --disable-nls --enable-static --disable-shared
+export LDFLAGS="--static"
+autotools_static flex-2.6.4 --disable-nls
 check_static command/flex
 check_static command/flex++
 
diff --git a/packages/linux b/packages/linux
@@ -4,8 +4,8 @@
 #+musl-cross-make.6377e568aa49eae6525f0f5ed4a7d2505704941ef74850d2f208da7b12c7865d
 #+diffutils.4df6cafc1ee70d9980acd1171b336257f4c9f8200e82bdedc9ef8bf2a54c490f
 #+patch.7db533886b0c97e42c2299ae6ba70110cbf5a1275cd8af96c451d3aef41b37cd
-#+flex.80c943d393d8e8f977df315e6eef2405cc467608edfc036520546f51f79ba606
-#+bison.1e77c9a9664b0f73e9ba311eaac0546031d026b9642d1ab56c5ae67a44b657ad
+#+flex.7b04266c765678562eba707b9f5c6ed36e09ff1d1bbb9b67ac5f69bdccb333d1
+#+bison.0e105559f3b96f9bfad01e4b5dc3f59028c200fb375ae1fa53d3ac43da123d43
 #+rsync.ee43ca0ffae53f31361524ff243380e0894111d5feb39b4a086f0a6456257601
 #+libelf-compat.3023655d655211fc0f061928c09b8b5374a966ea08fd54ac43ff7876a7a73f5b
 #@untar:-J:sha256:2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb:.
diff --git a/packages/userspace.environment b/packages/userspace.environment
@@ -3,8 +3,8 @@
 #+musl-cross-make.6377e568aa49eae6525f0f5ed4a7d2505704941ef74850d2f208da7b12c7865d
 #+diffutils.4df6cafc1ee70d9980acd1171b336257f4c9f8200e82bdedc9ef8bf2a54c490f
 #+patch.7db533886b0c97e42c2299ae6ba70110cbf5a1275cd8af96c451d3aef41b37cd
-#+flex.80c943d393d8e8f977df315e6eef2405cc467608edfc036520546f51f79ba606
-#+bison.1e77c9a9664b0f73e9ba311eaac0546031d026b9642d1ab56c5ae67a44b657ad
+#+flex.7b04266c765678562eba707b9f5c6ed36e09ff1d1bbb9b67ac5f69bdccb333d1
+#+bison.0e105559f3b96f9bfad01e4b5dc3f59028c200fb375ae1fa53d3ac43da123d43
 #+rsync.ee43ca0ffae53f31361524ff243380e0894111d5feb39b4a086f0a6456257601
 #+execline.6517da512872650389469658b167fe4251ee2080cc2bae333f8b3047a9e0bc73
 #+s6.90b0bd64b6e79d23a47fc43068b026125a8770d99bce8172d8b2898715c806fa
diff --git a/templates/pkg/flex b/templates/pkg/flex
@@ -5,7 +5,8 @@
 {% block at_script %}
 
 export CPPFLAGS="-D_GNU_SOURCE -DSTDC_HEADERS"
-autotools_static flex-2.6.4 --disable-nls --enable-static --disable-shared
+export LDFLAGS="--static"
+autotools_static flex-2.6.4 --disable-nls
 check_static command/flex
 check_static command/flex++