updated recipes & host-recipes (#134)

* updated host-recipes * updated recipes * updates * updated more recipes
vlang · Dec 9, 2023 · 231a11b · 231a11b
1 parent e5a3b28
commit 231a11b
Show file tree

Hide file tree

Showing 102 changed files with 245 additions and 427 deletions.
diff --git a/host-recipes/autoconf b/host-recipes/autoconf
@@ -2,14 +2,11 @@ name=autoconf
 from_source=autoconf
 revision=1
 
-configure() {
-    "${source_dir}"/configure --prefix="${prefix}"
-}
-
 build() {
+    "${source_dir}"/configure --prefix="${prefix}"
     make -j${parallelism}
 }
 
-install() {
+package() {
     DESTDIR="${dest_dir}" make install
 }
diff --git a/host-recipes/autoconf-archive b/host-recipes/autoconf-archive
@@ -2,12 +2,9 @@ name=autoconf-archive
 from_source=autoconf-archive
 revision=1
 
-configure() {
-    true
-}
-
 build() {
     true
+    true
 }
 
 install() {

diff --git a/host-recipes/automake b/host-recipes/automake
@@ -4,11 +4,8 @@ revision=1
 imagedeps="gcc"
 hostrundeps="autoconf"
 
-configure() {
-    "${source_dir}"/configure --prefix="${prefix}"
-}
-
 build() {
+    "${source_dir}"/configure --prefix="${prefix}"
     make -j${parallelism}
 }
 

diff --git a/host-recipes/binutils b/host-recipes/binutils
@@ -4,20 +4,17 @@ revision=1
 imagedeps="gcc"
 hostdeps="autoconf automake libtool pkg-config"
 
-configure() {
+build(){
     "${source_dir}"/configure \
         --prefix="${prefix}" \
         --target=x86_64-vinix \
         --with-sysroot="${sysroot_dir}" \
         --disable-nls \
         --disable-werror \
         --disable-dependency-tracking
-}
-
-build() {
     make -j${parallelism} all
 }
 
-install() {
+package() {
     DESTDIR="${dest_dir}" make install-strip
 }
diff --git a/host-recipes/cmake b/host-recipes/cmake
@@ -3,15 +3,14 @@ from_source=cmake
 revision=1
 imagedeps="gcc"
 
-configure() {
-    "${source_dir}"/configure --prefix="${prefix}" --parallel="${parallelism}"
-}
-
 build() {
+    "${source_dir}"/configure --prefix="${prefix}" --parallel="${parallelism}"}
+
+
     make -j${parallelism}
 }
 
-install() {
+package() {
     DESTDIR="${dest_dir}" make install
     echo 'include(Platform/UnixPaths)' > "${dest_dir}${prefix}/share/cmake-3.24/Modules/Platform/Vinix.cmake"
 }
diff --git a/host-recipes/file b/host-recipes/file
@@ -0,0 +1,21 @@
+name=file
+from_source=file
+revision=1
+imagedeps="file gcc"
+
+build() {
+    cp -rp "${source_dir}"/. ./
+
+    ./configure \
+        --prefix=${prefix} \
+        --sysconfdir=/etc \
+        --localstatedir=/var \
+        --disable-nls \
+        --disable-static
+
+    make -j${parallelism}
+}
+
+package() {
+    DESTDIR="${dest_dir}" make install-strip
+}
diff --git a/host-recipes/gcc b/host-recipes/gcc
@@ -3,14 +3,10 @@ from_source=gcc-host
 revision=1
 hostrundeps="gcc-compiler libgcc libstdc++ binutils"
 
-configure() {
-    true
-}
-
 build() {
     true
 }
 
-install() {
+package() {
     true
 }
diff --git a/host-recipes/gcc-compiler b/host-recipes/gcc-compiler
@@ -6,7 +6,7 @@ hostdeps="autoconf automake libtool pkg-config"
 hostrundeps="binutils"
 deps="mlibc-headers"
 
-configure() {
+biuld() {
         CXXFLAGS_FOR_TARGET="$CFLAGS" \
         CFLAGS_FOR_TARGET="$CFLAGS" \
     "${source_dir}"/configure \
@@ -17,12 +17,9 @@ configure() {
         --enable-languages=c,c++ \
         --disable-multilib \
         --enable-initfini-array
-}
-
-build() {
     make -j${parallelism} all-gcc
 }
 
-install() {
+package() {
     DESTDIR="${dest_dir}" make install-gcc
 }
diff --git a/host-recipes/gnulib b/host-recipes/gnulib
@@ -2,14 +2,13 @@ name=gnulib
 from_source=gnulib
 revision=1
 
-configure() {
+build() {
     true
-}
 
-build() {
     true
 }
 
-install() {
+package() {
     true
 }
+
diff --git a/host-recipes/libgcc b/host-recipes/libgcc
@@ -6,16 +6,13 @@ imagedeps="gcc"
 hostrundeps="gcc-compiler binutils"
 deps="mlibc-base"
 
-configure() {
+build() {
     # Hack to continue gcc build
     cp -rp "${base_dir}"/host-builds/gcc-compiler/. ./
-}
-
-build() {
     make -j${parallelism} all-target-libgcc
 }
 
-install() {
+package() {
     DESTDIR="${dest_dir}" make install-strip-target-libgcc
     rm "${dest_dir}${prefix}"/lib/gcc/x86_64-vinix/12.2.0/crti.o
     rm "${dest_dir}${prefix}"/lib/gcc/x86_64-vinix/12.2.0/crtn.o

diff --git a/host-recipes/libstdc++ b/host-recipes/libstdc++
@@ -6,15 +6,12 @@ imagedeps="gcc"
 hostrundeps="gcc-compiler libgcc binutils"
 deps="mlibc-base"
 
-configure() {
+build() {
     # Hack to continue gcc build
     cp -rp "${base_dir}"/host-builds/gcc-compiler/. ./
-}
-
-build() {
     make -j${parallelism} all-target-libstdc++-v3
 }
 
-install() {
+package() {
     DESTDIR="${dest_dir}" make install-strip-target-libstdc++-v3
 }
diff --git a/host-recipes/libtool b/host-recipes/libtool
@@ -4,16 +4,14 @@ revision=1
 hostdeps="autoconf automake"
 imagedeps="help2man gcc"
 
-configure() {
-    cp -r "${source_dir}"/. ./
+build() {
+    cp -rp "${source_dir}"/. ./
     ./configure \
         --prefix="${prefix}"
-}
 
-build() {
     make -j${parallelism}
 }
 
-install() {
+package() {
     DESTDIR="${dest_dir}" make install-strip
 }
diff --git a/host-recipes/limine b/host-recipes/limine
@@ -4,19 +4,16 @@ revision=1
 hostdeps="gcc autoconf automake libtool pkg-config"
 imagedeps="nasm gcc mtools"
 
-configure() {
+build() {
     "${source_dir}"/configure \
         --prefix="${prefix}" \
         CROSS_TOOLCHAIN=x86_64-vinix \
         LDFLAGS="-static" \
         --enable-all \
         --disable-uefi-aarch64
-}
-
-build() {
     make -j${parallelism}
 }
 
-install() {
+package() {
     DESTDIR="${dest_dir}" make install-strip
 }
diff --git a/host-recipes/pkg-config b/host-recipes/pkg-config
@@ -4,16 +4,13 @@ revision=1
 imagedeps="gcc"
 hostdeps="automake autoconf libtool"
 
-configure() {
+build() {
     "${source_dir}"/configure \
         --prefix="${prefix}"
-}
-
-build() {
     make -j${parallelism}
 }
 
-install() {
+package() {
     DESTDIR="${dest_dir}" make install-strip
     mkdir -p "${dest_dir}${prefix}/share/pkgconfig/personality.d"
     cat <<EOF >"${dest_dir}${prefix}/share/pkgconfig/personality.d/x86_64-vinix.personality"

diff --git a/host-recipes/v b/host-recipes/v
@@ -3,15 +3,12 @@ from_source=v
 revision=1
 imagedeps="gcc"
 
-configure() {
-    cp -r ${source_dir}/. ./
-}
-
 build() {
+    cp -r ${source_dir}/. ./
     cc -O2 -pipe -w -std=gnu99 -fno-strict-aliasing v.c -o v -lm -lpthread
 }
 
-install() {
+package() {
     rm -rf "${dest_dir}${prefix}"/v
     mkdir -p "${dest_dir}${prefix}"/v
     cp -r . "${dest_dir}${prefix}"/v/

diff --git a/host-recipes/xorg-font-util b/host-recipes/xorg-font-util
@@ -3,14 +3,12 @@ from_source=xorg-font-util
 revision=1
 imagedeps="gcc"
 
-configure() {
+build() {
     "${source_dir}"/configure --prefix="${prefix}"
-}
 
-build() {
     make -j${parallelism}
 }
 
-install() {
+package() {
     DESTDIR="${dest_dir}" make install-strip
-}
+}
diff --git a/host-recipes/xorg-macros b/host-recipes/xorg-macros
@@ -2,14 +2,11 @@ name=xorg-macros
 from_source=xorg-util-macros
 revision=1
 
-configure() {
-    "${source_dir}"/configure --prefix="${prefix}"
-}
-
 build() {
+    "${source_dir}"/configure --prefix="${prefix}"
     make -j${parallelism}
 }
 
-install() {
+package() {
     DESTDIR="${dest_dir}" make install-strip
 }
diff --git a/host-recipes/xtrans b/host-recipes/xtrans
@@ -3,14 +3,12 @@ from_source=libxtrans
 revision=1
 imagedeps="gcc"
 
-configure() {
+build() {
     "${source_dir}"/configure --prefix="${prefix}"
-}
 
-build() {
     make -j${parallelism}
 }
 
-install() {
+package() {
     DESTDIR="${dest_dir}" make install-strip
 }
diff --git a/jinx-config b/jinx-config
@@ -1,4 +1,13 @@
 JINX_MAJOR_VER=0.2
-export CFLAGS="-O2 -pipe -march=x86-64 -mtune=generic"
-export CXXFLAGS="${CFLAGS}"
-export VMODULES='/tmp/.vmodules'
+
+export CFLAGS="-O2 -pipe -fcf-protection"
+export CXXFLAGS="$CFLAGS"
+
+OS_TRIPLET=x86_64-ironclad
+
+autotools_recursive_regen() {
+    for f in $(find . -name configure.ac); do
+        echo "* autotools regen in '$(dirname $f)'..."
+        ( cd "$(dirname "$f")" && libtoolize -cfvi && autoreconf -fvi "$@" )
+    done
+}
diff --git a/recipes/base-files b/recipes/base-files
@@ -2,20 +2,18 @@ name=base-files
 from_source=base-files
 revision=1
 
-configure() {
-    true
-}
-
 build() {
     true
 }
 
-install() {
-    cp -rv ${source_dir}/. "${dest_dir}"/
+package() {
+    cp -prv ${source_dir}/. "${dest_dir}"/
     ln -s usr/bin "${dest_dir}"/bin
     ln -s usr/bin "${dest_dir}"/sbin
     ln -s usr/lib "${dest_dir}"/lib
     ln -s usr/lib "${dest_dir}"/lib64
     ln -s bin "${dest_dir}"/usr/sbin
     ln -s lib "${dest_dir}"/usr/lib64
+    mkdir "${dest_dir}"/tmp
+    mkdir "${dest_dir}"/var
 }
diff --git a/recipes/bash b/recipes/bash
@@ -5,19 +5,17 @@ imagedeps="gcc"
 hostdeps="gcc autoconf automake libtool pkg-config"
 deps="mlibc ncurses readline"
 
-configure() {
+build() {
     ${source_dir}/configure    \
         --host=x86_64-vinix    \
         --prefix=${prefix}     \
         --without-bash-malloc  \
         --disable-nls
-}
 
-build() {
     make -j${parallelism}
 }
 
-install() {
+package() {
     make install-strip DESTDIR="${dest_dir}"
     ln -s bash "${dest_dir}${prefix}"/bin/sh
 }