building stage 4 up to libcap

4 files changed, 21 insertions, 2 deletions

diff --git a/build_stage4.sh b/build_stage4.sh
index a91be6f..4db3c4c 100755
--- a/build_stage4.sh
+++ b/build_stage4.sh
@@ -19,6 +19,8 @@ perl-test-pod perl-devel-symdump perl-pod-coverage
 perl-test-pod-coverage perl-error pcre2
 docbook-xml libxslt docbook-xsl xmlto asciidoc git
 libtool
+zlib pambase cracklib libtirpc flex gpm w3m pam
+libcap
 "
 
 #~ stage2:
@@ -26,7 +28,7 @@ libtool
 #~    
 #~     
 #~        
-#~ zlib pambase cracklib libtirpc flex pam libcap coreutils
+#~          coreutils
 #~ util-linux pkg-config e2fsprogs expat bzip2 lz4 xz pcre less gzip
 #~ tar libarchive curl
 #~ pacman-mirrorlist archlinux-keyring archlinux32-keyring pacman
@@ -93,7 +95,6 @@ libtool
 #~ fakeroot
 #~ file
 #~ findutils
-#~ flex
 #~ gawk
 #~ gcc
 #~ gettext
diff --git a/i486-stage4/libcap/DESCR b/i486-stage4/libcap/DESCR
new file mode 100644
index 0000000..bdbed81
--- /dev/null
+++ b/i486-stage4/libcap/DESCR
@@ -0,0 +1,4 @@
+# patching generated gperf output to include stddef.h for size_t
+sed -i 's@source=(@source=(libcap-gperf-stddef-size_t,patch @' PKGBUILD
+sed -i "s@md5sums=(@md5sums=('aa35545fc79f9113d4555d871cb7307d' @" PKGBUILD
+sed -i '/sed/ i \  patch -Np1 -i "${srcdir}/libcap-gperf-stddef-size_t,patch"' PKGBUILD
diff --git a/i486-stage4/libcap/libcap-gperf-stddef-size_t,patch b/i486-stage4/libcap/libcap-gperf-stddef-size_t,patch
new file mode 100644
index 0000000..bc2e1fe
--- /dev/null
+++ b/i486-stage4/libcap/libcap-gperf-stddef-size_t,patch
@@ -0,0 +1,12 @@
+diff -rauN libcap-2.25/libcap/Makefile libcap-2.25-gperf-stddef-size_t-patch/libcap/Makefile
+--- libcap-2.25/libcap/Makefile	2016-01-31 01:01:41.000000000 +0100
++++ libcap-2.25-gperf-stddef-size_t-patch/libcap/Makefile	2018-03-23 16:04:23.621999557 +0100
+@@ -41,7 +41,7 @@
+ 	./_makenames > cap_names.h
+ 
+ $(GPERF_OUTPUT): cap_names.list.h
+-	perl -e 'print "struct __cap_token_s { const char *name; int index; };\n%{\nconst struct __cap_token_s *__cap_lookup_name(const char *, unsigned int);\n%}\n%%\n"; while ($$l = <>) { $$l =~ s/[\{\"]//g; $$l =~ s/\}.*// ; print $$l; }' < $< | gperf --ignore-case --language=ANSI-C --readonly --null-strings --global-table --hash-function-name=__cap_hash_name --lookup-function-name="__cap_lookup_name" -c -t -m20 $(INDENT) > $@
++	perl -e 'print "struct __cap_token_s { const char *name; int index; };\n%{\nconst struct __cap_token_s *__cap_lookup_name(const char *, unsigned int);\n%}\n%%\n"; while ($$l = <>) { $$l =~ s/[\{\"]//g; $$l =~ s/\}.*// ; print $$l; }' < $< | gperf --ignore-case --language=ANSI-C --readonly --null-strings --global-table --hash-function-name=__cap_hash_name --lookup-function-name="__cap_lookup_name" -c -t -m20 $(INDENT) | sed '3 a #include <stddef.h>' > $@
+ 
+ cap_names.list.h: Makefile $(KERNEL_HEADERS)/linux/capability.h
+ 	@echo "=> making $@ from $(KERNEL_HEADERS)/linux/capability.h"
diff --git a/i486-stage4/w3m/DESCR b/i486-stage4/w3m/DESCR
new file mode 100644
index 0000000..90af5c1
--- /dev/null
+++ b/i486-stage4/w3m/DESCR
@@ -0,0 +1,2 @@
+# no imlib2
+sed -i "/makedepends=/s/'imlib2'//" PKGBUILD