updated ${OS_TRIPLET} var to all recipes :)

vlang · Dec 9, 2023 · 2e3af5f · 2e3af5f
1 parent 9731e81
commit 2e3af5f
Show file tree

Hide file tree

Showing 66 changed files with 79 additions and 79 deletions.
diff --git a/jinx-config b/jinx-config
@@ -3,11 +3,11 @@ JINX_MAJOR_VER=0.2
 export CFLAGS="-O2 -pipe -fcf-protection"
 export CXXFLAGS="$CFLAGS"
 
-OS_TRIPLET=x86_64-ironclad
+OS_TRIPLET=x86_64-vinix
 
-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
+#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/bzip2 b/recipes/bzip2
@@ -8,16 +8,16 @@ build() {
     cp -r ${source_dir}/. .
     sed -i 's/all: libbz2.a bzip2 bzip2recover test/all: libbz2.a bzip2 bzip2recover/g' Makefile
 
-    make CC=x86_64-vinix-gcc CFLAGS=-fPIC -f Makefile-libbz2_so
+    make CC=${OS_TRIPLET}-gcc CFLAGS=-fPIC -f Makefile-libbz2_so
     make clean
-    make CC=x86_64-vinix-gcc AR=x86_64-vinix-ar CFLAGS=-fPIC -j${parallelism}
+    make CC=${OS_TRIPLET}-gcc AR=${OS_TRIPLET}-ar CFLAGS=-fPIC -j${parallelism}
 }
 
 package() {
     mkdir -p "${dest_dir}${prefix}/bin" "${dest_dir}${prefix}/lib" "${dest_dir}${prefix}/lib/pkgconfig" "${dest_dir}${prefix}/include"
-    command install -s --strip-program=x86_64-vinix-strip bzip2-shared "${dest_dir}${prefix}/bin/bzip2"
-    command install -s --strip-program=x86_64-vinix-strip bzip2recover "${dest_dir}${prefix}/bin/"
-    command install -s --strip-program=x86_64-vinix-strip libbz2.so.1.0.8 "${dest_dir}${prefix}/lib/"
+    command install -s --strip-program=${OS_TRIPLET}-strip bzip2-shared "${dest_dir}${prefix}/bin/bzip2"
+    command install -s --strip-program=${OS_TRIPLET}-strip bzip2recover "${dest_dir}${prefix}/bin/"
+    command install -s --strip-program=${OS_TRIPLET}-strip libbz2.so.1.0.8 "${dest_dir}${prefix}/lib/"
     command install -m 644 bzlib.h "${dest_dir}${prefix}/include/"
     ln -sf libbz2.so.1.0.8 "${dest_dir}${prefix}/lib/libbz2.so.1.0"
     ln -sf libbz2.so.1.0 "${dest_dir}${prefix}/lib/libbz2.so.1"

diff --git a/recipes/fontconfig b/recipes/fontconfig
@@ -7,7 +7,7 @@ imagedeps="python gperf"
 
 build() {
     ${source_dir}/configure \
-        --host=x86_64-vinix \
+        --host=${OS_TRIPLET} \
         --prefix=${prefix} \
         --sysconfdir=/etc \
         --localstatedir=/var \

diff --git a/recipes/freetype b/recipes/freetype
@@ -7,7 +7,7 @@ imagedeps="gcc"
 
 build() {
     ${source_dir}/configure \
-        --host=x86_64-vinix \
+        --host=${OS_TRIPLET} \
         --prefix=${prefix} \
         --sysconfdir=/etc \
         --localstatedir=/var \

diff --git a/recipes/gcc b/recipes/gcc
@@ -9,9 +9,9 @@ cbuild() {
         CXXFLAGS_FOR_TARGET="$CFLAGS" \
         CFLAGS_FOR_TARGET="$CFLAGS" \
     ${source_dir}/configure                 \
-        --host=x86_64-vinix                 \
+        --host=${OS_TRIPLET}                 \
         --prefix=${prefix}                  \
-        --target=x86_64-vinix               \
+        --target=${OS_TRIPLET}               \
         --with-sysroot=/                    \
         --with-build-sysroot=${sysroot_dir} \
         --enable-languages=c,c++            \
@@ -29,8 +29,8 @@ package() {
     DESTDIR="${dest_dir}" make install-strip-gcc
 
     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
+    rm "${dest_dir}${prefix}"/lib/gcc/${OS_TRIPLET}/12.2.0/crti.o
+    rm "${dest_dir}${prefix}"/lib/gcc/${OS_TRIPLET}/12.2.0/crtn.o
 
     DESTDIR="${dest_dir}" make install-strip-target-libstdc++-v3
 

diff --git a/recipes/grep b/recipes/grep
@@ -10,7 +10,7 @@ build() {
     libtoolize -cfvi && autoreconf -fvi
 
     ./configure \
-        --host=x86_64-vinix \
+        --host=${OS_TRIPLET} \
         --prefix=${prefix} \
         --disable-nls
 

diff --git a/recipes/less b/recipes/less
@@ -6,7 +6,7 @@ deps="mlibc ncurses"
 
 build() {
     ${source_dir}/configure \
-        --host=x86_64-vinix \
+        --host=${OS_TRIPLET} \
         --prefix="${prefix}" \
         --sysconfdir=/etc
 

diff --git a/recipes/libexpat b/recipes/libexpat
@@ -6,7 +6,7 @@ deps="mlibc"
 
 build() {
     ${source_dir}/configure     \
-        --host=x86_64-vinix           \
+        --host=${OS_TRIPLET}           \
         --prefix=${prefix}            \
         --disable-static              \
         --without-xmlwf

diff --git a/recipes/libffi b/recipes/libffi
@@ -6,7 +6,7 @@ deps="mlibc"
 
 build() {
     ${source_dir}/configure           \
-        --host=x86_64-vinix           \
+        --host=${OS_TRIPLET}           \
         --prefix=${prefix}            \
         --disable-static
 

diff --git a/recipes/libfontenc b/recipes/libfontenc
@@ -6,7 +6,7 @@ deps="mlibc xorg-proto zlib"
 
 build() {
     ${source_dir}/configure           \
-        --host=x86_64-vinix           \
+        --host=${OS_TRIPLET}          \
         --prefix=${prefix}            \
         --sysconfdir=/etc             \
         --localstatedir=/var          \

diff --git a/recipes/libice b/recipes/libice
@@ -6,7 +6,7 @@ deps="mlibc xorg-util-macros xorg-proto libx11 libxtrans"
 
 build() {
     ${source_dir}/configure           \
-        --host=x86_64-vinix           \
+        --host=${OS_TRIPLET}           \
         --prefix=${prefix}            \
         --sysconfdir=/etc             \
         --localstatedir=/var          \

diff --git a/recipes/libiconv b/recipes/libiconv
@@ -7,7 +7,7 @@ imagedeps="binutils"
 
 build() {
     ${source_dir}/configure           \
-        --host=x86_64-vinix           \
+        --host=${OS_TRIPLET}          \
         --prefix=${prefix}            \
         --disable-static              \
         --enable-shared               \

diff --git a/recipes/libintl b/recipes/libintl
@@ -6,7 +6,7 @@ deps="mlibc-base libiconv"
 
 configure() {
     ${source_dir}/configure    \
-        --host=x86_64-vinix    \
+        --host=${OS_TRIPLET}    \
         --prefix=${prefix}     \
         --without-emacs        \
         --without-lispdir      \

diff --git a/recipes/libpng b/recipes/libpng
@@ -6,7 +6,7 @@ deps="mlibc zlib"
 
 build() {
     ${source_dir}/configure           \
-        --host=x86_64-vinix           \
+        --host=${OS_TRIPLET}          \
         --prefix=${prefix}            \
         --disable-static
 

diff --git a/recipes/libsm b/recipes/libsm
@@ -6,7 +6,7 @@ deps="mlibc xorg-util-macros xorg-proto libx11 libxtrans libice"
 
 build() {
     ${source_dir}/configure           \
-        --host=x86_64-vinix           \
+        --host=${OS_TRIPLET}           \
         --prefix=${prefix}            \
         --sysconfdir=/etc             \
         --localstatedir=/var          \

diff --git a/recipes/libx11 b/recipes/libx11
@@ -7,7 +7,7 @@ imagedeps="gcc"
 
 build() {
     ${source_dir}/configure           \
-        --host=x86_64-vinix           \
+        --host=${OS_TRIPLET}           \
         --prefix=${prefix}            \
         --sysconfdir=/etc             \
         --localstatedir=/var          \

diff --git a/recipes/libxau b/recipes/libxau
@@ -6,7 +6,7 @@ deps="mlibc xorg-proto"
 
 build() {
     ${source_dir}/configure           \
-        --host=x86_64-vinix           \
+        --host=${OS_TRIPLET}           \
         --prefix=${prefix}            \
         --sysconfdir=/etc             \
         --localstatedir=/var          \

diff --git a/recipes/libxaw b/recipes/libxaw
@@ -6,7 +6,7 @@ deps="mlibc xorg-util-macros xorg-proto libx11 libxext libxt libxmu libxpm"
 
 build() {
     ${source_dir}/configure           \
-        --host=x86_64-vinix           \
+        --host=${OS_TRIPLET}           \
         --prefix=${prefix}            \
         --sysconfdir=/etc             \
         --localstatedir=/var          \

diff --git a/recipes/libxcb b/recipes/libxcb
@@ -7,7 +7,7 @@ imagedeps="python"
 
 build() {
     ${source_dir}/configure           \
-        --host=x86_64-vinix           \
+        --host=${OS_TRIPLET}           \
         --prefix=${prefix}            \
         --sysconfdir=/etc             \
         --localstatedir=/var          \

diff --git a/recipes/libxcrypt b/recipes/libxcrypt
@@ -6,7 +6,7 @@ deps="mlibc-base"
 
 build() {
     ${source_dir}/configure \
-        --host=x86_64-vinix \
+        --host=${OS_TRIPLET} \
         --prefix=${prefix} \
         --enable-obsolete-api=yes \
         --disable-xcrypt-compat-files \

diff --git a/recipes/libxcursor b/recipes/libxcursor
@@ -6,7 +6,7 @@ deps="mlibc libxrender libxfixes libx11"
 
 build() {
     ${source_dir}/configure \
-        --host=x86_64-vinix \
+        --host=${OS_TRIPLET} \
         --prefix=${prefix} \
         --sysconfdir=/etc \
         --localstatedir=/var \

diff --git a/recipes/libxdamage b/recipes/libxdamage
@@ -6,7 +6,7 @@ deps="mlibc xorg-util-macros xorg-proto libx11 libxtrans libxfixes"
 
 build() {
     ${source_dir}/configure           \
-        --host=x86_64-vinix           \
+        --host=${OS_TRIPLET}           \
         --prefix=${prefix}            \
         --sysconfdir=/etc             \
         --localstatedir=/var          \

diff --git a/recipes/libxdmcp b/recipes/libxdmcp
@@ -6,7 +6,7 @@ deps="mlibc xorg-proto xorg-util-macros libxau"
 
 build() {
     ${source_dir}/configure           \
-        --host=x86_64-vinix           \
+        --host=${OS_TRIPLET}           \
         --prefix=${prefix}            \
         --sysconfdir=/etc             \
         --localstatedir=/var          \

diff --git a/recipes/libxext b/recipes/libxext
@@ -6,7 +6,7 @@ deps="mlibc xorg-util-macros xorg-proto libx11 libxtrans"
 
 build() {
     ${source_dir}/configure           \
-        --host=x86_64-vinix           \
+        --host=${OS_TRIPLET}           \
         --prefix=${prefix}            \
         --sysconfdir=/etc             \
         --localstatedir=/var          \

diff --git a/recipes/libxfixes b/recipes/libxfixes
@@ -5,7 +5,7 @@ hostdeps="gcc autoconf automake libtool pkg-config"
 deps="mlibc xorg-util-macros xorg-proto libx11 libxtrans"
 build() {
     ${source_dir}/configure           \
-        --host=x86_64-vinix           \
+        --host=${OS_TRIPLET}           \
         --prefix=${prefix}            \
         --sysconfdir=/etc             \
         --localstatedir=/var          \

diff --git a/recipes/libxfont2 b/recipes/libxfont2
@@ -6,7 +6,7 @@ deps="mlibc xorg-util-macros xorg-proto libx11 libxtrans freetype fontconfig bzi
 
 configure() {
     ${source_dir}/configure \
-        --host=x86_64-vinix \
+        --host=${OS_TRIPLET} \
         --prefix=${prefix} \
         --sysconfdir=/etc \
         --localstatedir=/var \

diff --git a/recipes/libxft b/recipes/libxft
@@ -6,7 +6,7 @@ deps="mlibc xorg-util-macros xorg-proto libx11 libxrender freetype fontconfig"
 
 build() {
     ${source_dir}/configure           \
-        --host=x86_64-vinix           \
+        --host=${OS_TRIPLET}           \
         --prefix=${prefix}            \
         --sysconfdir=/etc             \
         --localstatedir=/var          \

diff --git a/recipes/libxi b/recipes/libxi
@@ -6,7 +6,7 @@ deps="mlibc xorg-util-macros xorg-proto libx11 libxtrans libxext libxfixes"
 
 build() {
     ${source_dir}/configure           \
-        --host=x86_64-vinix           \
+        --host=${OS_TRIPLET}           \
         --prefix=${prefix}            \
         --sysconfdir=/etc             \
         --localstatedir=/var          \

diff --git a/recipes/libxkbfile b/recipes/libxkbfile
@@ -6,7 +6,7 @@ deps="mlibc xorg-util-macros xorg-proto libx11"
 
 build() {
     ${source_dir}/configure           \
-        --host=x86_64-vinix           \
+        --host=${OS_TRIPLET}           \
         --prefix=${prefix}            \
         --sysconfdir=/etc             \
         --localstatedir=/var          \

diff --git a/recipes/libxml b/recipes/libxml
@@ -6,7 +6,7 @@ deps="mlibc zlib"
 
 build() {
     ${source_dir}/configure \
-        --host=x86_64-vinix \
+        --host=${OS_TRIPLET} \
         --prefix=${prefix} \
         --disable-static \
         --without-threads \

diff --git a/recipes/libxmu b/recipes/libxmu
@@ -6,7 +6,7 @@ deps="mlibc xorg-util-macros xorg-proto libx11 libxtrans libxext libxt"
 
 build() {
     ${source_dir}/configure           \
-        --host=x86_64-vinix           \
+        --host=${OS_TRIPLET}           \
         --prefix=${prefix}            \
         --sysconfdir=/etc             \
         --localstatedir=/var          \

diff --git a/recipes/libxpm b/recipes/libxpm
@@ -6,7 +6,7 @@ deps="mlibc xorg-util-macros xorg-proto libx11 libxext libxt"
 
 build() {
     ${source_dir}/configure           \
-        --host=x86_64-vinix           \
+        --host=${OS_TRIPLET}           \
         --prefix=${prefix}            \
         --sysconfdir=/etc             \
         --localstatedir=/var          \

diff --git a/recipes/libxrandr b/recipes/libxrandr
@@ -6,7 +6,7 @@ deps="mlibc xorg-util-macros xorg-proto libx11 libxtrans libxrender libxext"
 
 build() {
     ${source_dir}/configure           \
-        --host=x86_64-vinix           \
+        --host=${OS_TRIPLET}           \
         --prefix=${prefix}            \
         --sysconfdir=/etc             \
         --localstatedir=/var          \

diff --git a/recipes/libxrender b/recipes/libxrender
@@ -6,7 +6,7 @@ deps="mlibc xorg-util-macros xorg-proto libx11 libxtrans"
 
 build() {
     ${source_dir}/configure           \
-        --host=x86_64-vinix           \
+        --host=${OS_TRIPLET}           \
         --prefix=${prefix}            \
         --sysconfdir=/etc             \
         --localstatedir=/var          \

diff --git a/recipes/libxshmfence b/recipes/libxshmfence
@@ -6,7 +6,7 @@ deps="mlibc xorg-util-macros xorg-proto libx11 libxtrans"
 
 build() {
     ${source_dir}/configure           \
-        --host=x86_64-vinix           \
+        --host=${OS_TRIPLET}          \
         --prefix=${prefix}            \
         --sysconfdir=/etc             \
         --localstatedir=/var          \

diff --git a/recipes/libxt b/recipes/libxt
@@ -7,7 +7,7 @@ imagedeps="gcc"
 
 build() {
     ${source_dir}/configure           \
-        --host=x86_64-vinix           \
+        --host=${OS_TRIPLET}           \
         --prefix=${prefix}            \
         --sysconfdir=/etc             \
         --localstatedir=/var          \

diff --git a/recipes/libxtrans b/recipes/libxtrans
@@ -6,7 +6,7 @@ deps="mlibc xorg-util-macros xorg-proto libxcb"
 
 build() {
     ${source_dir}/configure           \
-        --host=x86_64-vinix           \
+        --host=${OS_TRIPLET}           \
         --prefix=${prefix}            \
         --sysconfdir=/etc             \
         --localstatedir=/var

diff --git a/recipes/libxv b/recipes/libxv
@@ -6,7 +6,7 @@ deps="mlibc xorg-util-macros xorg-proto libx11 libxext libxfixes"
 
 build() {
     ${source_dir}/configure           \
-        --host=x86_64-vinix           \
+        --host=${OS_TRIPLET}           \
         --prefix=${prefix}            \
         --sysconfdir=/etc             \
         --localstatedir=/var          \

diff --git a/recipes/libxxf86vm b/recipes/libxxf86vm
@@ -6,7 +6,7 @@ deps="mlibc xorg-util-macros xorg-proto libx11 libxtrans libxext"
 
 build() {
     ${source_dir}/configure           \
-        --host=x86_64-vinix           \
+        --host=${OS_TRIPLET}          \
         --prefix=${prefix}            \
         --sysconfdir=/etc             \
         --localstatedir=/var          \

diff --git a/recipes/llvm b/recipes/llvm
@@ -15,8 +15,8 @@ build() {
         -DLLVM_ENABLE_RTTI=ON \
         -DLLVM_TARGETS_TO_BUILD=X86 \
         -DLLVM_TARGET_ARCH=x86_64 \
-        -DLLVM_DEFAULT_TARGET_TRIPLE=x86_64-vinix \
-        -DLLVM_HOST_TRIPLE=x86_64-vinix \
+        -DLLVM_DEFAULT_TARGET_TRIPLE=OS_TRIPLET=${OS_TRIPLET} \
+        -DLLVM_HOST_TRIPLE=OS_TRIPLET=${OS_TRIPLET} \
         -DLLVM_ENABLE_TERMINFO=OFF \
         -Wno-dev \
         ${source_dir}/llvm