curl: regenerations

fosslinux · Feb 18, 2025 · 4612fbc · 4612fbc
1 parent 02ed0da
commit 4612fbc
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/steps/SHA256SUMS.pkgs b/steps/SHA256SUMS.pkgs
@@ -31,11 +31,11 @@ f7437edc081071cc3ecd3384abf4c63f33183858b8cae6b4ac3105c66f88b3b6  bison-3.4.1_1.
 8064a96c8ccfbab1245554ac30e68fcc73da24a3dd02f8450658fdb106c7f405  bison-3.4.1_2.tar.bz2
 f4df527ee598ebc64d5c93639307a8d325b93dad510001cccd2df02692a26cdf  bison-3.4.2_0.tar.bz2
 e8271c1213b6cc7c9ae2ddb018cd093cbbd5f6e842548c0747ce95b13b6b9447  bzip2-1.0.8_0.tar.bz2
-96b6b91e1d3c5f48da471f10dd22415fa05baacaafe964cc86285493d0ca27ce  ca-certificates-3.99_0.tar.bz2
+fd65c11422588984bc3a440b1fd9d022307a200de182cfedfe3387a09cbece98  ca-certificates-3.99_0.tar.bz2
 982a3496ce3277c562acc896ba796939fe55a37432b2c76ab16b76e051a045a2  coreutils-5.0_0.tar.bz2
 27f283c42e2728d0d0682d56ada44b11ff11d07843e595c133a43f4c6aef53d0  coreutils-6.10_0.tar.bz2
 22d4dcf97bc9caf36f2abc4fbfc2f40d13a0be2db2efce913b09a00461db7a06  coreutils-9.4_0.tar.bz2
-455ed6ce610873241cb3ebe827d1965d2a4a6319424604ce6390205d16abdf48  curl-8.12.1_0.tar.bz2
+c0ab68a12ff82cb2b65b9c480281b70441ee14ef9bfe93605d1d5852379dbbaf  curl-8.12.1_0.tar.bz2
 ea841c92382860d3618368b86510514ed7d717c64625740e70baba2508e182c4  curl-8.12.1_1.tar.bz2
 fedf6ffbd37b14e9a0c94cd3063c6ac5d38f13be8a3399093ec112f9cd9d0816  dhcpcd-10.0.1_0.tar.bz2
 0462b6a04899a98d60c33f9d16fa00e2e6b7c21cc80ccebc8358fc08105467a2  diffutils-2.7_0.tar.bz2

diff --git a/steps/curl-8.12.1/pass1.sh b/steps/curl-8.12.1/pass1.sh
@@ -10,16 +10,19 @@ src_prepare() {
     perl sinus.pl | sed "s/, $//" >> src/tool_cb_prg.c.new
     sed '1,/^[0-9, ]*[0-9]$/d' src/tool_cb_prg.c >> src/tool_cb_prg.c.new
     mv src/tool_cb_prg.c.new src/tool_cb_prg.c
-
-    rm src/tool_listhelp.c src/tool_hugehelp.c
+
+    # pregenerated files
+    rm src/tool_listhelp.c src/tool_hugehelp.c lib/easyoptions.c
+    rm docs/libcurl/libcurl-symbols.md
+    rm tests/certs/*.der
 
     # Make scripts work with our perl
     sed -i "s/:crlf//" scripts/managen scripts/cd2nroff
     # sed rewrites permissions?!
     chmod 755 scripts/managen scripts/cd2nroff
 
     # This one doesn't compile properly
-    touch docs/libcurl/libcurl-symbols.md docs/libcurl/libcurl-symbols.md
+    touch docs/libcurl/libcurl-symbols.md docs/libcurl/libcurl-symbols.3
 
     AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 autoreconf-2.69 -fi
 }
@@ -42,8 +45,9 @@ src_compile() {
     sed '1,/CURLHELP_VERBOSE/d' src/tool_help.h >> src/tool_help.h.new
     mv src/tool_help.h.new src/tool_help.h
 
-    # tool_listhelp.c
+    # tool_listhelp.c & easyoptions.c
     make -C src listhelp
+    make -C lib optiontable
 
     default
 }

diff --git a/steps/curl-8.12.1/pass2.sh b/steps/curl-8.12.1/pass2.sh
@@ -11,10 +11,10 @@ src_prepare() {
     sed '1,/^[0-9, ]*[0-9]$/d' src/tool_cb_prg.c >> src/tool_cb_prg.c.new
     mv src/tool_cb_prg.c.new src/tool_cb_prg.c
 
-    rm src/tool_listhelp.c src/tool_hugehelp.c
-
-    # This one doesn't compile properly
-    touch docs/libcurl/libcurl-symbols.md docs/libcurl/libcurl-symbols.md
+    # pregenerated files
+    rm src/tool_listhelp.c src/tool_hugehelp.c lib/easyoptions.c
+    rm docs/libcurl/libcurl-symbols.md
+    rm tests/certs/*.der
 
     AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 autoreconf-2.69 -fi
 }
@@ -37,8 +37,9 @@ src_compile() {
     sed '1,/CURLHELP_VERBOSE/d' src/tool_help.h >> src/tool_help.h.new
     mv src/tool_help.h.new src/tool_help.h
 
-    # tool_listhelp.c
+    # tool_listhelp.c and easyoptions.c
     make -C src listhelp
+    make -C lib optiontable
 
     default
 }