Merge pull request #56 from rhubert/fixes

Fix some packages
BobBuildTool · Feb 23, 2025 · 4651948 · 4651948
2 parents d225bc0 + 3be2873
commit 4651948
Show file tree

Hide file tree

Showing 8 changed files with 73 additions and 11 deletions.
diff --git a/recipes/libs/cloog.yaml b/recipes/libs/cloog.yaml
@@ -1,7 +1,7 @@
 inherit: [autotools]
 
 metaEnvironment:
-    PKG_VERSION: "0.18.4"
+    PKG_VERSION: "0.21.1"
 
 depends:
     - libs::gmp-dev
@@ -14,14 +14,15 @@ depends:
 
 checkoutSCM:
     scm: url
-    url: http://www.bastoul.net/cloog/pages/download/cloog-${PKG_VERSION}.tar.gz
-    digestSHA256: "325adf3710ce2229b7eeb9e84d3b539556d093ae860027185e7af8a8b00a750e"
+    url: ${GITHUB_MIRROR}/periscop/cloog/releases/download/cloog-${PKG_VERSION}/cloog-${PKG_VERSION}.tar.gz
+    digestSHA256: d370cf9990d2be24bfb24750e355bac26110051248cabf2add61f9b3867fb1d7
     stripComponents: 1
 
 buildScript: |
-    LDFLAGS="-lisl -lgmp"
     autotoolsBuild $1 \
         --with-isl=system \
+        --with-gmp=system \
+        --with-gmp-prefix=${BOB_DEP_PATHS[libs::gmp-dev]} \
         --with-polylib=no
 
 multiPackage:

diff --git a/recipes/libs/libb2.yaml b/recipes/libs/libb2.yaml
@@ -4,13 +4,61 @@ metaEnvironment:
     PKG_VERSION: "0.98.1"
     PKG_LICENSE: "CC0-1.0"
 
+Config:
+    LIBB2_HAVE_AVX:
+        help: Enable AVX support
+        type: choice
+        choice: &choice
+            "yes":
+            "no":
+    LIBB2_HAVE_MMX:
+        help: Enable MMX support
+        type: choice
+        choice: *choice
+    LIBB2_HAVE_SSE:
+        help: Enable SSE support
+        type: choice
+        choice: *choice
+    LIBB2_HAVE_SSE2:
+        help: Enable SSE2 support
+        type: choice
+        choice: *choice
+    LIBB2_HAVE_SSE3:
+        help: Enable SSE3 support
+        type: choice
+        choice: *choice
+    LIBB2_HAVE_SSSE3:
+        help: Enable SSSE3 support
+        type: choice
+        choice: *choice
+    LIBB2_HAVE_SSE41:
+        help: Enable SSE4.1 support
+        type: choice
+        choice: *choice
+    LIBB2_HAVE_SSE42:
+        help: Enable SSE4.2 support
+        type: choice
+        choice: *choice
+
 checkoutSCM:
     scm: url
     url: ${GITHUB_MIRROR}/BLAKE2/libb2/releases/download/v${PKG_VERSION}/libb2-${PKG_VERSION}.tar.gz
     digestSHA1: 85abee1e611cda21775f4a7dd77d11671d300bb4
     stripComponents: 1
 
+buildVars: [ARCH, LIBB2_HAVE_AVX, LIBB2_HAVE_MMX, LIBB2_HAVE_SSE, LIBB2_HAVE_SSE2,
+            LIBB2_HAVE_SSE3, LIBB2_HAVE_SSSE3, LIBB2_HAVE_SSE41, LIBB2_HAVE_SSE42]
 buildScript: |
+    if [[ "${ARCH}" == "x86_64" ]]; then
+        export ax_cv_have_avx_ext=${LIBB2_HAVE_AVX:-no} \
+               ax_cv_have_mmx_ext=${LIBB2_HAVE_MMX:-no} \
+               ax_cv_have_sse_ext=${LIBB2_HAVE_SSE:-no} \
+               ax_cv_have_sse2_ext=${LIBB2_HAVE_SSE2:-no} \
+               ax_cv_have_sse3_ext=${LIBB2_HAVE_SSE3:-no} \
+               ax_cv_have_ssse3_ext=${LIBB2_HAVE_SSSE3:-no} \
+               ax_cv_have_sse41_ext=${LIBB2_HAVE_SSE41:-no} \
+               ax_cv_have_sse42_ext=${LIBB2_HAVE_SSE42:-no}
+    fi
     autotoolsBuild $1
 
 multiPackage:

diff --git a/recipes/utils/brtools.yaml b/recipes/utils/brtools.yaml
@@ -9,6 +9,13 @@ checkoutSCM:
     url: https://buildroot.org/downloads/buildroot-${PKG_VERSION}.tar.gz
     digestSHA1: ecb7e941a4e2ba28a151522c476ed8925f0e8c7b
     extract: False
+
+depends:
+    - libs::libxcrypt-dev
+    - use: []
+      depends:
+          - libs::libxcrypt-tgt
+
 checkoutDeterministic: True
 checkoutVars: [PKG_VERSION]
 checkoutScript: |
@@ -21,11 +28,11 @@ buildVars: [CC, CFLAGS, LDFLAGS]
 buildScript: |
     mkdir -p install/usr/bin
     # mkpasswd
-    $CC $CFLAGS $(cpackageLibraryTypeCheck "-static" "-shared") $LDFLAGS \
+    $CC $CFLAGS $CPPFLAGS $(cpackageLibraryTypeCheck "-static" "-shared") $LDFLAGS \
         -I$1 $1/mkpasswd.c $1/utils.c -lcrypt \
         -o install/usr/bin/mkpasswd
     # makedevs
-    $CC $CFLAGS $LDFLAGS \
+    $CC $CFLAGS $CPPFLAGS $LDFLAGS \
         $1/makedevs.c \
         -o install/usr/bin/makedevs
     # mkusers

diff --git a/recipes/utils/cpio.yaml b/recipes/utils/cpio.yaml
@@ -1,12 +1,12 @@
 inherit: [autotools]
 
 metaEnvironment:
-    PKG_VERSION: "2.12"
+    PKG_VERSION: "2.15"
 
 checkoutSCM:
     scm: url
     url: ${GNU_MIRROR}/cpio/cpio-${PKG_VERSION}.tar.bz2
-    digestSHA1: "60358408c76db354f6716724c4bcbcb6e18ab642"
+    digestSHA1: "db5e3845eb5475ddcb7e8915c3a1458a0c13d787"
     stripComponents: 1
 
 buildScript: |

diff --git a/recipes/utils/genext2fs.yaml b/recipes/utils/genext2fs.yaml
@@ -9,6 +9,7 @@ checkoutSCM:
     digestSHA1: 4b06176c1c71b2818dc2f9d772346c5902238c33
     stripComponents: 1
 
+checkoutDeterministic: True
 checkoutScript: |
     autoconfReconfigure
 

diff --git a/recipes/utils/pciutils.yaml b/recipes/utils/pciutils.yaml
@@ -21,13 +21,14 @@ checkoutSCM:
     digestSHA1: 83ea1394a2095442731f639b16f38292be67201f
     stripComponents: 1
 
-buildVars: [CC, AR, RANLIB, CFLAGS, LDFLAGS]
+buildVars: [CC, AR, RANLIB, CFLAGS, LDFLAGS, AUTOCONF_HOST]
 buildScript: |
     mkdir -p build install
-    cp -as $1/* build/
+    cp -fas $1/* build/
     makeParallel -C build \
         AR="$AR" \
         RANLIB="$RANLIB" \
+        HOST="${AUTOCONF_HOST}" \
         STRIP= \
         CC="$CC" \
         CFLAGS="$CFLAGS" \

diff --git a/recipes/utils/tidy.yaml b/recipes/utils/tidy.yaml
@@ -10,6 +10,7 @@ checkoutSCM:
     digestSHA256: 59c86d5b2e452f63c5cdb29c866a12a4c55b1741d7025cf2f3ce0cde99b0660e
     stripComponents: 1
 
+buildTools: [host-toolchain]
 buildScript: |
     cmakeBuild $1
 

diff --git a/recipes/utils/uboot-tools.yaml b/recipes/utils/uboot-tools.yaml
@@ -33,6 +33,9 @@ buildScript: |
     # remove this tool option, cause it has to much deps on other libs
     sed -i "s/^CONFIG_TOOLS_MKEFICAPSULE=y/# CONFIG_TOOLS_MKEFICAPSULE is not set/" .config
 
+    # disable CONFIG_VIDEO_LOGO as it break cross build
+    sed -i "s/^CONFIG_VIDEO_LOGO=y/# CONFIG_VIDEO_LOGO is not set/" .config
+
     makeParallel -C $1 O=$PWD \
         CROSS_COMPILE="$CROSS_COMPILE" \
         HOSTCFLAGS="$CFLAGS $CPPFLAGS" \
@@ -42,7 +45,7 @@ buildScript: |
         tools-only
 
     install -D -m 0755 \
-        tools/{bmp_logo,fdtgrep,proftool,mkimage,mkenvimage,dumpimage,fit_info,fit_check_sign} \
+        tools/{fdtgrep,proftool,mkimage,mkenvimage,dumpimage,fit_info,fit_check_sign} \
         -t install/usr/bin
 
 packageScript: |