wok-current view cookutils/stuff/cook-x86_64.patch @ rev 25786
Bump gvfs to fix issue with open files on android device, patch udev to fix mtp issue on pcmanfm
| author | Stanislas Leduc <shann@slitaz.org> |
|---|---|
| date | Tue Jul 29 18:05:13 2025 +0000 (2 months ago) |
| parents | 5926178cd6fa |
| children |
line source
1 --- a/cook
2 +++ b/cook
3 @@ -562,7 +562,9 @@
5 # Handle cross-tools.
6 case "$ARCH" in
7 - arm*|x86_64)
8 + x86_64)
9 + arch="-$ARCH" ;;
10 + arm*)
11 # CROSS_COMPILE is used by at least Busybox and the kernel to set
12 # the cross-tools prefix. Sysroot is the root of our target arch
13 sysroot="$CROSS_TREE/sysroot"
14 @@ -978,7 +978,9 @@
16 install_package() {
17 case "$ARCH" in
18 - arm*|x86_64)
19 + x86_64)
20 + arch="-$ARCH" ;;
21 + arm*)
22 arch="-$ARCH"
23 root="$CROSS_TREE/sysroot" ;;
24 esac
25 @@ -1170,8 +1174,8 @@
26 get_dev_files() {
27 action 'Getting standard devel files...'
28 mkdir -p $fs/usr/lib
29 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib
30 - cp -a $install/usr/lib/*a $fs/usr/lib
31 + cp -a $install/usr/lib*/pkgconfig $fs/usr/lib
32 + cp -a $install/usr/lib*/*a $fs/usr/lib
33 cp -a $install/usr/include $fs/usr
34 status
35 }
36 @@ -1206,6 +1206,9 @@
37 copy $j $fs$(dirname ${j#.})
38 done
39 done
40 + # Ensure always use lib instead lib64
41 + [ -d $fs/lib64 ] && mv $fs/lib64 $fs/lib
42 + [ -d $fs/usr/lib64 ] && mv $fs/usr/lib64 $fs/usr/lib
43 cd - >/dev/null
44 status
45 }
46 @@ -1224,6 +1227,9 @@
47 copy $j $fs$(dirname ${j#.})
48 done
49 done
50 + # Ensure always use lib instead lib64
51 + [ -d $fs/lib64 ] && mv $fs/lib64 $fs/lib
52 + [ -d $fs/usr/lib64 ] && mv $fs/usr/lib64 $fs/usr/lib
53 cd - >/dev/null
54 status
55 }
56 @@ -1304,7 +1304,7 @@
57 # Use setup pkgs from cross.conf or cook.conf. When cross compiling
58 # ARCH-setup or 'cross check' should be used before: cook setup
59 case "$ARCH" in
60 - arm*|x86_64)
61 + arm*)
62 if [ ! -x '/usr/bin/cross' ]; then
63 _ 'ERROR: %s is not installed' 'cross'
64 exit 1
65 --- a/modules/pkgdb
66 +++ b/modules/pkgdb
67 @@ -116,7 +116,12 @@
68 # and will substitute them all
69 SIZES=$(echo $PACKED_SIZE $UNPACKED_SIZE | sed 's|\.0||g')
70 DEPENDS=$(echo $DEPENDS) # remove newlines from some receipts
71 - MD5="$(fgrep " $PACKAGE-$VERSION$EXTRAVERSION.tazpkg" $PKGS/packages.md5 | awk '{print $1}')"
72 + case $SLITAZ_ARCH in
73 + i?86)
74 + MD5="$(fgrep " $PACKAGE-$VERSION$EXTRAVERSION.tazpkg" $PKGS/packages.md5 | awk '{print $1}')" ;;
75 + x86_64)
76 + MD5="$(fgrep " $PACKAGE-$VERSION$EXTRAVERSION-$ARCH.tazpkg" $PKGS/packages.md5 | awk '{print $1}')" ;;
77 + esac
78 cat >> $PKGS/packages.info <<EOT
79 $PACKAGE $VERSION$EXTRAVERSION $CATEGORY $SHORT_DESC $WEB_SITE $TAGS $SIZES $DEPENDS $MD5
80 EOT
81 @@ -138,7 +143,12 @@
82 $PKGS/files.list
84 # list of unnecessary packages
85 - sed -i "/ $PACKAGE-$VERSION$EXTRAVERSION.tazpkg/d" $PKGS/packages.toremove
86 + case $SLITAZ_ARCH in
87 + i?86)
88 + sed -i "/ $PACKAGE-$VERSION$EXTRAVERSION.tazpkg/d" $PKGS/packages.toremove ;;
89 + x86_64)
90 + sed -i "/ $PACKAGE-$VERSION$EXTRAVERSION-$ARCH.tazpkg/d" $PKGS/packages.toremove ;;
91 + esac
92 else
93 # if receipt variable HOST_ARCH absent/empty or contains ARCH
94 if [ -z "$HOST_ARCH" -o "${HOST_ARCH/$ARCH/}" != "$HOST_ARCH" ]; then