diff options
| -rw-r--r-- | system/cpuid/cpuid.SlackBuild | 19 | ||||
| -rw-r--r-- | system/cpuid/cpuid.info | 6 |
2 files changed, 13 insertions, 12 deletions
diff --git a/system/cpuid/cpuid.SlackBuild b/system/cpuid/cpuid.SlackBuild index 2039b25664..0ed3705c53 100644 --- a/system/cpuid/cpuid.SlackBuild +++ b/system/cpuid/cpuid.SlackBuild @@ -22,25 +22,26 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20220211 bkw: Modified by SlackBuilds.org: updated to v20211210, partly +# because the old 2014 version wouldn't compile, and partly because a +# cpuid that only knows about CPUs made before 2015 isn't very useful. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=cpuid -VERSION=${VERSION:-20140123} +VERSION=${VERSION:-20211210} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -50,8 +51,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -75,9 +76,9 @@ cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ + -o -perm 511 \) -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/system/cpuid/cpuid.info b/system/cpuid/cpuid.info index 8875c3e12b..75007d244b 100644 --- a/system/cpuid/cpuid.info +++ b/system/cpuid/cpuid.info @@ -1,8 +1,8 @@ PRGNAM="cpuid" -VERSION="20140123" +VERSION="20211210" HOMEPAGE="http://www.etallen.com/cpuid.html" -DOWNLOAD="http://www.etallen.com/cpuid/cpuid-20140123.src.tar.gz" -MD5SUM="f1a6946a1ece87928ddd1d1e3b06ed4b" +DOWNLOAD="http://www.etallen.com/cpuid/cpuid-20211210.src.tar.gz" +MD5SUM="633a4b64f5940df7f4646905457f0d0e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |